reverted Robert's over-optimisation, correct fix coming soon

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

diff --git a/src/xrc/xh_stbox.cpp b/src/xrc/xh_stbox.cpp
index 977de263d4d526c4e756b9e68f52845063fdae05..93f21b42d2d022c88ce4217962750cbeb54d835f 100644 (file)
--- a/src/xrc/xh_stbox.cpp
+++ b/src/xrc/xh_stbox.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

 #ifdef __GNUG__
 #pragma implementation "xh_stbox.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "xh_stbox.h"
 #endif


@@ -19,21 +19,22 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_stbox.h"
 #include "wx/statbox.h"
 
 #include "wx/xrc/xh_stbox.h"
 #include "wx/statbox.h"
 

-wxStaticBoxXmlHandler::wxStaticBoxXmlHandler() 
-: wxXmlResourceHandler() 
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBoxXmlHandler, wxXmlResourceHandler)
+
+wxStaticBoxXmlHandler::wxStaticBoxXmlHandler()
+: wxXmlResourceHandler()

 {
     AddWindowStyles();
 }
 
 wxObject *wxStaticBoxXmlHandler::DoCreateResource()
 {
     AddWindowStyles();
 }
 
 wxObject *wxStaticBoxXmlHandler::DoCreateResource()

-{ 
-    wxStaticBox *box = wxStaticCast(m_instance, wxStaticBox);
-
-    if (!box)
-       box = new wxStaticBox;
+{
+    XRC_MAKE_INSTANCE(box, wxStaticBox)

 
     box->Create(m_parentAsWindow,
                 GetID(),
 
     box->Create(m_parentAsWindow,
                 GetID(),


@@ -43,15 +44,13 @@ wxObject *wxStaticBoxXmlHandler::DoCreateResource()
                 GetName());
 
     SetupWindow(box);
                 GetName());
 
     SetupWindow(box);

-    
+

     return box;
 }
 
     return box;
 }
 

-
-

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

-
+#endif // wxUSE_XRC