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

Merge branch 'qt-dropdown'

Browse Source 
Make wxQt wxComboBox behave more consistently with the other ports. Also
includes related fixes to wxChoice and wxTextEntry.

See https://github.com/wxWidgets/wxWidgets/pull/1161
This commit is contained in:
Vadim Zeitlin
2019-01-22 15:45:03 +01:00
parent 37f7da858d 4c05b3650a
commit 8703f0c437
7 changed files with 212 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/qt/choice.h
View File

@@ -71,6 +71,8 @@ protected:
virtual void DoClear();
virtual void DoDeleteOneItem(unsigned int pos);
void QtInitSort(QComboBox *combo);
QComboBox *m_qtComboBox;
private:

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; }