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

Remove wxListCtrl::EnableSortIndicator()

Browse Source 
The old API seems unnecessarily complex, it is simpler to just let the
application call ShowSortIndicator() itself from its
wxEVT_LIST_COL_CLICK handler, which needs to be defined anyhow in order
to actually sort the items, rather than require it to enable sort
indicator, explicitly set it initially and then remember to not set it
any longer in response to the column clicks.

Also make RemoveSortIndicator() non-virtual and implement it simply as
ShowSortIndicator(-1) because this actually simplifies the code too.
This commit is contained in:
Vadim Zeitlin
2021-12-14 01:06:21 +00:00
parent 30ce892ed5
commit 52649cc566
8 changed files with 33 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/msw/listctrl.h
View File

@@ -226,10 +226,7 @@ public:
void CheckItem(long item, bool check) wxOVERRIDE;
// Sort indicator in header
void EnableSortIndicator(bool enable = true) wxOVERRIDE;
bool IsSortIndicatorEnabled() const wxOVERRIDE;
void ShowSortIndicator(int idx, bool ascending = true) wxOVERRIDE;
void RemoveSortIndicator() wxOVERRIDE;
int GetSortIndicator() const wxOVERRIDE;
bool IsAscendingSortIndicator() const wxOVERRIDE;
@@ -426,21 +423,16 @@ protected:
int m_colCount; // Windows doesn't have GetColumnCount so must
// keep track of inserted/deleted columns
// m_sortCol and m_sortAsc are used only if m_enableSortCol is true.
//
// Note that m_sortCol may be set to -1, but this is not the same as
// setting m_enableSortCol to false, as the control updates the sort
// indicator on column click in the former case, but not in the latter.
bool m_enableSortCol;
bool m_sortAsc;
int m_sortCol;
// all wxMSWListItemData objects we use
wxVector<wxMSWListItemData *> m_internalData;
// true if we have any items with custom attributes
bool m_hasAnyAttr;
// m_sortAsc is only used if m_sortCol != -1
bool m_sortAsc;
int m_sortCol;
private:
// process NM_CUSTOMDRAW notification message
WXLPARAM OnCustomDraw(WXLPARAM lParam);
@@ -462,8 +454,7 @@ private:
// in-place editor control.
void OnCharHook(wxKeyEvent& event);
// Draw the sort arrow in the header. Should only be called when sort
// indicators are enabled.
// Draw the sort arrow in the header.
void DrawSortArrow();
// Object using for header custom drawing if necessary, may be NULL.