X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..52de92a8e9aa2e2aeddcfc68445b11529fc29e1b:/contrib/src/xrc/xh_html.cpp diff --git a/contrib/src/xrc/xh_html.cpp b/contrib/src/xrc/xh_html.cpp index be7716b008..8fe80d2082 100644 --- a/contrib/src/xrc/xh_html.cpp +++ b/contrib/src/xrc/xh_html.cpp @@ -26,18 +26,20 @@ #include "wx/html/htmlwin.h" #include "wx/filesys.h" +IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindowXmlHandler, wxXmlResourceHandler) 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); + XRC_ADD_STYLE(wxHW_NO_SELECTION); AddWindowStyles(); } wxObject *wxHtmlWindowXmlHandler::DoCreateResource() { - wxHtmlWindow *control = wxStaticCast(m_instance, wxHtmlWindow); + XRC_MAKE_INSTANCE(control, wxHtmlWindow) control->Create(m_parentAsWindow, GetID(), @@ -50,7 +52,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 +77,6 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource() return control; } - - bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxHtmlWindow"));