Changed order of #ifdefs to get native version on OS/2, even if

[wxWidgets.git] / src / html / winpars.cpp

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index a37d1ae3465e414b08f775dea079ece3ee7ef2a7..4681967547fa6ec8b7fc56737db8b259adfcff24 100644 (file)
--- 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"
 
 
 //-----------------------------------------------------------------------------
@@ -61,6 +62,8 @@ wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser()
                         }
 #ifdef __WXMSW__
         static int default_sizes[7] = {7, 8, 10, 12, 16, 22, 30};
+#elif defined(__WXMAC__)
+        static int default_sizes[7] = {9, 12, 14, 18, 24, 30, 36};
 #else
         static int default_sizes[7] = {10, 12, 14, 16, 19, 24, 32};
 #endif
@@ -351,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;