From eae20c901beaa1059598fa12aa13e454779805e9 Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Thu, 16 Dec 2010 18:13:43 +0000 Subject: [PATCH] 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 --- include/wx/odcombo.h | 3 ++- src/generic/odcombo.cpp | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h index 026720bcee..2dc15d4058 100644 --- a/include/wx/odcombo.h +++ b/include/wx/odcombo.h @@ -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); } diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp index d0ca3c11f1..09758b214d 100644 --- a/src/generic/odcombo.cpp +++ b/src/generic/odcombo.cpp @@ -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") ); -- 2.50.0