Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added disambiguation for Clear() too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-09-27 12:49:18 +00:00
parent 944287e68e
commit e6a8416274
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/msw/combobox.h
View File

@@ -72,6 +72,7 @@ public:
// resolve ambiguities among virtual functions inherited from both base // resolve ambiguities among virtual functions inherited from both base
// classes // classes
virtual void Clear();
virtual void SetValue(const wxString& value); virtual void SetValue(const wxString& value);
virtual wxString GetStringSelection() const virtual wxString GetStringSelection() const
{ return wxChoice::GetStringSelection(); } { return wxChoice::GetStringSelection(); }

7
src/msw/combobox.cpp
View File

@@ -510,6 +510,13 @@ void wxComboBox::SetValue(const wxString& value)
wxTextEntry::SetValue(value); wxTextEntry::SetValue(value);
} }
void wxComboBox::Clear()
{
wxChoice::Clear();
if ( !HasFlag(wxCB_READONLY) )
wxTextEntry::Clear();
}
bool wxComboBox::IsEditable() const bool wxComboBox::IsEditable() const
{ {
return !HasFlag(wxCB_READONLY) && wxTextEntry::IsEditable(); return !HasFlag(wxCB_READONLY) && wxTextEntry::IsEditable();