From 03e64f3c204f9a27d2070084a3f691bfb0d4fb96 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 1 Nov 2014 13:56:26 +0000 Subject: [PATCH] No changes, just move wxComboBox::Clear() out of line in wxGTK. 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 --- include/wx/gtk/combobox.h | 6 +----- src/gtk/combobox.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h index 0c4240bd0c..2fc432ae5d 100644 --- a/include/wx/gtk/combobox.h +++ b/include/wx/gtk/combobox.h @@ -94,11 +94,7 @@ public: virtual void Popup(); virtual void Dismiss(); - 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/gtk/combobox.cpp b/src/gtk/combobox.cpp index 7813ab40c3..d507865f53 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -295,6 +295,12 @@ wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) #endif } +void wxComboBox::Clear() +{ + wxTextEntry::Clear(); + wxItemContainer::Clear(); +} + void wxComboBox::SetValue(const wxString& value) { if ( HasFlag(wxCB_READONLY) )