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 9c5aec679c53f3282dbdd320fbd7d9183447cb49..7d1b7b702569ba4734748a6e5cf58c671a529193 100644 (file)
--- 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 5b1fc638681a464f4785d3a59cd1397be4268614..93c931c85fdc01282c2fe5dea0943b2d25a59d89 100644 (file)
--- 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();