Resolve ambiguity with wxOwnerDrawnComboBox::Clear(), virtual method which is derived...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index 026720bcee8688eceb0b72c0ff9310bd8b6f4ec3..2dc15d4058a08079e21f8d046e9e70a845107a12 100644 (file)
--- 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 d0ca3c11f1729c4c1f1ab3ee6612c7af9636661c..09758b214d4e83451c69f2df99031683c78d64cc 100644 (file)
--- 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") );