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

Merge branch 'qt_listbox_failing_tests'

Browse Source 
Fixes for item selection and cleanup.

See https://github.com/wxWidgets/wxWidgets/pull/1159
This commit is contained in:
Vadim Zeitlin
2019-01-21 23:43:56 +01:00
parent 613513501b c8f427181e
commit 26c9fd0033
2 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/qt/listbox.h
View File

@@ -49,8 +49,8 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
virtual bool IsSelected(int n) const;
virtual int GetSelections(wxArrayInt& aSelections) const;
virtual bool IsSelected(int n) const wxOVERRIDE;
virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE;
virtual unsigned int GetCount() const;
virtual wxString GetString(unsigned int n) const;
@@ -63,9 +63,9 @@ public:
void QtSendEvent(wxEventType evtType, const QModelIndex &index, bool selected);
protected:
virtual void DoSetFirstItem(int n);
virtual void DoSetFirstItem(int n) wxOVERRIDE;
virtual void DoSetSelection(int n, bool select);
virtual void DoSetSelection(int n, bool select) wxOVERRIDE;
virtual int DoInsertItems(const wxArrayStringsAdapter & items,
unsigned int pos,
@@ -90,6 +90,9 @@ protected:
private:
virtual void Init(); //common construction
// Common part of both Create() overloads.
void DoCreate(wxWindow* parent, long style);
void UnSelectAll();
wxDECLARE_DYNAMIC_CLASS(wxListBox);