resolve ambiguity between 2 inherited versions of Clear() in wxSimpleHtmlListBox...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index 89c06d29dc11154c52a51dc314afb33a0864345c..21d354080c708e11e4f8b8890b27b24b74579eee 100644 (file)
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -268,8 +268,8 @@ public:
 
     virtual void SetString(unsigned int n, const wxString& s);
 
 
     virtual void SetString(unsigned int n, const wxString& s);
 

-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
+    // resolve ambiguity between wxItemContainer and wxVListBox versions
+    void Clear();

 
 protected:
     virtual int DoInsertItems(const wxArrayStringsAdapter & items,
 
 protected:
     virtual int DoInsertItems(const wxArrayStringsAdapter & items,


@@ -282,10 +282,14 @@ protected:
     virtual void *DoGetItemClientData(unsigned int n) const
         { return m_HTMLclientData[n]; }
 
     virtual void *DoGetItemClientData(unsigned int n) const
         { return m_HTMLclientData[n]; }
 

+    // wxItemContainer methods
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);
+

     // calls wxHtmlListBox::SetItemCount() and RefreshAll()
     void UpdateCount();
 
     // calls wxHtmlListBox::SetItemCount() and RefreshAll()
     void UpdateCount();
 

-    // overload these functions just to change their visibility: users of
+    // override these functions just to change their visibility: users of

     // wxSimpleHtmlListBox shouldn't be allowed to call them directly!
     virtual void SetItemCount(size_t count)
         { wxHtmlListBox::SetItemCount(count); }
     // wxSimpleHtmlListBox shouldn't be allowed to call them directly!
     virtual void SetItemCount(size_t count)
         { wxHtmlListBox::SetItemCount(count); }

diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp
index cc51601b0d8d490a0f3eb1e4c367a74d4dc53f1d..796b5070c3988b45d28e186b3a3136d5f4deb4fd 100644 (file)
--- a/src/generic/htmllbox.cpp
+++ b/src/generic/htmllbox.cpp
@@ -603,6 +603,11 @@ void wxSimpleHtmlListBox::DoClear()
     UpdateCount();
 }
 
     UpdateCount();
 }
 

+void wxSimpleHtmlListBox::Clear()
+{
+    DoClear();
+}
+

 void wxSimpleHtmlListBox::DoDeleteOneItem(unsigned int n)
 {
     m_items.RemoveAt(n);
 void wxSimpleHtmlListBox::DoDeleteOneItem(unsigned int n)
 {
     m_items.RemoveAt(n);