Merge in from trunk r68626 - r68683

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

diff --git a/src/xrc/xh_stbox.cpp b/src/xrc/xh_stbox.cpp
index 977de263d4d526c4e756b9e68f52845063fdae05..a52688d5e10d97c31524e44d7c1c9ed5066f9e43 100644 (file)
--- a/src/xrc/xh_stbox.cpp
+++ b/src/xrc/xh_stbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_stbox.cpp
+// Name:        src/xrc/xh_stbox.cpp
 // Purpose:     XRC resource for wxStaticBox
 // Author:      Brian Gavin
 // Created:     2000/09/09
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_stbox.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -19,21 +15,25 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_STATBOX
+
 #include "wx/xrc/xh_stbox.h"
-#include "wx/statbox.h"
 
-wxStaticBoxXmlHandler::wxStaticBoxXmlHandler() 
-: wxXmlResourceHandler() 
+#ifndef WX_PRECOMP
+    #include "wx/statbox.h"
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBoxXmlHandler, wxXmlResourceHandler)
+
+wxStaticBoxXmlHandler::wxStaticBoxXmlHandler()
+                      :wxXmlResourceHandler()
 {
     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(),
@@ -43,15 +43,13 @@ wxObject *wxStaticBoxXmlHandler::DoCreateResource()
                 GetName());
 
     SetupWindow(box);
-    
+
     return box;
 }
 
-
-
 bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticBox"));
 }
 
-
+#endif // wxUSE_XRC && wxUSE_STATBOX