Flaps on take-off and landing

At what point does one normally set flaps before take-off? I've been
doing it only when aligning with the runway, on the theory that
extending flaps prior to that would just make me more vulnerable to
wind while on the taxiway or at the gate. Similarly, I retract the
flaps completely as soon as I'm completely on the runway for landing,
so that the wind doesn't push me around. Is this the correct way to
do it?

--
Transpose mxsmanic and gmail to reach me by e-mail.