X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..adb8a71bbc0ba11aad0b417db24f7267a250b6c3:/contrib/src/xrc/xh_panel.cpp

diff --git a/contrib/src/xrc/xh_panel.cpp b/contrib/src/xrc/xh_panel.cpp
index 539527bbca..b4b4c82810 100644
--- a/contrib/src/xrc/xh_panel.cpp
+++ b/contrib/src/xrc/xh_panel.cpp
@@ -21,25 +21,22 @@
 
 #include "wx/xrc/xh_panel.h"
 #include "wx/panel.h"
+#include "wx/frame.h"  // to get wxNO_3D
 
+IMPLEMENT_DYNAMIC_CLASS(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();
 }
 
-
-
 wxObject *wxPanelXmlHandler::DoCreateResource()
 { 
-    wxPanel *panel = wxDynamicCast(m_instance, wxPanel);
-
-    if (!panel)
-       panel = new wxPanel;
+    XRC_MAKE_INSTANCE(panel, wxPanel)
 
     panel->Create(m_parentAsWindow,
                   GetID(),
@@ -53,7 +50,6 @@ wxObject *wxPanelXmlHandler::DoCreateResource()
     return panel;
 }
 
-
 bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxPanel"));