added disambiguation for Clear() too

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

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(); }

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();