summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGreg Ercolano <erco@seriss.com>2010-05-10 22:51:01 +0000
committerGreg Ercolano <erco@seriss.com>2010-05-10 22:51:01 +0000
commit1f6d222cb8979737052357324b7d5d31a4a70c49 (patch)
tree3dcae2c797a306434506a8d7f0a7eab889a46754 /src
parentc4fd0d2900d264ad4417cc5fe39c03194c16352e (diff)
1) Modified tree test program to include when() options,
2) Improved when() handling for left mouse behavior 3) Added docs for when() handling git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7601 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl_Tree.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Fl_Tree.cxx b/src/Fl_Tree.cxx
index 3578778ca..92b4c0123 100644
--- a/src/Fl_Tree.cxx
+++ b/src/Fl_Tree.cxx
@@ -279,6 +279,7 @@ int Fl_Tree::handle(int e) {
break;
}
case FL_DRAG: {
+ if ( Fl::event_button() != FL_LEFT_MOUSE ) break;
Fl_Tree_Item *o = _root->find_clicked(_prefs);
if ( o ) {
ret |= 1; // handled
@@ -328,11 +329,9 @@ int Fl_Tree::handle(int e) {
case FL_RELEASE: {
if ( Fl::event_button() == FL_LEFT_MOUSE ) {
ret |= 1;
- }
- if ( when() & FL_WHEN_RELEASE ||
- ( changed && when() & FL_WHEN_CHANGED) ) {
- set_changed();
- do_callback((Fl_Widget*)this, user_data()); // item callback
+ if ( when() & FL_WHEN_RELEASE || ( this->changed() && (when() & FL_WHEN_CHANGED)) ) {
+ do_callback((Fl_Widget*)this, user_data()); // item callback
+ }
}
break;
}