removed obsolete wxUSE_WX_RESOURCES check

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

diff --git a/src/xrc/xh_html.cpp b/src/xrc/xh_html.cpp
index 8ac26c8b9ba2172a50eb7f7a2429ade3cedb14af..9ad368cd8645582dd7aa8a412ae0543666aabe8d 100644 (file)
--- a/src/xrc/xh_html.cpp
+++ b/src/xrc/xh_html.cpp
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -19,16 +15,17 @@
     #pragma hdrstop
 #endif
 
     #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"
 
 
 #include "wx/html/htmlwin.h"
 #include "wx/filesys.h"
 

+IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindowXmlHandler, wxXmlResourceHandler)

 
 

-wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler() 
-: wxXmlResourceHandler() 
+wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler()
+: wxXmlResourceHandler()

 {
     XRC_ADD_STYLE(wxHW_SCROLLBAR_NEVER);
     XRC_ADD_STYLE(wxHW_SCROLLBAR_AUTO);
 {
     XRC_ADD_STYLE(wxHW_SCROLLBAR_NEVER);
     XRC_ADD_STYLE(wxHW_SCROLLBAR_AUTO);


@@ -55,7 +52,7 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
     {
         wxString url = GetParamValue(wxT("url"));
         wxFileSystem& fsys = GetCurFileSystem();
     {
         wxString url = GetParamValue(wxT("url"));
         wxFileSystem& fsys = GetCurFileSystem();

-        
+

         wxFSFile *f = fsys.OpenFile(url);
         if (f)
         {
         wxFSFile *f = fsys.OpenFile(url);
         if (f)
         {


@@ -65,14 +62,14 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
         else
             control->LoadPage(url);
     }
         else
             control->LoadPage(url);
     }

-    
+

     else if (HasParam(wxT("htmlcode")))
     {
         control->SetPage(GetText(wxT("htmlcode")));
     }
 
     SetupWindow(control);
     else if (HasParam(wxT("htmlcode")))
     {
         control->SetPage(GetText(wxT("htmlcode")));
     }
 
     SetupWindow(control);

-    
+

     return control;
 }
 
     return control;
 }
 


@@ -81,4 +78,4 @@ bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxHtmlWindow"));
 }
 
     return IsOfClass(node, wxT("wxHtmlWindow"));
 }
 

-#endif // wxUSE_HTML
+#endif // wxUSE_XRC && wxUSE_HTML