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

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

diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm
index 858bcc626f0ec3f7cdf24b6fd0560516162a0822..3bb9b1b29fd4e14cddc9d43a6d12aff349cb7363 100644 (file)
--- a/src/cocoa/control.mm
+++ b/src/cocoa/control.mm
@@ -11,8 +11,9 @@
 
 #include "wx/wxprec.h"
 
+#include "wx/control.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/control.h"
     #include "wx/log.h"
 #endif
 

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 7265096e4a85ce13f2ac907cb10496534801ffa0..beae40cb11fea06f73c69f6d582b10f139416e20 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -26,8 +26,9 @@
 
 #if wxUSE_CONTROLS
 
+#include "wx/control.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/control.h"
     #include "wx/log.h"
     #include "wx/radiobut.h"
 #endif

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 1312d47ff4317004d383f5684fd36aff8e840389..34e6b9de37542817c4f06d1d8e459f77e1c374e3 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 8b2891e46d3abf86ff20080b8ed845fdc9c6cd42..1a0350bcd73f454e684906d8fd03dd46bd346e29 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/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"
 

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 3768d3a77ab460a9cda45e682dc6c6dfa9a6d823..84ff30270114a3d66fdbe2708d43aee6b176b1ef 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/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

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 50cd4d41505ff30d390a97702e6e0ecb94db7093..81d12e46dc32705a36593999c8e20e1a0f272e00 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/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"
 

diff --git a/src/mac/carbon/tabctrl.cpp b/src/mac/carbon/tabctrl.cpp
index 433bb55811d1976b30cc95349d43b30653e6fa4c..cad5bab4e01146cfaee5179426191945726c8199 100644 (file)
--- a/src/mac/carbon/tabctrl.cpp
+++ b/src/mac/carbon/tabctrl.cpp
@@ -1,20 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tabctrl.cpp
+// Name:        src/mac/carbon/tabctrl.cpp
 // Purpose:     wxTabCtrl
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #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)

diff --git a/src/mac/classic/tabctrl.cpp b/src/mac/classic/tabctrl.cpp
index 6e1b7019ed7131cbb349810218bce054272e2fc5..067d6e820b5cbffeca9e51f12d3a36327bec3b68 100644 (file)
--- a/src/mac/classic/tabctrl.cpp
+++ b/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)

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index e8a3e921d881365a58ef68c5a6df065c2c258cbc..73a8f2511aaba32dc3110d227b046830e96c3ae3 100644 (file)
--- a/src/msw/control.cpp
+++ b/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

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index ff438e3dc65bab1e3461b9251ec13febacc5c8cd..63d07543f3ab8582abbbc848917fba6e0ea0c0ef 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/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"

diff --git a/src/os2/control.cpp b/src/os2/control.cpp
index f829123a94c45d3a258969da25ae1975814ced1d..5b74ae803ef28a308b6d25f4bbab383b10dd787d 100644 (file)
--- a/src/os2/control.cpp
+++ b/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)
 

diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp
index f518b1d11cf7161aad82c588639de6d85b116f41..7605b4d78faac87670358715fdf568273df7c71a 100644 (file)
--- a/src/os2/notebook.cpp
+++ b/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"
 

diff --git a/src/palmos/control.cpp b/src/palmos/control.cpp
index fea796246a74c2045c11216d91e3a2b21f6fe800..4f3c12ec0f1401e85886ab6a1c443c56e81e9e9f 100644 (file)
--- a/src/palmos/control.cpp
+++ b/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"

diff --git a/src/univ/control.cpp b/src/univ/control.cpp
index 1cf171e97aaeeda5cf869b1745f5daad9f15ff93..558b2d20a4a955b1aba5a193893d77b5a1a8e5bf 100644 (file)
--- a/src/univ/control.cpp
+++ b/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