Applied patch [ 1382329 ] [msw] SetScrollbar: Set thumbsize before triggering events

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

diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp
index 7aba85fda8432d0bae72e358b4167f9031758ec1..f3bb578bd69f604aa0cf971e8e48aa5b1e18c92e 100644 (file)
--- a/src/xrc/xh_sttxt.cpp
+++ b/src/xrc/xh_sttxt.cpp
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -19,25 +15,26 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_sttxt.h"
 #include "wx/stattext.h"
 
 #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()
     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(),
 
     text->Create(m_parentAsWindow,
                     GetID(),


@@ -47,15 +44,13 @@ wxObject *wxStaticTextXmlHandler::DoCreateResource()
                     GetName());
 
     SetupWindow(text);
                     GetName());
 
     SetupWindow(text);

-    
+

     return text;
 }
 
     return text;
 }
 

-
-

 bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticText"));
 }
 
 bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticText"));
 }
 

-
+#endif // wxUSE_XRC