From 558716e8f9603a8b63e653a8f9a08c224f52e163 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sat, 6 Feb 2016 21:49:26 -0800 Subject: [PATCH] Avoid GTK warnings when calling Clear() on a wxBitmapComboBox Use wxTextEntry::Clear(), now that it uses Remove() instead of SetValue(). See #16654 and fc8d3f6 --- src/gtk/combobox.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index c9ea77f29f..9c96133c79 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -297,12 +297,7 @@ wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) void wxComboBox::Clear() { - // Do not call wxTextEntry::Clear() here as it's implemented in terms of - // virtual SetValue() and so would call our own overridden version of this - // method, which wouldn't do the right thing in wxCB_READONLY case. - // - // Clear the text directly to avoid this. - wxTextEntry::SetValue(wxString()); + wxTextEntry::Clear(); wxItemContainer::Clear(); }