WIn32 - restructured window header