fix typo in r57455 which totally broke modal dialogs display (close #10291)

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

diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp
index d4d40956f68cc63ad5dd3c6b0a7e7b7ee91c2c06..04a21ddfbd9b2bf21099321ae0770b9c6ee00357 100644 (file)
--- a/src/xrc/xh_panel.cpp
+++ b/src/xrc/xh_panel.cpp
@@ -1,16 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_panel.cpp
-// Purpose:     XML resource for panels
+// Name:        src/xrc/xh_panel.cpp
+// Purpose:     XRC resource for panels
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_panel.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -19,45 +15,47 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_panel.h"
-#include "wx/panel.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/panel.h"
+    #include "wx/frame.h"
+#endif
+
+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);
+#if WXWIN_COMPATIBILITY_2_6
+    XRC_ADD_STYLE(wxNO_3D);
+#endif // WXWIN_COMPATIBILITY_2_6
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+
     AddWindowStyles();
 }
 
+wxObject *wxPanelXmlHandler::DoCreateResource()
+{
+    XRC_MAKE_INSTANCE(panel, wxPanel)
 
+    panel->Create(m_parentAsWindow,
+                  GetID(),
+                  GetPosition(), GetSize(),
+                  GetStyle(wxT("style"), wxTAB_TRAVERSAL),
+                  GetName());
 
-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());
     SetupWindow(panel);
     CreateChildren(panel);
-    
+
     return panel;
 }
 
-
 bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxPanel"));
 }
+
+#endif // wxUSE_XRC