X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/854e189f90dac9ba5e0239bca79aed64e8d6f46c..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/xrc/xh_html.cpp diff --git a/src/xrc/xh_html.cpp b/src/xrc/xh_html.cpp index 8fe80d2082..9ad368cd86 100644 --- 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 ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_html.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,17 +15,17 @@ #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() { XRC_ADD_STYLE(wxHW_SCROLLBAR_NEVER); XRC_ADD_STYLE(wxHW_SCROLLBAR_AUTO); @@ -56,7 +52,7 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource() { wxString url = GetParamValue(wxT("url")); wxFileSystem& fsys = GetCurFileSystem(); - + wxFSFile *f = fsys.OpenFile(url); if (f) { @@ -66,14 +62,14 @@ wxObject *wxHtmlWindowXmlHandler::DoCreateResource() else control->LoadPage(url); } - + else if (HasParam(wxT("htmlcode"))) { control->SetPage(GetText(wxT("htmlcode"))); } SetupWindow(control); - + return control; } @@ -82,4 +78,4 @@ bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node) return IsOfClass(node, wxT("wxHtmlWindow")); } -#endif // wxUSE_HTML +#endif // wxUSE_XRC && wxUSE_HTML