X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d6954b87d910969226ffade9714db7429211f3..28f5082b3235a349ffc3b99eeacca5049ccd42dd:/src/xrc/xh_panel.cpp?ds=inline diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp index bc3552dc7c..07653815f7 100644 --- a/src/xrc/xh_panel.cpp +++ b/src/xrc/xh_panel.cpp @@ -25,38 +25,29 @@ 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 == 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; } - bool wxPanelXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxPanel"));