merged Ctrl-Space fix from 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1489,10 +1489,13 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
|||||||
wxLIST_NEXT_ALL,
|
wxLIST_NEXT_ALL,
|
||||||
wxLIST_STATE_SELECTED);
|
wxLIST_STATE_SELECTED);
|
||||||
|
|
||||||
// <Enter> or <Space> activate the selected item if any
|
// <Enter> or <Space> activate the selected item if any (but
|
||||||
if ( lItem != -1 && (wVKey == VK_RETURN || wVKey == VK_SPACE) )
|
// not with Shift and/or Ctrl as then they have a predefined
|
||||||
|
// meaning for the list view)
|
||||||
|
if ( lItem != -1 &&
|
||||||
|
(wVKey == VK_RETURN || wVKey == VK_SPACE) &&
|
||||||
|
!(wxIsShiftDown() || wxIsCtrlDown()) )
|
||||||
{
|
{
|
||||||
// TODO this behaviour probably should be optional
|
|
||||||
eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
|
eventType = wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
|
||||||
event.m_itemIndex = lItem;
|
event.m_itemIndex = lItem;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user