X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/621be1ec2672d922cfb95d6e8178b38c8ceaf52a..dc874fb4cebf75d39cc97210e0f4b6a35403e4a6:/src/xrc/xh_sttxt.cpp

diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp
index da772ef416..9986696777 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
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_sttxt.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,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)
 
@@ -41,14 +40,18 @@ 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);
 
+    long wrap = GetLong(wxT("wrap"), -1);
+    if (wrap != -1)
+        text->Wrap(wrap);
+
     return text;
 }
 
@@ -57,4 +60,4 @@ bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStaticText"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_STATTEXT