Include wx/sizer.h and wx/layout.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/layout.cpp

@@ -26,6 +26,8 @@
 
 #if wxUSE_CONSTRAINTS
 
+#include "wx/layout.h"
+
 #ifndef WX_PRECOMP
     #include "wx/window.h"
     #include "wx/utils.h"
@@ -34,8 +36,6 @@
     #include "wx/intl.h"
 #endif
 
-#include "wx/layout.h"
-
 
 IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject)

src/common/sizer.cpp

@@ -17,6 +17,8 @@
     #pragma hdrstop
 #endif
 
+#include "wx/sizer.h"
+
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
@@ -26,7 +28,6 @@
     #include "wx/statbox.h"
 #endif // WX_PRECOMP
 
-#include "wx/sizer.h"
 #include "wx/listimpl.cpp"
 
 #if WXWIN_COMPATIBILITY_2_4

src/common/wincmn.cpp

@@ -42,13 +42,9 @@
     #include "wx/toolbar.h"
     #include "wx/dcclient.h"
     #include "wx/scrolbar.h"
-#endif //WX_PRECOMP
-
-#if wxUSE_CONSTRAINTS
     #include "wx/layout.h"
-#endif // wxUSE_CONSTRAINTS
-
-#include "wx/sizer.h"
+    #include "wx/sizer.h"
+#endif //WX_PRECOMP
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"

src/generic/choicbkg.cpp

@@ -31,10 +31,10 @@
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/choice.h"
+    #include "wx/sizer.h"
 #endif
 
 #include "wx/imaglist.h"
-#include "wx/sizer.h"
 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros

src/generic/dirctrlg.cpp

@@ -32,15 +32,15 @@
     #include "wx/cmndata.h"
     #include "wx/choice.h"
     #include "wx/textctrl.h"
+    #include "wx/layout.h"
+    #include "wx/sizer.h"
 #endif
 
 #include "wx/module.h"
-#include "wx/layout.h"
 #include "wx/textdlg.h"
 #include "wx/filefn.h"
 #include "wx/gdicmn.h"
 #include "wx/imaglist.h"
-#include "wx/sizer.h"
 #include "wx/tokenzr.h"
 #include "wx/dir.h"
 #include "wx/artprov.h"
@@ -73,16 +73,16 @@
 #endif
 
 #if defined(__OS2__) || defined(__DOS__)
-  #ifdef __OS2__
-    #define INCL_BASE
-    #include <os2.h>
-    #ifndef __EMX__
-      #include <direct.h>
+    #ifdef __OS2__
+        #define INCL_BASE
+        #include <os2.h>
+        #ifndef __EMX__
+            #include <direct.h>
+        #endif
+        #include <stdlib.h>
+        #include <ctype.h>
     #endif
-    #include <stdlib.h>
-    #include <ctype.h>
-  #endif
-  extern bool wxIsDriveAvailable(const wxString& dirName);
+    extern bool wxIsDriveAvailable(const wxString& dirName);
 #endif // __OS2__
 
 #if defined(__WXMAC__)

src/generic/filedlgg.cpp

@@ -34,10 +34,10 @@
     #include "wx/choice.h"
     #include "wx/stattext.h"
     #include "wx/textctrl.h"
+    #include "wx/sizer.h"
 #endif
 
 #include "wx/longlong.h"
-#include "wx/sizer.h"
 #include "wx/tokenzr.h"
 #include "wx/config.h"
 #include "wx/imaglist.h"

src/generic/fontdlgg.cpp

@@ -32,12 +32,12 @@
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/cmndata.h"
+    #include "wx/sizer.h"
 #endif
 
 #include <string.h>
 #include <stdlib.h>
 
-#include "wx/sizer.h"
 #include "wx/fontdlg.h"
 #include "wx/generic/fontdlgg.h"
 

src/generic/scrlwing.cpp

@@ -38,9 +38,9 @@
     #if wxUSE_TIMER
         #include "wx/timer.h"
     #endif
+    #include "wx/sizer.h"
 #endif
 
-#include "wx/sizer.h"
 #include "wx/recguard.h"
 
 #ifdef __WXMSW__

src/generic/wizard.cpp

@@ -36,10 +36,10 @@
     #include "wx/statbmp.h"
     #include "wx/button.h"
     #include "wx/settings.h"
+    #include "wx/sizer.h"
 #endif //WX_PRECOMP
 
 #include "wx/statline.h"
-#include "wx/sizer.h"
 
 #include "wx/wizard.h"
 

src/gtk/dataview.cpp

@@ -19,12 +19,12 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcclient.h"
+    #include "wx/sizer.h"
 #endif
 
 #include "wx/stockitem.h"
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
-#include "wx/sizer.h"
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/win_gtk.h"

src/gtk/window.cpp

@@ -30,9 +30,9 @@
     #include "wx/textctrl.h"
     #include "wx/toolbar.h"
     #include "wx/combobox.h"
+    #include "wx/layout.h"
 #endif
 
-#include "wx/layout.h"
 #include "wx/module.h"
 
 #if wxUSE_DRAG_AND_DROP

src/gtk1/window.cpp

@@ -29,9 +29,9 @@
     #include "wx/msgdlg.h"
     #include "wx/textctrl.h"
     #include "wx/combobox.h"
+    #include "wx/layout.h"
 #endif
 
-#include "wx/layout.h"
 #include "wx/module.h"
 
 #if wxUSE_DRAG_AND_DROP

src/mac/carbon/control.cpp

@@ -24,12 +24,12 @@
     #include "wx/stattext.h"
     #include "wx/statbox.h"
     #include "wx/radiobox.h"
+    #include "wx/sizer.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/spinbutt.h"
-#include "wx/sizer.h"
 
 #include "wx/mac/uma.h"
 #include "wx/mac/private.h"

src/mac/carbon/window.cpp

@@ -30,9 +30,9 @@
     #include "wx/statbox.h"
     #include "wx/textctrl.h"
     #include "wx/toolbar.h"
+    #include "wx/layout.h"
 #endif
 
-#include "wx/layout.h"
 #include "wx/tooltip.h"
 #include "wx/statusbr.h"
 #include "wx/menuitem.h"

src/mac/classic/control.cpp

@@ -28,12 +28,12 @@
     #include "wx/stattext.h"
     #include "wx/statbox.h"
     #include "wx/radiobox.h"
+    #include "wx/sizer.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/spinbutt.h"
-#include "wx/sizer.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 

src/mac/classic/window.cpp

@@ -29,9 +29,9 @@
     #include "wx/scrolbar.h"
     #include "wx/statbox.h"
     #include "wx/listbox.h"
+    #include "wx/layout.h"
 #endif
 
-#include "wx/layout.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/tooltip.h"
@@ -268,13 +268,13 @@ void wxWindowMac::SetFocus()
             wxChildFocusEvent eventFocus(this);
             GetEventHandler()->ProcessEvent(eventFocus);
 
-      #ifndef __WXUNIVERSAL__
+#ifndef __WXUNIVERSAL__
             wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
             if ( control && control->GetMacControl() )
             {
                 UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl()  , kControlFocusNextPart ) ;
             }
-      #endif
+#endif
             wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
             event.SetEventObject(this);
             GetEventHandler()->ProcessEvent(event) ;

src/motif/window.cpp

@@ -38,9 +38,9 @@
     #include "wx/menu.h"
     #include "wx/settings.h"
     #include "wx/scrolwin.h"
+    #include "wx/layout.h"
 #endif
 
-#include "wx/layout.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"
 #include "wx/evtloop.h"

src/unix/taskbarx11.cpp

@@ -28,10 +28,10 @@
     #include "wx/frame.h"
     #include "wx/dcclient.h"
     #include "wx/statbmp.h"
+    #include "wx/sizer.h"
 #endif
 
 #include "wx/bitmap.h"
-#include "wx/sizer.h"
 #include "wx/image.h"
 
 #ifdef __VMS

src/x11/window.cpp

@@ -44,9 +44,9 @@
     #include "wx/scrolbar.h"
     #include "wx/listbox.h"
     #include "wx/scrolwin.h"
+    #include "wx/layout.h"
 #endif
 
-#include "wx/layout.h"
 #include "wx/module.h"
 #include "wx/menuitem.h"
 #include "wx/fontutil.h"

src/xrc/xh_choicbk.cpp

@@ -21,16 +21,18 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/sizer.h"
 #endif
 
 #include "wx/choicebk.h"
 #include "wx/imaglist.h"
-#include "wx/sizer.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoicebookXmlHandler, wxXmlResourceHandler)
 
 wxChoicebookXmlHandler::wxChoicebookXmlHandler()
-: wxXmlResourceHandler(), m_isInside(false), m_choicebook(NULL)
+                       :wxXmlResourceHandler(),
+                        m_isInside(false),
+                        m_choicebook(NULL)
 {
     XRC_ADD_STYLE(wxBK_DEFAULT);
     XRC_ADD_STYLE(wxBK_LEFT);

src/xrc/xh_listbk.cpp

@@ -21,16 +21,18 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/sizer.h"
 #endif
 
 #include "wx/listbook.h"
 #include "wx/imaglist.h"
-#include "wx/sizer.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxListbookXmlHandler, wxXmlResourceHandler)
 
 wxListbookXmlHandler::wxListbookXmlHandler()
-: wxXmlResourceHandler(), m_isInside(false), m_listbook(NULL)
+                     :wxXmlResourceHandler(),
+                      m_isInside(false),
+                      m_listbook(NULL)
 {
     XRC_ADD_STYLE(wxBK_DEFAULT);
     XRC_ADD_STYLE(wxBK_LEFT);

src/xrc/xh_notbk.cpp

@@ -21,16 +21,18 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
+    #include "wx/sizer.h"
 #endif
 
 #include "wx/notebook.h"
 #include "wx/imaglist.h"
-#include "wx/sizer.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookXmlHandler, wxXmlResourceHandler)
 
 wxNotebookXmlHandler::wxNotebookXmlHandler()
-: wxXmlResourceHandler(), m_isInside(false), m_notebook(NULL)
+                     :wxXmlResourceHandler(),
+                      m_isInside(false),
+                      m_notebook(NULL)
 {
     XRC_ADD_STYLE(wxBK_DEFAULT);
     XRC_ADD_STYLE(wxBK_LEFT);

src/xrc/xh_sizer.cpp

@@ -23,9 +23,9 @@
     #include "wx/log.h"
     #include "wx/panel.h"
     #include "wx/statbox.h"
+    #include "wx/sizer.h"
 #endif
 
-#include "wx/sizer.h"
 #include "wx/gbsizer.h"
 #include "wx/notebook.h"
 #include "wx/tokenzr.h"
@@ -38,10 +38,10 @@
 IMPLEMENT_DYNAMIC_CLASS(wxSizerXmlHandler, wxXmlResourceHandler)
 
 wxSizerXmlHandler::wxSizerXmlHandler()
-    : wxXmlResourceHandler(),
-      m_isInside(false),
-      m_isGBS(false),
-      m_parentSizer(NULL)
+                  :wxXmlResourceHandler(),
+                   m_isInside(false),
+                   m_isGBS(false),
+                   m_parentSizer(NULL)
 {
     XRC_ADD_STYLE(wxHORIZONTAL);
     XRC_ADD_STYLE(wxVERTICAL);

src/xrc/xh_unkwn.cpp

@@ -23,10 +23,9 @@
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/panel.h"
+    #include "wx/sizer.h"
 #endif
 
-#include "wx/sizer.h"
-
 
 class wxUnknownControlContainer : public wxPanel
 {