Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve ambiguity with wxOwnerDrawnComboBox::Clear(), virtual method which is derived from two base classes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-12-16 18:13:43 +00:00
parent bd0fa687b6
commit eae20c901b
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/odcombo.h
View File

@@ -317,8 +317,9 @@ public:
virtual void Select(int n); virtual void Select(int n);
virtual int GetSelection() const; virtual int GetSelection() const;
// Override this just to maintain consistency with virtual methods // Override these just to maintain consistency with virtual methods
// between classes. // between classes.
virtual void Clear();
virtual void GetSelection(long *from, long *to) const; virtual void GetSelection(long *from, long *to) const;
virtual void SetSelection(int n) { Select(n); } virtual void SetSelection(int n) { Select(n); }

5
src/generic/odcombo.cpp
View File

@@ -996,6 +996,11 @@ void wxOwnerDrawnComboBox::DoClear()
SetValue(wxEmptyString); SetValue(wxEmptyString);
} }
void wxOwnerDrawnComboBox::Clear()
{
DoClear();
}
void wxOwnerDrawnComboBox::DoDeleteOneItem(unsigned int n) void wxOwnerDrawnComboBox::DoDeleteOneItem(unsigned int n)
{ {
wxCHECK_RET( IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::Delete") ); wxCHECK_RET( IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::Delete") );