Author: greg.ercolano
Date: 2012-02-20 16:34:27 -0800 (Mon, 20 Feb 2012)
New Revision: 9249
Log:
Fix STR#2807: when(FL_WHEN_NEVER) was not working.
Modified:
branches/branch-1.3/src/Fl_Tree.cxx
Modified: branches/branch-1.3/src/Fl_Tree.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Tree.cxx 2012-02-20 12:05:15 UTC (rev 9248)
+++ branches/branch-1.3/src/Fl_Tree.cxx 2012-02-21 00:34:27 UTC (rev 9249)
@@ -169,7 +169,7 @@
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 @@
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 @@
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 @@
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 @@
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
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
