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

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

src/cocoa/control.mm

@@ -11,8 +11,9 @@
 
 #include "wx/wxprec.h"
 
-#ifndef WX_PRECOMP
 #include "wx/control.h"
+
+#ifndef WX_PRECOMP
     #include "wx/log.h"
 #endif
 

src/common/ctrlcmn.cpp

@@ -26,8 +26,9 @@
 
 #if wxUSE_CONTROLS
 
-#ifndef WX_PRECOMP
 #include "wx/control.h"
+
+#ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/radiobut.h"
 #endif

src/gtk/frame.cpp

@@ -25,9 +25,9 @@
     #include "wx/dcclient.h"
     #include "wx/menu.h"
     #include "wx/dialog.h"
+    #include "wx/control.h"
 #endif // WX_PRECOMP
 
-#include "wx/control.h"
 #if wxUSE_TOOLBAR
     #include "wx/toolbar.h"
 #endif

src/gtk/toplevel.cpp

@@ -31,9 +31,9 @@
     #include "wx/dialog.h"
     #include "wx/timer.h"
     #include "wx/settings.h"
+    #include "wx/control.h"
 #endif
 
-#include "wx/control.h"
 #include "wx/gtk/private.h"
 #include "wx/evtloop.h"
 

src/gtk1/frame.cpp

@@ -25,9 +25,9 @@
     #include "wx/dcclient.h"
     #include "wx/menu.h"
     #include "wx/dialog.h"
+    #include "wx/control.h"
 #endif // WX_PRECOMP
 
-#include "wx/control.h"
 #if wxUSE_TOOLBAR
     #include "wx/toolbar.h"
 #endif

src/gtk1/toplevel.cpp

@@ -31,9 +31,9 @@
     #include "wx/dialog.h"
     #include "wx/timer.h"
     #include "wx/settings.h"
+    #include "wx/control.h"
 #endif
 
-#include "wx/control.h"
 #include "wx/gtk1/private.h"
 #include "wx/evtloop.h"
 

src/mac/carbon/tabctrl.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tabctrl.cpp
+// Name:        src/mac/carbon/tabctrl.cpp
 // Purpose:     wxTabCtrl
 // Author:      Stefan Csomor
 // Modified by:
@@ -13,8 +13,12 @@
 
 #if wxUSE_TAB_DIALOG
 
-#include "wx/control.h"
 #include "wx/tabctrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/control.h"
+#endif
+
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)

src/mac/classic/tabctrl.cpp

@@ -17,8 +17,12 @@
 
 #if wxUSE_TAB_DIALOG
 
-#include "wx/control.h"
 #include "wx/tabctrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/control.h"
+#endif
+
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)

src/msw/control.cpp

@@ -26,6 +26,8 @@
 
 #if wxUSE_CONTROLS
 
+#include "wx/control.h"
+
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"
@@ -34,8 +36,6 @@
     #include "wx/settings.h"
 #endif
 
-#include "wx/control.h"
-
 #if wxUSE_LISTCTRL
     #include "wx/listctrl.h"
 #endif // wxUSE_LISTCTRL

src/msw/notebook.cpp

@@ -28,10 +28,10 @@
     #include  "wx/app.h"
     #include  "wx/dcclient.h"
     #include  "wx/dcmemory.h"
+    #include  "wx/control.h"
 #endif  // WX_PRECOMP
 
 #include  "wx/imaglist.h"
-#include  "wx/control.h"
 #include  "wx/sysopt.h"
 
 #include  "wx/msw/private.h"

src/os2/control.cpp

@@ -12,6 +12,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/control.h"
+
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"
@@ -21,7 +23,6 @@
 #endif
 
 #include "wx/os2/private.h"
-#include "wx/control.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 

src/os2/notebook.cpp

@@ -24,10 +24,10 @@
     #include "wx/settings.h"
     #include "wx/log.h"
     #include "wx/event.h"
+    #include  "wx/control.h"
 #endif  // WX_PRECOMP
 
 #include  "wx/imaglist.h"
-#include  "wx/control.h"
 
 #include  "wx/os2/private.h"
 

src/palmos/control.cpp

@@ -26,6 +26,8 @@
 
 #if wxUSE_CONTROLS
 
+#include "wx/control.h"
+
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"
@@ -35,7 +37,6 @@
     #include "wx/button.h"
 #endif
 
-#include "wx/control.h"
 #include "wx/toplevel.h"
 #include "wx/checkbox.h"
 #include "wx/tglbtn.h"

src/univ/control.cpp

@@ -25,9 +25,10 @@
 
 #if wxUSE_CONTROLS
 
+#include "wx/control.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/control.h"
     #include "wx/dcclient.h"
 #endif