Some reindentation + preDraw and postDraw in Window.hh