From: Włodzimierz Skiba Date: Tue, 30 May 2006 17:39:22 +0000 (+0000) Subject: Include wx/stattext.h according to precompiled headers of wx/wx.h (with other minor... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ccdc11bbaf0310a474ad7b9d41413b31c3544356 Include wx/stattext.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm index f45eab54e1..4bba022c27 100644 --- a/src/cocoa/stattext.mm +++ b/src/cocoa/stattext.mm @@ -1,18 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/stattext.mm +// Name: src/cocoa/stattext.mm // Purpose: wxStaticText // Author: David Elliott // Modified by: // Created: 2003/02/15 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#include "wx/stattext.h" + #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/stattext.h" #include "wx/log.h" #endif //WX_PRECOMP @@ -92,4 +94,3 @@ void wxStaticText::SetLabel(const wxString& label) void wxStaticText::Cocoa_didChangeText(void) { } - diff --git a/src/generic/dbgrptg.cpp b/src/generic/dbgrptg.cpp index 6cd8575107..10b34cc7e0 100644 --- a/src/generic/dbgrptg.cpp +++ b/src/generic/dbgrptg.cpp @@ -32,6 +32,7 @@ #include "wx/checklst.h" #include "wx/textctrl.h" #include "wx/intl.h" + #include "wx/stattext.h" #endif // WX_PRECOMP #include "wx/filename.h" @@ -39,7 +40,6 @@ #include "wx/mimetype.h" #include "wx/statline.h" -#include "wx/stattext.h" #include "wx/filedlg.h" #include "wx/valtext.h" diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index a7999e037b..2df1e022b6 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -32,10 +32,10 @@ #include "wx/bmpbuttn.h" #include "wx/checkbox.h" #include "wx/choice.h" + #include "wx/stattext.h" #endif #include "wx/textctrl.h" -#include "wx/stattext.h" #include "wx/longlong.h" #include "wx/sizer.h" #include "wx/tokenzr.h" diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp index ac344ddaa6..729cbcaf2c 100644 --- a/src/mac/carbon/control.cpp +++ b/src/mac/carbon/control.cpp @@ -21,6 +21,7 @@ #include "wx/button.h" #include "wx/dialog.h" #include "wx/scrolbar.h" + #include "wx/stattext.h" #endif // WX_PRECOMP #include "wx/notebook.h" @@ -29,7 +30,6 @@ #include "wx/spinbutt.h" #include "wx/statbox.h" #include "wx/sizer.h" -#include "wx/stattext.h" #include "wx/mac/uma.h" #include "wx/mac/private.h" diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp index 2742383fe2..0f1caf53ae 100644 --- a/src/mac/classic/control.cpp +++ b/src/mac/classic/control.cpp @@ -25,6 +25,7 @@ #include "wx/button.h" #include "wx/dialog.h" #include "wx/scrolbar.h" + #include "wx/stattext.h" #endif // WX_PRECOMP #include "wx/notebook.h" @@ -33,7 +34,6 @@ #include "wx/spinbutt.h" #include "wx/statbox.h" #include "wx/sizer.h" -#include "wx/stattext.h" IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp index 0ea485b4f7..1d93adb87b 100644 --- a/src/msw/stattext.cpp +++ b/src/msw/stattext.cpp @@ -18,6 +18,8 @@ #if wxUSE_STATTEXT +#include "wx/stattext.h" + #ifndef WX_PRECOMP #include "wx/event.h" #include "wx/app.h" @@ -26,7 +28,6 @@ #include "wx/settings.h" #endif -#include "wx/stattext.h" #include "wx/msw/private.h" #if wxUSE_EXTENDED_RTTI diff --git a/src/os2/stattext.cpp b/src/os2/stattext.cpp index d8af7b31c7..b636f26e3d 100644 --- a/src/os2/stattext.cpp +++ b/src/os2/stattext.cpp @@ -12,6 +12,8 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/stattext.h" + #ifndef WX_PRECOMP #include "wx/event.h" #include "wx/app.h" @@ -19,7 +21,6 @@ #include "wx/scrolwin.h" #endif -#include "wx/stattext.h" #include "wx/os2/private.h" #include diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp index 6f1261c917..38da4fb592 100644 --- a/src/univ/stattext.cpp +++ b/src/univ/stattext.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: univ/stattext.cpp +// Name: src/univ/stattext.cpp // Purpose: wxStaticText // Author: Vadim Zeitlin // Modified by: @@ -25,9 +25,10 @@ #if wxUSE_STATTEXT +#include "wx/stattext.h" + #ifndef WX_PRECOMP #include "wx/dcclient.h" - #include "wx/stattext.h" #include "wx/validate.h" #endif @@ -54,7 +55,7 @@ bool wxStaticText::Create(wxWindow *parent, { if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) ) return false; - + SetLabel(label); SetBestSize(size); diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp index f3bb578bd6..229c5526f8 100644 --- a/src/xrc/xh_sttxt.cpp +++ b/src/xrc/xh_sttxt.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_sttxt.cpp +// Name: src/xrc/xh_sttxt.cpp // Purpose: XRC resource for wxStaticText // Author: Bob Mitchell // Created: 2000/03/21 @@ -15,10 +15,13 @@ #pragma hdrstop #endif -#if wxUSE_XRC +#if wxUSE_XRC && wxUSE_STATTEXT #include "wx/xrc/xh_sttxt.h" -#include "wx/stattext.h" + +#ifndef WX_PRECOMP + #include "wx/stattext.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxStaticTextXmlHandler, wxXmlResourceHandler) @@ -37,11 +40,11 @@ wxObject *wxStaticTextXmlHandler::DoCreateResource() XRC_MAKE_INSTANCE(text, wxStaticText) text->Create(m_parentAsWindow, - GetID(), - GetText(wxT("label")), - GetPosition(), GetSize(), - GetStyle(), - GetName()); + GetID(), + GetText(wxT("label")), + GetPosition(), GetSize(), + GetStyle(), + GetName()); SetupWindow(text); @@ -53,4 +56,4 @@ bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node) return IsOfClass(node, wxT("wxStaticText")); } -#endif // wxUSE_XRC +#endif // wxUSE_XRC && wxUSE_STATTEXT