Warning fixes, source cleaning.

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

diff --git a/contrib/src/xrc/xh_stbox.cpp b/contrib/src/xrc/xh_stbox.cpp
index f3a27b937ee6c997afeae85b46ad3caecd1c674b..9a88572d5be1296b0415e4bd04b70987463a9da2 100644 (file)
--- a/contrib/src/xrc/xh_stbox.cpp
+++ b/contrib/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


@@ -22,31 +22,31 @@
 #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 = new wxStaticBox(m_parentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    GetName()
-                                    );
+{
+    XRC_MAKE_INSTANCE(box, wxStaticBox)
+
+    box->Create(m_parentAsWindow,
+                GetID(),
+                GetText(wxT("label")),
+                GetPosition(), GetSize(),
+                GetStyle(),
+                GetName());
+

     SetupWindow(box);
     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"));
 }

-
-