From 019cf6e6f06dbd435f9d05aab7f82baaf6a51a12 Mon Sep 17 00:00:00 2001 From: Scott Furry Date: Fri, 14 Jul 2017 16:49:53 +0200 Subject: [PATCH] Move wxComboBox::Clear() out of line in wxQt No real changes. --- include/wx/qt/combobox.h | 6 +----- src/qt/combobox.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/wx/qt/combobox.h b/include/wx/qt/combobox.h index b2fe23d305..4daf97c90c 100644 --- a/include/wx/qt/combobox.h +++ b/include/wx/qt/combobox.h @@ -63,11 +63,7 @@ public: return wxItemContainer::GetStringSelection(); } - virtual void Clear() wxOVERRIDE - { - wxTextEntry::Clear(); - wxItemContainer::Clear(); - } + virtual void Clear() wxOVERRIDE; // See wxComboBoxBase discussion of IsEmpty(). bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } diff --git a/src/qt/combobox.cpp b/src/qt/combobox.cpp index 67757fd2ee..9fd3308f5e 100644 --- a/src/qt/combobox.cpp +++ b/src/qt/combobox.cpp @@ -133,6 +133,12 @@ void wxComboBox::Dismiss() static_cast(GetHandle())->hidePopup(); } +void wxComboBox::Clear() +{ + wxTextEntry::Clear(); + wxItemContainer::Clear(); +} + void wxComboBox::SetSelection( long from, long to ) { // SelectAll uses -1 to -1, adjust for qt: