Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxComboBox implementation of wxTextEntry interface

Browse Source 
Implement missing methods and send, or suppress, the expected events.
This commit is contained in:
Richard Smith
2019-01-17 12:00:01 +00:00
committed by Vadim Zeitlin
parent 1a7f9124b6
commit 3618356cf1
2 changed files with 123 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/qt/combobox.h
View File

@@ -52,7 +52,7 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr);
virtual void SetSelection(int n) wxOVERRIDE { wxChoice::SetSelection(n); }
virtual void SetSelection(int n) wxOVERRIDE;
virtual void SetSelection(long from, long to) wxOVERRIDE;
virtual int GetSelection() const wxOVERRIDE { return wxChoice::GetSelection(); }
@@ -70,6 +70,12 @@ public:
bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
virtual void SetValue(const wxString& value) wxOVERRIDE;
virtual void ChangeValue(const wxString& value) wxOVERRIDE;
virtual void AppendText(const wxString &value) wxOVERRIDE;
virtual void Replace(long from, long to, const wxString &value) wxOVERRIDE;
virtual void WriteText(const wxString &value) wxOVERRIDE;
virtual void SetInsertionPoint(long insertion) wxOVERRIDE;
virtual long GetInsertionPoint() const wxOVERRIDE;
virtual void Popup();
virtual void Dismiss();
@@ -80,6 +86,7 @@ protected:
virtual wxString DoGetValue() const wxOVERRIDE;
private:
void SetActualValue(const wxString& value);
// From wxTextEntry:
virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }