The traditional answer is that yes that is what sex is, but gender is a social role that isn't "what sex you wish you were" but relates to the various performed aspects of being male or female (etc.) Being really strict, there is "gender identity", the gender you self-identify with, and "gender," what society perceives you as (equivalent to if you pass or not).