Duncan

Rename all the invalidate functions as `OnPrepareDraw` likewise the paint functions should be `OnDraw`. I.e. there should be a `OperatingOnPrepareDraw` and a `OperatingDraw`

`GetColourButtonImage` also needs `ImageId` work. Put a TODO on it.

window_ride_current_music_style_order move it up with the other private vars.

`window_ride_current_music_style_order` looks to be really broken before this refactor so you could probably have a check to see if there are any issues open about the fact that two rides...

`WindowRideMeasurementsDesignCancel` why is that `extern`???

Modify all of the OnMouseUp functions to move all the common code (WIDX_CLOSE, WIDX_TAB) into the common handler

`_moneyInputText` should be a variable inside of `IncomeOnMouseUp` and not a member variable.

There are a good few more functions that should be private.

As this is a large window I've not been quite as stringent there are still lots of other issues with this window so the above comments are just to bring...

Sure go ahead. Try not to do all of this at once. Do a file at a time and pr that. I think most of the renames will be in...