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

Make wxDataViewCtrl::IsMultiColumnSortAllowed() exist in all ports

Browse Source 
Contrary to the documentation, this method only existed in the generic
control, add it to the base class now so that the code using it could compile
when using the native ports too.
This commit is contained in:
Vadim Zeitlin
2016-03-05 18:42:02 +01:00
parent 062444ee50
commit 34b0e534f8
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/dataview.h
View File

@@ -662,6 +662,9 @@ public:
return !allow; return !allow;
} }
// Return true if multi column sort is currently allowed.
virtual bool IsMultiColumnSortAllowed() const { return false; }
// This should also be overridden to actually use the specified column for // This should also be overridden to actually use the specified column for
// sorting if using multiple columns is supported. // sorting if using multiple columns is supported.
virtual void ToggleSortByColumn(int WXUNUSED(column)) { } virtual void ToggleSortByColumn(int WXUNUSED(column)) { }

2
include/wx/generic/dataview.h
View File

@@ -227,7 +227,7 @@ public:
virtual bool SetFont(const wxFont & font) wxOVERRIDE; virtual bool SetFont(const wxFont & font) wxOVERRIDE;
virtual bool AllowMultiColumnSort(bool allow) wxOVERRIDE; virtual bool AllowMultiColumnSort(bool allow) wxOVERRIDE;
virtual bool IsMultiColumnSortAllowed() { return m_allowMultiColumnSort; } virtual bool IsMultiColumnSortAllowed() const wxOVERRIDE { return m_allowMultiColumnSort; }
virtual void ToggleSortByColumn(int column) wxOVERRIDE; virtual void ToggleSortByColumn(int column) wxOVERRIDE;
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP