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

fix duplicate events for selection keys after the last change (see #626)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-06 16:13:23 +00:00
parent 8c4209f7b3
commit aa8166dd51
2 changed files with 71 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/msw/treectrl.h
View File

@@ -244,7 +244,13 @@ protected:
return !HandleTreeEvent(event) || event.IsAllowed(); return !HandleTreeEvent(event) || event.IsAllowed();
} }
// handle a key event in a multi-selection control // generate a wxEVT_KEY_DOWN event from the specified WPARAM/LPARAM values
// having the same meaning as for WM_KEYDOWN, return true if it was
// processed
bool MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam);
// handle a key event in a multi-selection control, should be only called
// for keys which can be used to change the selection
// //
// return true if the key was processed, false otherwise // return true if the key was processed, false otherwise
bool MSWHandleSelectionKey(unsigned vkey); bool MSWHandleSelectionKey(unsigned vkey);

131
src/msw/treectrl.cpp
View File

@@ -2525,6 +2525,40 @@ bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
return true; return true;
} }
bool wxTreeCtrl::MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam)
{
wxTreeEvent keyEvent(wxEVT_COMMAND_TREE_KEY_DOWN, this);
int keyCode = wxCharCodeMSWToWX(wParam);
if ( !keyCode )
{
// wxCharCodeMSWToWX() returns 0 to indicate that this is a
// simple ASCII key
keyCode = wParam;
}
keyEvent.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN, keyCode,
lParam, wParam);
bool processed = HandleTreeEvent(keyEvent);
// generate a separate event for Space/Return
if ( !wxIsCtrlDown() && !wxIsShiftDown() && !wxIsAltDown() &&
((wParam == VK_SPACE) || (wParam == VK_RETURN)) )
{
const HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
if ( htSel )
{
wxTreeEvent activatedEvent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
this, htSel);
(void)HandleTreeEvent(activatedEvent);
}
}
return processed;
}
// we hook into WndProc to process WM_MOUSEMOVE/WM_BUTTONUP messages - as we // we hook into WndProc to process WM_MOUSEMOVE/WM_BUTTONUP messages - as we
// only do it during dragging, minimize wxWin overhead (this is important for // only do it during dragging, minimize wxWin overhead (this is important for
// WM_MOUSEMOVE as they're a lot of them) by catching Windows messages directly // WM_MOUSEMOVE as they're a lot of them) by catching Windows messages directly
@@ -3027,39 +3061,37 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
} }
else if ( (nMsg == WM_KEYDOWN || nMsg == WM_SYSKEYDOWN) && isMultiple ) else if ( (nMsg == WM_KEYDOWN || nMsg == WM_SYSKEYDOWN) && isMultiple )
{ {
wxTreeEvent keyEvent(wxEVT_COMMAND_TREE_KEY_DOWN, this); // normally we want to generate wxEVT_KEY_DOWN events from TVN_KEYDOWN
// notification but for the keys which can be used to change selection
int keyCode = wxCharCodeMSWToWX(wParam); // we need to do it from here so as to not apply the default behaviour
// if the events are handled by the user code
if ( !keyCode ) switch ( wParam )
{ {
// wxCharCodeMSWToWX() returns 0 to indicate that this is a case VK_RETURN:
// simple ASCII key case VK_SPACE:
keyCode = wParam; case VK_UP:
case VK_DOWN:
case VK_LEFT:
case VK_RIGHT:
case VK_HOME:
case VK_END:
case VK_PRIOR:
case VK_NEXT:
if ( !MSWHandleTreeKeyDownEvent(wParam, lParam) )
{
// use the key to update the selection if it was left
// unprocessed
MSWHandleSelectionKey(wParam);
// pretend that we did process it in any case as we already
// generated an event for it
processed = true;
}
//default: for all the other keys leave processed as false so that
// the tree control generates a TVN_KEYDOWN for us
} }
keyEvent.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN, keyCode,
lParam, wParam);
processed = HandleTreeEvent(keyEvent);
if ( !processed )
{
// update the selection if key was left unprocessed
processed = MSWHandleSelectionKey(wParam);
}
// generate a separate event for Space/Return
if ( !wxIsCtrlDown() && !wxIsShiftDown() && !wxIsAltDown() &&
((wParam == VK_SPACE) || (wParam == VK_RETURN)) )
{
const HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
if ( htSel )
{
wxTreeEvent activatedEvent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
this, htSel);
(void)HandleTreeEvent(activatedEvent);
}
}
} }
else if ( nMsg == WM_COMMAND ) else if ( nMsg == WM_COMMAND )
{ {
@@ -3276,43 +3308,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
// fabricate the lParam and wParam parameters sufficiently // fabricate the lParam and wParam parameters sufficiently
// similar to the ones from a "real" WM_KEYDOWN so that // similar to the ones from a "real" WM_KEYDOWN so that
// CreateKeyEvent() works correctly // CreateKeyEvent() works correctly
const bool isAltDown = ::GetKeyState(VK_MENU) < 0; return MSWHandleTreeKeyDownEvent(info->wVKey,
WXLPARAM lParam = (isAltDown ? KF_ALTDOWN : 0) << 16; wxIsAltDown() << 16);
WXWPARAM wParam = info->wVKey;
int keyCode = wxCharCodeMSWToWX(wParam);
if ( !keyCode )
{
// wxCharCodeMSWToWX() returns 0 to indicate that this is a
// simple ASCII key
keyCode = wParam;
}
wxTreeEvent keyEvent(wxEVT_COMMAND_TREE_KEY_DOWN, this);
keyEvent.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN,
keyCode,
lParam,
wParam);
if ( HandleTreeEvent(keyEvent) )
{
return true;
}
wxTreeItemId item = wxTreeItemId(TreeView_GetSelection(GetHwnd()));
// a separate event for Space/Return
if ( !wxIsCtrlDown() && !wxIsShiftDown() && !isAltDown &&
((info->wVKey == VK_SPACE) || (info->wVKey == VK_RETURN)) &&
item )
{
wxTreeEvent activatedEvent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
this, item);
(void)HandleTreeEvent(activatedEvent);
}
return false;
} }
break; break;