overseeing the obvious, there is already a perfect scroll call for HIView...

[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 539527bbcaf793bb2c47f54dc3009b565a6cac54..b4b4c82810db9bfc0f4b6be3d6d46a866462825a 100644 (file)
--- 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/xrc/xh_panel.h"
 #include "wx/panel.h"

+#include "wx/frame.h"  // to get wxNO_3D

 
 

+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)
-       panel = new wxPanel;
+    XRC_MAKE_INSTANCE(panel, wxPanel)

 
     panel->Create(m_parentAsWindow,
                   GetID(),
 
     panel->Create(m_parentAsWindow,
                   GetID(),


@@ -53,7 +50,6 @@ wxObject *wxPanelXmlHandler::DoCreateResource()
     return panel;
 }
 
     return panel;
 }
 

-

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