From fd7f4dfe3de3ce6b9d25e6a78eecc8d58a0041ca Mon Sep 17 00:00:00 2001 From: Scott Furry Date: Fri, 14 Jul 2017 16:50:21 +0200 Subject: [PATCH] Implement wxComboBox::SetValue() in wxQt Make setting combobox value work. --- include/wx/qt/combobox.h | 2 ++ src/qt/combobox.cpp | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/include/wx/qt/combobox.h b/include/wx/qt/combobox.h index 4daf97c90c..490e2cb117 100644 --- a/include/wx/qt/combobox.h +++ b/include/wx/qt/combobox.h @@ -69,6 +69,8 @@ public: bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } + virtual void SetValue(const wxString& value) wxOVERRIDE; + virtual void Popup(); virtual void Dismiss(); diff --git a/src/qt/combobox.cpp b/src/qt/combobox.cpp index 9fd3308f5e..14af9eb2d9 100644 --- a/src/qt/combobox.cpp +++ b/src/qt/combobox.cpp @@ -118,6 +118,14 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, return QtCreateControl( parent, id, pos, size, style, validator, name ); } +void wxComboBox::SetValue(const wxString& value) +{ + if ( HasFlag(wxCB_READONLY) ) + SetStringSelection(value); + else + wxTextEntry::SetValue(value); +} + wxString wxComboBox::DoGetValue() const { return wxQtConvertString( m_qtComboBox->currentText() );