From 93fbbe07650f0f5b47a162081160007b4d9e3b87 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 26 May 2006 10:15:44 +0000 Subject: [PATCH] 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 | 3 ++- src/common/ctrlcmn.cpp | 3 ++- src/gtk/frame.cpp | 2 +- src/gtk/toplevel.cpp | 2 +- src/gtk1/frame.cpp | 2 +- src/gtk1/toplevel.cpp | 2 +- src/mac/carbon/tabctrl.cpp | 10 +++++++--- src/mac/classic/tabctrl.cpp | 6 +++++- src/msw/control.cpp | 4 ++-- src/msw/notebook.cpp | 2 +- src/os2/control.cpp | 3 ++- src/os2/notebook.cpp | 2 +- src/palmos/control.cpp | 3 ++- src/univ/control.cpp | 3 ++- 14 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/cocoa/control.mm b/src/cocoa/control.mm index 858bcc626f..3bb9b1b29f 100644 --- 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 7265096e4a..beae40cb11 100644 --- 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 1312d47ff4..34e6b9de37 100644 --- 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 8b2891e46d..1a0350bcd7 100644 --- 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 3768d3a77a..84ff302701 100644 --- 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 50cd4d4150..81d12e46dc 100644 --- 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 433bb55811..cad5bab4e0 100644 --- 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 6e1b7019ed..067d6e820b 100644 --- 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 e8a3e921d8..73a8f2511a 100644 --- 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 ff438e3dc6..63d07543f3 100644 --- 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 f829123a94..5b74ae803e 100644 --- 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 f518b1d11c..7605b4d78f 100644 --- 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 fea796246a..4f3c12ec0f 100644 --- 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 1cf171e97a..558b2d20a4 100644 --- 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 -- 2.45.2