X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a236aa2058ccf3d36e9cafc20fa7375080c4be50..3863c5ebd92650ba88f29db4f5f8d794ec11bf80:/include/wx/htmllbox.h

diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index 89c06d29dc..21d354080c 100644
--- 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 DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
+    // resolve ambiguity between wxItemContainer and wxVListBox versions
+    void Clear();
 
 protected:
     virtual int DoInsertItems(const wxArrayStringsAdapter & items,
@@ -282,10 +282,14 @@ protected:
     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();
 
-    // 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); }