X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..815f65bd0f673965230ed915d794497a8818dd35:/src/xrc/xh_sttxt.cpp?ds=sidebyside

diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp
index 7aba85fda8..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
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_sttxt.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -19,43 +15,49 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_STATTEXT
+
 #include "wx/xrc/xh_sttxt.h"
-#include "wx/stattext.h"
 
-wxStaticTextXmlHandler::wxStaticTextXmlHandler() 
-: wxXmlResourceHandler() 
+#ifndef WX_PRECOMP
+   #include "wx/stattext.h"
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxStaticTextXmlHandler, wxXmlResourceHandler)
+
+wxStaticTextXmlHandler::wxStaticTextXmlHandler()
+: wxXmlResourceHandler()
 {
-    ADD_STYLE(wxST_NO_AUTORESIZE);
-    ADD_STYLE(wxALIGN_LEFT);
-    ADD_STYLE(wxALIGN_RIGHT);
-    ADD_STYLE(wxALIGN_CENTRE);
+    XRC_ADD_STYLE(wxST_NO_AUTORESIZE);
+    XRC_ADD_STYLE(wxALIGN_LEFT);
+    XRC_ADD_STYLE(wxALIGN_RIGHT);
+    XRC_ADD_STYLE(wxALIGN_CENTRE);
     AddWindowStyles();
 }
 
 wxObject *wxStaticTextXmlHandler::DoCreateResource()
-{ 
-    wxStaticText *text = wxStaticCast(m_instance, wxStaticText);
-
-    if (!text)
-       text = new wxStaticText;
+{
+    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);
-    
-    return text;
-}
 
+    long wrap = GetLong(wxT("wrap"), -1);
+    if (wrap != -1)
+        text->Wrap(wrap);
 
+    return text;
+}
 
 bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticText"));
 }
 
-
+#endif // wxUSE_XRC && wxUSE_STATTEXT