X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/xrc/xh_html.cpp

diff --git a/src/xrc/xh_html.cpp b/src/xrc/xh_html.cpp
index be7716b008..efdc7c727c 100644
--- a/src/xrc/xh_html.cpp
+++ b/src/xrc/xh_html.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_html.cpp
+// Name:        src/xrc/xh_html.cpp
 // Purpose:     XRC resource for wxHtmlWindow
 // Author:      Bob Mitchell
 // Created:     2000/03/21
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_html.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -19,25 +15,27 @@
     #pragma hdrstop
 #endif
 
-#include "wx/xrc/xh_html.h"
+#if wxUSE_XRC && wxUSE_HTML
 
-#if wxUSE_HTML
+#include "wx/xrc/xh_html.h"
 
 #include "wx/html/htmlwin.h"
 #include "wx/filesys.h"
 
+IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindowXmlHandler, wxXmlResourceHandler)
 
-wxHtmlWindowXmlHandler::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,11 +48,11 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
         control->SetBorders(GetDimension(wxT("borders")));
     }
 
-    if( HasParam(wxT("url")))
+    if (HasParam(wxT("url")))
     {
         wxString url = GetParamValue(wxT("url"));
         wxFileSystem& fsys = GetCurFileSystem();
-        
+
         wxFSFile *f = fsys.OpenFile(url);
         if (f)
         {
@@ -64,22 +62,20 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
         else
             control->LoadPage(url);
     }
-    
+
     else if (HasParam(wxT("htmlcode")))
     {
         control->SetPage(GetText(wxT("htmlcode")));
     }
 
     SetupWindow(control);
-    
+
     return control;
 }
 
-
-
 bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxHtmlWindow"));
 }
 
-#endif // wxUSE_HTML
+#endif // wxUSE_XRC && wxUSE_HTML