AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolve ambiguity between 2 inherited versions of Clear() in wxSimpleHtmlListBox (see bug 1836384)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-01-08 19:24:08 +00:00
parent 8df2696160
commit e52cd41e5d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/htmllbox.h
View File

@ -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(); // resolve ambiguity between wxItemContainer and wxVListBox versions
virtual void DoDeleteOneItem(unsigned int n); void Clear();
protected: protected:
virtual int DoInsertItems(const wxArrayStringsAdapter & items, virtual int DoInsertItems(const wxArrayStringsAdapter & items,
@ -282,10 +282,14 @@ protected:
virtual void *DoGetItemClientData(unsigned int n) const virtual void *DoGetItemClientData(unsigned int n) const
{ return m_HTMLclientData[n]; } { return m_HTMLclientData[n]; }
// wxItemContainer methods
virtual void DoClear();
virtual void DoDeleteOneItem(unsigned int n);
// calls wxHtmlListBox::SetItemCount() and RefreshAll() // calls wxHtmlListBox::SetItemCount() and RefreshAll()
void UpdateCount(); 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! // wxSimpleHtmlListBox shouldn't be allowed to call them directly!
virtual void SetItemCount(size_t count) virtual void SetItemCount(size_t count)
{ wxHtmlListBox::SetItemCount(count); } { wxHtmlListBox::SetItemCount(count); }

5
src/generic/htmllbox.cpp
View File

@ -603,6 +603,11 @@ void wxSimpleHtmlListBox::DoClear()
UpdateCount(); UpdateCount();
} }
void wxSimpleHtmlListBox::Clear()
{
DoClear();
}
void wxSimpleHtmlListBox::DoDeleteOneItem(unsigned int n) void wxSimpleHtmlListBox::DoDeleteOneItem(unsigned int n)
{ {
m_items.RemoveAt(n); m_items.RemoveAt(n);