define WX_XTI_TEMPLATE_FIX in case it is not yet

[wxWidgets.git] / contrib / src / xrc / xh_html.cpp

diff --git a/contrib/src/xrc/xh_html.cpp b/contrib/src/xrc/xh_html.cpp
index be7716b0081598791530baccee12c27ce71dd5bc..8fe80d2082160ddb0bb17d10f9236e8466f8aa5e 100644 (file)
--- 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"));