From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 27 Sep 2007 12:49:18 +0000 (+0000)
Subject: added disambiguation for Clear() too
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e6a8416274252fb6ea33800cfce0e4ba0a0542f1

added disambiguation for Clear() too

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

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 9c5aec679c..7d1b7b7025 100644
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -72,6 +72,7 @@ public:
 
     // resolve ambiguities among virtual functions inherited from both base
     // classes
+    virtual void Clear();
     virtual void SetValue(const wxString& value);
     virtual wxString GetStringSelection() const
         { return wxChoice::GetStringSelection(); }
diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 5b1fc63868..93c931c85f 100644
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -510,6 +510,13 @@ void wxComboBox::SetValue(const wxString& value)
         wxTextEntry::SetValue(value);
 }
 
+void wxComboBox::Clear()
+{
+    wxChoice::Clear();
+    if ( !HasFlag(wxCB_READONLY) )
+        wxTextEntry::Clear();
+}
+
 bool wxComboBox::IsEditable() const
 {
     return !HasFlag(wxCB_READONLY) && wxTextEntry::IsEditable();