fixed array tests compilation and a bug in obj array test

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

diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp
index 539527bbcaf793bb2c47f54dc3009b565a6cac54..07653815f7e1d9b70076ee37e5d00f2ed5012494 100644 (file)
--- a/src/xrc/xh_panel.cpp
+++ b/src/xrc/xh_panel.cpp
@@ -25,21 +25,16 @@
 
 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 +48,6 @@ wxObject *wxPanelXmlHandler::DoCreateResource()
     return panel;
 }
 
-
 bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxPanel"));