Resolve ambiguity with wxOwnerDrawnComboBox::Clear(), virtual method which is derived from two base classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -317,8 +317,9 @@ public:
|
||||
virtual void Select(int n);
|
||||
virtual int GetSelection() const;
|
||||
|
||||
// Override this just to maintain consistency with virtual methods
|
||||
// Override these just to maintain consistency with virtual methods
|
||||
// between classes.
|
||||
virtual void Clear();
|
||||
virtual void GetSelection(long *from, long *to) const;
|
||||
|
||||
virtual void SetSelection(int n) { Select(n); }
|
||||
|
@@ -996,6 +996,11 @@ void wxOwnerDrawnComboBox::DoClear()
|
||||
SetValue(wxEmptyString);
|
||||
}
|
||||
|
||||
void wxOwnerDrawnComboBox::Clear()
|
||||
{
|
||||
DoClear();
|
||||
}
|
||||
|
||||
void wxOwnerDrawnComboBox::DoDeleteOneItem(unsigned int n)
|
||||
{
|
||||
wxCHECK_RET( IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::Delete") );
|
||||
|
Reference in New Issue
Block a user