X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..3dc0174140ffc52a08fd5b64cf839babad09e5cf:/src/xrc/xh_html.cpp?ds=inline diff --git a/src/xrc/xh_html.cpp b/src/xrc/xh_html.cpp index be7716b008..183e0ae5ef 100644 --- a/src/xrc/xh_html.cpp +++ b/src/xrc/xh_html.cpp @@ -30,14 +30,14 @@ wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler() : wxXmlResourceHandler() { - ADD_STYLE(wxHW_SCROLLBAR_NEVER); - ADD_STYLE(wxHW_SCROLLBAR_AUTO); + XRC_ADD_STYLE(wxHW_SCROLLBAR_NEVER); + XRC_ADD_STYLE(wxHW_SCROLLBAR_AUTO); AddWindowStyles(); } wxObject *wxHtmlWindowXmlHandler::DoCreateResource() { - wxHtmlWindow *control = wxStaticCast(m_instance, wxHtmlWindow); + XRC_MAKE_INSTANCE(control, wxHtmlWindow) control->Create(m_parentAsWindow, GetID(), @@ -50,7 +50,7 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource() control->SetBorders(GetDimension(wxT("borders"))); } - if( HasParam(wxT("url"))) + if (HasParam(wxT("url"))) { wxString url = GetParamValue(wxT("url")); wxFileSystem& fsys = GetCurFileSystem(); @@ -75,8 +75,6 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource() return control; } - - bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxHtmlWindow"));