Merge branch 'qt_combobox_crash' of https://github.com/GeoTeric/wxWidgets

Fix crashes when using wxCB_READONLY in wxQt.

See https://github.com/wxWidgets/wxWidgets/pull/1221
This commit is contained in:
Vadim Zeitlin
2019-02-05 03:04:21 +01:00
2 changed files with 13 additions and 3 deletions

View File

@@ -87,6 +87,7 @@ protected:
private:
void SetActualValue(const wxString& value);
bool IsReadOnly() const;
// From wxTextEntry:
virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }