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

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 f45eab54e1ab9835f6956f039e34f3b0a7567000..4bba022c2751253db4da65137530b776a642b91c 100644 (file)
--- 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 6cd857510774297142531170511c8d3b444271b3..10b34cc7e0cc05b9cd890c1c7ba98e31a7663b40 100644 (file)
--- 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 a7999e037b5f1bc785dfc1fc2bf3d4d7b7919cab..2df1e022b6615ea64760cd351784036ff42416cd 100644 (file)
--- 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 ac344ddaa6dcaac562c5cc3800b7a4f30185ec24..729cbcaf2cd4b71da06a0af91cd4abdca40ebab5 100644 (file)
--- 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 2742383fe20c4b4771bd466cddef47d2cf74e4ba..0f1caf53aec07e207084c733396f877923bb278a 100644 (file)
--- 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 0ea485b4f716a127310f0e0ca871a1a595621642..1d93adb87b36f181fee1c27e8333bca7a419db4c 100644 (file)
--- 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 d8af7b31c712548cb0774029665771c2f97f145c..b636f26e3dc51330d9a994a50a9767db2e7d060a 100644 (file)
--- 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 <stdio.h>
 

diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp
index 6f1261c91761e5be698feb074aae3cd8bf8319ff..38da4fb592b02d1b877b4970fae732f68d5bb042 100644 (file)
--- 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 f3bb578bd69f604aa0cf971e8e48aa5b1e18c92e..229c5526f87c8b5827e3422f0c84bbd7e069511b 100644 (file)
--- 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