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

No changes, just move wxComboBox::Clear() out of line in wxGTK.

Browse Source 
Make this function non-inline to facilitate further modifications.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-11-01 13:56:26 +00:00
parent 8a971c12ad
commit 03e64f3c20
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/combobox.h
View File

@@ -94,11 +94,7 @@ public:
virtual void Popup(); virtual void Popup();
virtual void Dismiss(); virtual void Dismiss();
virtual void Clear() wxOVERRIDE virtual void Clear() wxOVERRIDE;
{
wxTextEntry::Clear();
wxItemContainer::Clear();
}
// See wxComboBoxBase discussion of IsEmpty(). // See wxComboBoxBase discussion of IsEmpty().
bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }

6
src/gtk/combobox.cpp
View File

@@ -295,6 +295,12 @@ wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
#endif #endif
} }
void wxComboBox::Clear()
{
wxTextEntry::Clear();
wxItemContainer::Clear();
}
void wxComboBox::SetValue(const wxString& value) void wxComboBox::SetValue(const wxString& value)
{ {
if ( HasFlag(wxCB_READONLY) ) if ( HasFlag(wxCB_READONLY) )