fixes

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

diff --git a/contrib/src/xrc/xh_panel.cpp b/contrib/src/xrc/xh_panel.cpp
index bc3552dc7ca101af140938889798b0417fb574d5..d71a11d752056658e0dc86c1f82303bcacacd957 100644 (file)
--- a/contrib/src/xrc/xh_panel.cpp
+++ b/contrib/src/xrc/xh_panel.cpp
@@ -22,41 +22,33 @@
 #include "wx/xrc/xh_panel.h"
 #include "wx/panel.h"
 
 #include "wx/xrc/xh_panel.h"
 #include "wx/panel.h"
 

+IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler)

 
 wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
 {
 
 wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
 {

-    ADD_STYLE(wxNO_3D);
-    ADD_STYLE(wxTAB_TRAVERSAL);
-    ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    ADD_STYLE(wxCLIP_CHILDREN);
+    XRC_ADD_STYLE(wxNO_3D);
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+    XRC_ADD_STYLE(wxCLIP_CHILDREN);

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 

-
-

 wxObject *wxPanelXmlHandler::DoCreateResource()
 { 
 wxObject *wxPanelXmlHandler::DoCreateResource()
 { 

-    wxPanel *panel = wxDynamicCast(m_instance, wxPanel);
-
-    if (panel == NULL)
-        panel = new wxPanel(m_parentAsWindow,
-                                 GetID(),
-                                 GetPosition(), GetSize(),
-                                 GetStyle(wxT("style"), wxTAB_TRAVERSAL),
-                                 GetName());
-    else
-        panel->Create(m_parentAsWindow,
-                                 GetID(),
-                                 GetPosition(), GetSize(),
-                                 GetStyle(wxT("style"), wxTAB_TRAVERSAL),
-                                 GetName());
+    XRC_MAKE_INSTANCE(panel, wxPanel)
+
+    panel->Create(m_parentAsWindow,
+                  GetID(),
+                  GetPosition(), GetSize(),
+                  GetStyle(wxT("style"), wxTAB_TRAVERSAL),
+                  GetName());
+

     SetupWindow(panel);
     CreateChildren(panel);
     
     return panel;
 }
 
     SetupWindow(panel);
     CreateChildren(panel);
     
     return panel;
 }
 

-

 bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxPanel"));
 bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxPanel"));