From 1f6d222cb8979737052357324b7d5d31a4a70c49 Mon Sep 17 00:00:00 2001 From: Greg Ercolano Date: Mon, 10 May 2010 22:51:01 +0000 Subject: 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 --- src/Fl_Tree.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3