X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc638fc6ad89729010ec8e2be435cadd8a161c8b..3adb47a937983b19448f68601bd5ec90767646d5:/src/html/winpars.cpp?ds=inline diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp index 2148fa371e..f358cf14c5 100644 --- a/src/html/winpars.cpp +++ b/src/html/winpars.cpp @@ -29,6 +29,7 @@ #include "wx/html/winpars.h" #include "wx/html/htmlwin.h" #include "wx/fontmap.h" +#include "wx/log.h" //----------------------------------------------------------------------------- @@ -129,14 +130,14 @@ void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const void wxHtmlWinParser::InitParser(const wxString& source) { wxHtmlParser::InitParser(source); - wxASSERT_MSG(m_DC != NULL, _("no DC assigned to wxHtmlWinParser!!")); + wxASSERT_MSG(m_DC != NULL, _T("no DC assigned to wxHtmlWinParser!!")); m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE; m_FontSize = 3; //default one CreateCurrentFont(); // we're selecting default font into m_DC -> GetTextExtent("H", &m_CharWidth, &m_CharHeight); /* NOTE : we're not using GetCharWidth/Height() because - of differences under X and win + of differences under X and win */ m_UseLink = FALSE; @@ -353,6 +354,8 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc) wxFONTENCODING_ISO8859_1 : m_OutputEnc, wxCONVERT_SUBSTITUTE)) { // total failture :-( + wxLogError(_("Failed to display HTML document in %s encoding"), + wxFontMapper::GetEncodingName(enc).mb_str()); m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT; delete m_EncConv; m_EncConv = NULL;