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

Allow columns reordering only if its wxCOL_REORDERABLE flag is set

Browse Source 
Dragging the column should be allowed only if wxHD_ALLOW_REORDER header
style and wxCOL_REORDERABLE column flag are both set.

Closes #18332.
This commit is contained in:
Artur Wieczorek
2019-01-20 11:13:49 +01:00
parent 704f03e70e
commit 3000091cd2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/generic/headerctrlg.cpp
View File

@@ -686,8 +686,11 @@ void wxHeaderCtrl::OnMouse(wxMouseEvent& mevent)
wxASSERT_MSG( !IsResizing(), "reentering column resize mode?" ); wxASSERT_MSG( !IsResizing(), "reentering column resize mode?" );
StartOrContinueResizing(col, xPhysical); StartOrContinueResizing(col, xPhysical);
} }
else if ( HasFlag(wxHD_ALLOW_REORDER) ) // on column itself // on column itself - both header and column must have the appropriate
// flags to allow dragging the column
else if ( HasFlag(wxHD_ALLOW_REORDER) && GetColumn(col).IsReorderable() )
{ {
// start dragging the column // start dragging the column
wxASSERT_MSG( !IsReordering(), "reentering column move mode?" ); wxASSERT_MSG( !IsReordering(), "reentering column move mode?" );