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

Merge branch 'generic-listctrl-fixes'

Browse Source 
Fix selection when right clicking in generic wxListCtrl and other minor
improvements.

See https://github.com/wxWidgets/wxWidgets/pull/2483
This commit is contained in:
Vadim Zeitlin
2021-08-23 02:01:17 +02:00
parent efb5ae2a1d cb6d67bab4
commit d6ba8eafc5
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/listctrl/listtest.cpp
View File

@@ -1465,7 +1465,7 @@ void MyListCtrl::OnRightClick(wxMouseEvent& event)
default: where = "not clear exactly where on"; break; default: where = "not clear exactly where on"; break;
} }
wxLogMessage("Right double click %s item %ld, subitem %ld", wxLogMessage("Right click %s item %ld, subitem %ld",
where, item, subitem); where, item, subitem);
} }

10
src/generic/listctrl.cpp
View File

@@ -2682,8 +2682,9 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
// Multi-selections should not be cleared if a selected item is clicked. // Multi-selections should not be cleared if a selected item is clicked.
if (!IsHighlighted(current)) if (!IsHighlighted(current))
{ {
size_t oldCurrent = m_current;
ChangeCurrent(current); ChangeCurrent(current);
HighlightOnly(m_current); HighlightOnly(m_current, oldCurrent);
} }
SendNotify( current, wxEVT_LIST_ITEM_RIGHT_CLICK, event.GetPosition() ); SendNotify( current, wxEVT_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
@@ -5543,9 +5544,12 @@ long wxGenericListCtrl::FindItem( long WXUNUSED(start), const wxPoint& pt,
return m_mainWin->FindItem( pt ); return m_mainWin->FindItem( pt );
} }
// TODO: sub item hit testing long wxGenericListCtrl::HitTest(const wxPoint& point, int& flags, long *col) const
long wxGenericListCtrl::HitTest(const wxPoint& point, int& flags, long *) const
{ {
// TODO: sub item hit testing
if ( col )
*col = -1;
return m_mainWin->HitTest( (int)point.x, (int)point.y, flags ); return m_mainWin->HitTest( (int)point.x, (int)point.y, flags );
} }