another fix for the default button in the dialog

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

diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp
index abaf644e22b1a53182a678d14ffa2d9ad2b8c0a6..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;
@@ -593,7 +600,7 @@ bool wxSimpleHtmlListBox::Create(wxWindow *parent, wxWindowID id,
 
 wxSimpleHtmlListBox::~wxSimpleHtmlListBox()
 {
-    wxASSERT(m_items.GetCount() == m_clientData.GetCount());
+    wxASSERT(m_items.GetCount() == m_HTMLclientData.GetCount());
     if (HasClientObjectData())
     {
         // clear the array of client data objects
@@ -602,41 +609,35 @@ wxSimpleHtmlListBox::~wxSimpleHtmlListBox()
     }
 
     m_items.Clear();
-    m_clientData.Clear();
+    m_HTMLclientData.Clear();
 }
 
 void wxSimpleHtmlListBox::Clear()
 {
     m_items.Clear();
-    m_clientData.Clear();
+    m_HTMLclientData.Clear();
     UpdateCount();
 }
 
 void wxSimpleHtmlListBox::Delete(unsigned int n)
 {
     m_items.RemoveAt(n);
-    m_clientData.RemoveAt(n);
+    m_HTMLclientData.RemoveAt(n);
     UpdateCount();
 }
 
 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_clientData.Add(NULL, strings.GetCount());
+    m_HTMLclientData.Add(NULL, strings.GetCount());
     UpdateCount();
 }
 
 int wxSimpleHtmlListBox::DoAppend(const wxString& item)
 {
     m_items.Add(item);
-    m_clientData.Add(NULL);
+    m_HTMLclientData.Add(NULL);
     UpdateCount();
     return GetCount()-1;
 }
@@ -644,7 +645,7 @@ int wxSimpleHtmlListBox::DoAppend(const wxString& item)
 int wxSimpleHtmlListBox::DoInsert(const wxString& item, unsigned int pos)
 {
     m_items.Insert(item, pos);
-    m_clientData.Insert(NULL, pos);
+    m_HTMLclientData.Insert(NULL, pos);
     UpdateCount();
     return pos;
 }
@@ -668,7 +669,7 @@ wxString wxSimpleHtmlListBox::GetString(unsigned int n) const
 
 void wxSimpleHtmlListBox::UpdateCount()
 {
-    wxASSERT(m_items.GetCount() == m_clientData.GetCount());
+    wxASSERT(m_items.GetCount() == m_HTMLclientData.GetCount());
     wxHtmlListBox::SetItemCount(m_items.GetCount());
 
     // very small optimization: if you need to add lot of items to