Include wx/sizer.h and wx/layout.h according to precompiled headers of wx/wx.h (with...

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

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index d49aaea5b2786d061e7979430ff72deed595df55..710ff2223e12cf68f66c5822d8e99b764ac520ed 100644 (file)
--- a/src/common/layout.cpp
+++ b/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)

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 131977e2afd77697d56802802728b61e0e42409c..81c203115744ddd49c3d95b39ebc81651cc95b60 100644 (file)
--- a/src/common/sizer.cpp
+++ b/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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 314d68ea0ebddde40d91b69cb9b1a0a8d5323a49..b485672dccb39560c4c9897b1cefe396f24c4d8c 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/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"

diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index 8b48216dad5dbae1bce3e3d18944f9cee1b02851..445d0f575ae443b171ac1c283a55bc775fba098c 100644 (file)
--- a/src/generic/choicbkg.cpp
+++ b/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

diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index 888376f71681a3ffe374ef32fd130c983c3c403d..16093c563c974afc6a077d44d8d38a623899e59a 100644 (file)
--- a/src/generic/dirctrlg.cpp
+++ b/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__)

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 4db19fc57260604ea2e7347d0d5297e243ab4bf8..a87a39b7bf1dfe4fe56f1f8412ad865bf61fc436 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/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"

diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index d61aa8cfc019531b0091a9a66f4f1835d4f35d70..b0214dd3483ff3276dc8c5150bbe48ad1b376e7a 100644 (file)
--- a/src/generic/fontdlgg.cpp
+++ b/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"
 

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index e2aced4a81044aa237d39e5d5c6275f34f021f91..42c47c89042f56e7dd6cfd2d88b5b1eb4ed8161b 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/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__

diff --git a/src/generic/wizard.cpp b/src/generic/wizard.cpp
index b9e6ecae67613ac4aaf6a441610c8ee23ed876ea..cb3b8d0f380c2a48d3bb996fc10fda9831f577f9 100644 (file)
--- a/src/generic/wizard.cpp
+++ b/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"
 

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index 4b2c185b3fb9b42b87bef927ebbb7667f5856c0c..9ff06f25be678ce8829f5fa6565ce5d0162452f8 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/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"

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index ab839de36cb2155de1e389a213c0821fc77a5592..8584ff8cafe83d3c3753a03a0e3a6ede790e8e6e 100644 (file)
--- a/src/gtk/window.cpp
+++ b/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

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 02c70feb3c7c53613f4f0583ef0af922b55a3879..78ea9235acdf530751660ef45479174a41c43309 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/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

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index a504badd70596561663349cb63901b970b116600..f062739923890bab62c326c22555c366c5c2f575 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/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"

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 253dbf49a85acc0591e13ef4d3672bc9a8f000ba..e7557438b480ce47bf998f39441ee433b2d3d529 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/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"

diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp
index b9ce2f9e2e32875973f9e54cfd0ce84f224f588a..449a49b2851795ebfe4853d23f237f87f84044fd 100644 (file)
--- a/src/mac/classic/control.cpp
+++ b/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)
 

diff --git a/src/mac/classic/window.cpp b/src/mac/classic/window.cpp
index 16b32b0496b6e7e9822d2a27dff18121d56306f6..1fd435f5675df4b0264f764eaf4d1db5500a4c24 100644 (file)
--- a/src/mac/classic/window.cpp
+++ b/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) ;

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 40059b1372acf01e85923f12af7d1ed77974044f..e23a9c5906e2891d747a725fbd3ee706a1148d15 100644 (file)
--- a/src/motif/window.cpp
+++ b/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"

diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index db3cd49704fd4b539f94caaf0f779bae22b9574b..e3ac3d59871b1ffddbeb835394d13e33a8dfd16f 100644 (file)
--- a/src/unix/taskbarx11.cpp
+++ b/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

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index f904cdde3d03c5d5018b913f1e0da43d92a8d1cc..521c531691fc3cad4c433fad2a2fbe1a8b5c59f7 100644 (file)
--- a/src/x11/window.cpp
+++ b/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"

diff --git a/src/xrc/xh_choicbk.cpp b/src/xrc/xh_choicbk.cpp
index 871332f8df8db9d44a9ffb9d926a075bd5f1deb5..5b8aff619e41431d1c2a4ecc27b5a66048b1d12c 100644 (file)
--- a/src/xrc/xh_choicbk.cpp
+++ b/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);

diff --git a/src/xrc/xh_listbk.cpp b/src/xrc/xh_listbk.cpp
index f75ae9f8835a59d58323468a510ef85d7a57d32a..36138404de0bcdbc162fc734df76c947506df083 100644 (file)
--- a/src/xrc/xh_listbk.cpp
+++ b/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);

diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp
index 0c7df45439f6d27ac737d74a0636065250edc2eb..7c0217f9c85c287b4368f8b0ec3f83a62ffabbf8 100644 (file)
--- a/src/xrc/xh_notbk.cpp
+++ b/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);

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index 443c870ebb51ce0010fa411d8952664aaf898c2a..46f6a191c1484aea29d7fc5118d465b1324e4794 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/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);

diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index 953aa35f12003a06e72be7dcb54df5bcd139f460..d9709689133e956ad9e2d743d768ffdbe0e2c910 100644 (file)
--- a/src/xrc/xh_unkwn.cpp
+++ b/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
 {