X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..3dc0174140ffc52a08fd5b64cf839babad09e5cf:/src/xrc/xh_panel.cpp diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp index 539527bbca..07653815f7 100644 --- 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"));