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

Move wxComboBox::Clear() out of line in wxQt

Browse Source 
No real changes.
This commit is contained in:
Scott Furry
2017-07-14 16:49:53 +02:00
committed by Vadim Zeitlin
parent 4c0b919851
commit 019cf6e6f0
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,11 +63,7 @@ public:
return wxItemContainer::GetStringSelection(); return wxItemContainer::GetStringSelection();
} }
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/qt/combobox.cpp
View File

@@ -133,6 +133,12 @@ void wxComboBox::Dismiss()
static_cast<QComboBox *>(GetHandle())->hidePopup(); static_cast<QComboBox *>(GetHandle())->hidePopup();
} }
void wxComboBox::Clear()
{
wxTextEntry::Clear();
wxItemContainer::Clear();
}
void wxComboBox::SetSelection( long from, long to ) void wxComboBox::SetSelection( long from, long to )
{ {
// SelectAll uses -1 to -1, adjust for qt: // SelectAll uses -1 to -1, adjust for qt: