Generalised WinCE fix for other platforms

[wxWidgets.git] / src / xrc / xh_sttxt.cpp

diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp
index 63f941fb8e8227726e6ca7dcacfedef5991c92bc..9397992d87eccfb53fadfac8bf44e9f31a8279bc 100644 (file)
--- a/src/xrc/xh_sttxt.cpp
+++ b/src/xrc/xh_sttxt.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xh_sttxt.h"
 #endif
 
@@ -19,38 +19,42 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_sttxt.h"
 #include "wx/stattext.h"
 
-wxStaticTextXmlHandler::wxStaticTextXmlHandler() 
-: wxXmlResourceHandler() 
+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 = new wxStaticText(m_parentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    GetName()
-                                    );
+{
+    XRC_MAKE_INSTANCE(text, wxStaticText)
+
+    text->Create(m_parentAsWindow,
+                    GetID(),
+                    GetText(wxT("label")),
+                    GetPosition(), GetSize(),
+                    GetStyle(),
+                    GetName());
+
     SetupWindow(text);
-    
+
     return text;
 }
 
-
-
 bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticText"));
 }
 
-
+#endif // wxUSE_XRC