From ed2fbeb835854c97d176f8bdfd6f06a84273f5d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 8 Jun 2006 06:57:39 +0000 Subject: [PATCH] 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 | 4 ++-- src/common/sizer.cpp | 3 ++- src/common/wincmn.cpp | 8 ++------ src/generic/choicbkg.cpp | 2 +- src/generic/dirctrlg.cpp | 22 +++++++++++----------- src/generic/filedlgg.cpp | 2 +- src/generic/fontdlgg.cpp | 2 +- src/generic/scrlwing.cpp | 2 +- src/generic/wizard.cpp | 2 +- src/gtk/dataview.cpp | 2 +- src/gtk/window.cpp | 2 +- src/gtk1/window.cpp | 2 +- src/mac/carbon/control.cpp | 2 +- src/mac/carbon/window.cpp | 2 +- src/mac/classic/control.cpp | 2 +- src/mac/classic/window.cpp | 6 +++--- src/motif/window.cpp | 2 +- src/unix/taskbarx11.cpp | 2 +- src/x11/window.cpp | 2 +- src/xrc/xh_choicbk.cpp | 6 ++++-- src/xrc/xh_listbk.cpp | 6 ++++-- src/xrc/xh_notbk.cpp | 6 ++++-- src/xrc/xh_sizer.cpp | 10 +++++----- src/xrc/xh_unkwn.cpp | 3 +-- 24 files changed, 52 insertions(+), 50 deletions(-) diff --git a/src/common/layout.cpp b/src/common/layout.cpp index d49aaea5b2..710ff2223e 100644 --- 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 131977e2af..81c2031157 100644 --- 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 314d68ea0e..b485672dcc 100644 --- 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 8b48216dad..445d0f575a 100644 --- 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 888376f716..16093c563c 100644 --- 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 - #ifndef __EMX__ - #include + #ifdef __OS2__ + #define INCL_BASE + #include + #ifndef __EMX__ + #include + #endif + #include + #include #endif - #include - #include - #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 4db19fc572..a87a39b7bf 100644 --- 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 d61aa8cfc0..b0214dd348 100644 --- 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 #include -#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 e2aced4a81..42c47c8904 100644 --- 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 b9e6ecae67..cb3b8d0f38 100644 --- 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 4b2c185b3f..9ff06f25be 100644 --- 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 ab839de36c..8584ff8caf 100644 --- 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 02c70feb3c..78ea9235ac 100644 --- 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 a504badd70..f062739923 100644 --- 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 253dbf49a8..e7557438b4 100644 --- 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 b9ce2f9e2e..449a49b285 100644 --- 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 16b32b0496..1fd435f567 100644 --- 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 40059b1372..e23a9c5906 100644 --- 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 db3cd49704..e3ac3d5987 100644 --- 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 f904cdde3d..521c531691 100644 --- 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 871332f8df..5b8aff619e 100644 --- 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 f75ae9f883..36138404de 100644 --- 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 0c7df45439..7c0217f9c8 100644 --- 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 443c870ebb..46f6a191c1 100644 --- 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 953aa35f12..d970968913 100644 --- 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 { -- 2.45.2