diff --git a/include/wx/qt/combobox.h b/include/wx/qt/combobox.h index bc0222d5cb..c5bce191de 100644 --- a/include/wx/qt/combobox.h +++ b/include/wx/qt/combobox.h @@ -87,6 +87,7 @@ protected: private: void SetActualValue(const wxString& value); + bool IsReadOnly() const; // From wxTextEntry: virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; } diff --git a/src/qt/combobox.cpp b/src/qt/combobox.cpp index f8d63ca915..9189d068fa 100644 --- a/src/qt/combobox.cpp +++ b/src/qt/combobox.cpp @@ -171,7 +171,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, void wxComboBox::SetActualValue(const wxString &value) { - if ( HasFlag(wxCB_READONLY) ) + if ( IsReadOnly() ) { SetStringSelection( value ); } @@ -182,11 +182,16 @@ void wxComboBox::SetActualValue(const wxString &value) } } +bool wxComboBox::IsReadOnly() const +{ + return HasFlag( wxCB_READONLY ); +} + void wxComboBox::SetValue(const wxString& value) { SetActualValue( value ); - if ( !HasFlag(wxCB_READONLY) ) + if ( !IsReadOnly() ) SetInsertionPoint( 0 ); } @@ -251,7 +256,7 @@ void wxComboBox::Dismiss() void wxComboBox::Clear() { - if ( !HasFlag(wxCB_READONLY) ) + if ( !IsReadOnly() ) wxTextEntry::Clear(); wxItemContainer::Clear();