From dfc6cd933d3558c81623c272dcd805f6dc7433f1 Mon Sep 17 00:00:00 2001 From: Sylvain Bougnoux Date: Mon, 21 Feb 2000 18:08:07 +0000 Subject: [PATCH] Check multiple selection :-) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/treectrl.cpp | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp index dc7160f294..9ec067f7e2 100644 --- a/src/generic/treectrl.cpp +++ b/src/generic/treectrl.cpp @@ -235,13 +235,13 @@ private: static void EventFlagsToSelType(long style, bool shiftDown, bool ctrlDown, - bool *is_multiple, - bool *extended_select, - bool *unselect_others) + bool &is_multiple, + bool &extended_select, + bool &unselect_others) { - *is_multiple = (style & wxTR_MULTIPLE) != 0; - *extended_select = shiftDown && is_multiple; - *unselect_others = !(extended_select || (ctrlDown && is_multiple)); + is_multiple = (style & wxTR_MULTIPLE) != 0; + extended_select = shiftDown && is_multiple; + unselect_others = !(extended_select || (ctrlDown && is_multiple)); } // ----------------------------------------------------------------------------- @@ -1826,8 +1826,18 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event ) EventFlagsToSelType(GetWindowStyleFlag(), event.ShiftDown(), event.ControlDown(), - &is_multiple, &extended_select, &unselect_others); + is_multiple, extended_select, unselect_others); + // + : Expand + // - : Collaspe + // * : Toggle Expand/Collapse + // ' ' | return : activate + // up : go up (not last children!) + // down : go down + // left : go to parent + // right : open if parent and go next + // home : go to root + // end : go to last item without opening parents switch (event.KeyCode()) { case '+': @@ -2237,7 +2247,7 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event ) EventFlagsToSelType(GetWindowStyleFlag(), event.ShiftDown(), event.ControlDown(), - &is_multiple, &extended_select, &unselect_others); + is_multiple, extended_select, unselect_others); if ( onButton ) {