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

reset selection anchor when a key changing selection is pressed without Shift (closes bug 1176908)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-04-05 23:30:47 +00:00
parent b3d6b0c94c
commit ba8a196102
1 changed files with 67 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/msw/treectrl.cpp
View File

@@ -1951,6 +1951,8 @@ void wxTreeCtrl::UnselectAll()
::UnselectItem(GetHwnd(), HITEM_PTR(selections[n])); ::UnselectItem(GetHwnd(), HITEM_PTR(selections[n]));
#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
} }
m_htSelStart.Unset();
} }
else else
{ {
@@ -2439,17 +2441,10 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
bool bCtrl = wxIsCtrlDown(), bool bCtrl = wxIsCtrlDown(),
bShift = wxIsShiftDown(); bShift = wxIsShiftDown();
// we handle.arrows and space, but not page up/down and home/end: the
// latter should be easy, but not the former
HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd()); HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
if ( !m_htSelStart ) switch ( wParam )
{
m_htSelStart = htSel;
}
if ( wParam == VK_SPACE )
{ {
case VK_SPACE:
if ( bCtrl ) if ( bCtrl )
{ {
::ToggleItemSelection(GetHwnd(), htSel); ::ToggleItemSelection(GetHwnd(), htSel);
@@ -2462,9 +2457,10 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
} }
processed = true; processed = true;
} break;
else if ( wParam == VK_UP || wParam == VK_DOWN )
{ case VK_UP:
case VK_DOWN:
if ( !bCtrl && !bShift ) if ( !bCtrl && !bShift )
{ {
// no modifiers, just clear selection and then let the default // no modifiers, just clear selection and then let the default
@@ -2475,9 +2471,14 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
{ {
(void)wxControl::MSWWindowProc(nMsg, wParam, lParam); (void)wxControl::MSWWindowProc(nMsg, wParam, lParam);
HTREEITEM htNext = (HTREEITEM)(wParam == VK_UP HTREEITEM htNext = (HTREEITEM)
? TreeView_GetPrevVisible(GetHwnd(), htSel) TreeView_GetNextItem
: TreeView_GetNextVisible(GetHwnd(), htSel)); (
GetHwnd(),
htSel,
wParam == VK_UP ? TVGN_PREVIOUSVISIBLE
: TVGN_NEXTVISIBLE
);
if ( !htNext ) if ( !htNext )
{ {
@@ -2487,6 +2488,9 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
if ( bShift ) if ( bShift )
{ {
if ( !m_htSelStart )
m_htSelStart = htSel;
SelectRange(GetHwnd(), HITEM(m_htSelStart), htNext); SelectRange(GetHwnd(), HITEM(m_htSelStart), htNext);
} }
else // bCtrl else // bCtrl
@@ -2497,6 +2501,19 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
processed = true; processed = true;
} }
break;
case VK_HOME:
case VK_END:
case VK_PRIOR:
case VK_NEXT:
// TODO: handle Shift/Ctrl with these keys
if ( !bCtrl && !bShift )
{
UnselectAll();
m_htSelStart.Unset();
}
} }
} }
#endif // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE #endif // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE