return correct client area for at least the primary display, fixes the problems with...

[wxWidgets.git] / src / generic / htmllbox.cpp

diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp
index 8d415e105195b77b9b21fcab4bb9cfb3c7f48385..c7c03d62373deb14131a3638fa91a3d1b6b61c77 100644 (file)
--- a/src/generic/htmllbox.cpp
+++ b/src/generic/htmllbox.cpp
@@ -293,7 +293,10 @@ void wxHtmlListBox::CacheItem(size_t n) const
             self->m_htmlParser = new wxHtmlWinParser(self);
             m_htmlParser->SetDC(new wxClientDC(self));
             m_htmlParser->SetFS(&self->m_filesystem);
-
+#if !wxUSE_UNICODE
+            if (GetFont().Ok())
+                m_htmlParser->SetInputEncoding(GetFont().GetEncoding());
+#endif
             // use system's default GUI font by default:
             m_htmlParser->SetStandardFonts();
         }
@@ -567,7 +570,9 @@ bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id,
     if (!wxHtmlListBox::Create(parent, id, pos, size, style, name))
         return false;
 
+#if wxUSE_VALIDATORS
     SetValidator(validator);
+#endif
     for (int i=0; i<n; i++)
         Append(choices[i]);
 
@@ -585,7 +590,9 @@ bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id,
     if (!wxHtmlListBox::Create(parent, id, pos, size, style, name))
         return false;
 
+#if wxUSE_VALIDATORS
     SetValidator(validator);
+#endif
     Append(choices);
 
     return true;