diff options
| author | Greg Ercolano <erco@seriss.com> | 2012-02-21 00:34:27 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2012-02-21 00:34:27 +0000 |
| commit | e920c28d0b7b1afbc554438d2d0e0b45545827e8 (patch) | |
| tree | 847c685883952941bec33abcd2b6a4a068d7bbd4 /src/Fl_Tree.cxx | |
| parent | 34a045f2e3f5e2cd5c77fa0d0ac01e29b6b013e0 (diff) | |
Fix STR#2807: when(FL_WHEN_NEVER) was not working.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9249 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Tree.cxx')
| -rw-r--r-- | src/Fl_Tree.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Fl_Tree.cxx b/src/Fl_Tree.cxx index 75e379600..ecf1fff27 100644 --- a/src/Fl_Tree.cxx +++ b/src/Fl_Tree.cxx @@ -169,7 +169,7 @@ int Fl_Tree::handle(int e) { case FL_Enter: // ENTER: selects current item only case FL_KP_Enter: if ( when() & ~FL_WHEN_ENTER_KEY) { - select_only(_item_focus); + select_only(_item_focus, when()); show_item(_item_focus); // STR #2426 return(1); } @@ -180,12 +180,12 @@ int Fl_Tree::handle(int e) { break; case FL_TREE_SELECT_SINGLE: if ( ! _item_focus->is_selected() ) // not selected? - select_only(_item_focus); // select only this + select_only(_item_focus, when()); // select only this else - deselect_all(); // select nothing + deselect_all(0, when()); // select nothing break; case FL_TREE_SELECT_MULTI: - select_toggle(_item_focus); + select_toggle(_item_focus, when()); break; } break; @@ -220,7 +220,7 @@ int Fl_Tree::handle(int e) { if ( _prefs.selectmode() == FL_TREE_SELECT_MULTI && // multiselect on? (Fl::event_state() & FL_SHIFT) && // shift key? ! _item_focus->is_selected() ) { // not already selected? - select(_item_focus); // extend selection.. + select(_item_focus, when()); // extend selection.. } return(1); } @@ -264,16 +264,16 @@ int Fl_Tree::handle(int e) { case FL_TREE_SELECT_NONE: break; case FL_TREE_SELECT_SINGLE: - select_only(o); + select_only(o, when()); break; case FL_TREE_SELECT_MULTI: { if ( Fl::event_state() & FL_SHIFT ) { // SHIFT+PUSH? select(o); // add to selection } else if ( Fl::event_state() & FL_CTRL ) { // CTRL+PUSH? - select_toggle(o); // toggle selection state + select_toggle(o, when()); // toggle selection state lastselect = o; // save toggled item (prevent oscillation) } else { - select_only(o); + select_only(o, when()); } break; } @@ -308,12 +308,12 @@ int Fl_Tree::handle(int e) { switch ( _prefs.selectmode() ) { case FL_TREE_SELECT_NONE: break; // no selection changes case FL_TREE_SELECT_SINGLE: - select_only(o); + select_only(o, when()); break; case FL_TREE_SELECT_MULTI: if ( Fl::event_state() & FL_CTRL && // CTRL-DRAG: toggle? lastselect != o ) { // not already toggled from last microdrag? - select_toggle(o); // toggle selection + select_toggle(o, when()); // toggle selection lastselect = o; // save we toggled it (prevents oscillation) } else { select(o); // select this |