X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e49601492345158938e6d64e8423e43fb77d94e..6dc2a916dfa34137434a17ba7d89d875d17ebbc9:/src/html/winpars.cpp diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp index 2c20d8858f..7fc11a1280 100644 --- a/src/html/winpars.cpp +++ b/src/html/winpars.cpp @@ -7,11 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "winpars.h" -#endif - #include "wx/wxprec.h" #include "wx/defs.h" @@ -32,7 +27,7 @@ #include "wx/fontmap.h" #include "wx/log.h" #include "wx/settings.h" -#include "wx/url.h" +#include "wx/uri.h" //----------------------------------------------------------------------------- @@ -116,7 +111,7 @@ void wxHtmlWinParser::RemoveModule(wxHtmlTagsModule *module) m_Modules.DeleteObject(module); } -void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, +void wxHtmlWinParser::SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes) { static int default_sizes[7] = @@ -193,7 +188,7 @@ void wxHtmlWinParser::InitParser(const wxString& source) */ m_UseLink = false; - m_Link = wxHtmlLinkInfo( wxT(""), wxT("") ); + m_Link = wxHtmlLinkInfo( wxEmptyString ); m_LinkColor.Set(0, 0, 0xFF); m_ActualColor.Set(0, 0, 0); m_Align = wxHTML_ALIGN_LEFT;