cleanup:

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

diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp
index c034af5f2029250deca14ab4ed707deae1172f9d..6173b2ef2d4bffcbbb42ec765a7c3f356a000e90 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();
         }
@@ -621,12 +624,6 @@ void wxSimpleHtmlListBox::Delete(unsigned int n)
 
 void wxSimpleHtmlListBox::Append(const wxArrayString& strings)
 {
-    // we know how many items are going to be added - avoid too many reallocs
-    // m_items.Alloc(strings.GetCount());
-    // FIXME: Alloc() will clear all the old contents.
-    //        Suggested fix = make Grow() public and make WX_APPEND_ARRAY take
-    //        care of calling it automatically
-
     // append all given items at once
     WX_APPEND_ARRAY(m_items, strings);
     m_HTMLclientData.Add(NULL, strings.GetCount());