summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2011-04-20 14:34:53 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2011-04-20 14:34:53 +0000
commit08b93ec97215a50ae02705e165cb4f071bb1b28e (patch)
tree869384337f46cd365b4057b4aa8945e26706d8e2
parent85a3534ee30f18bf717af36a491335ec5758b096 (diff)
Reverted changes done in svn r 7788 for STR #2420 ("Tab-Navigation focuses
non-active_r() widgets"). This must be investigated further, and if necessary, solved differently. STR #2420 will be reopened... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8615 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES1
-rw-r--r--FL/Fl_Widget.H4
2 files changed, 1 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index a5e345973..eddfd1dda 100644
--- a/CHANGES
+++ b/CHANGES
@@ -165,7 +165,6 @@ CHANGES IN FLTK 1.3.0
- Fixed Unicode support for Fl_Text_* widgets
- Fixed menu and shortcut handling (STR #2243)
- Fixed fltk-config to give --libs on one line (STR #2408)
- - Fixed tab key navigation to inactive widgets (STR #2420)
- Fixed outside label redraw damage areas (STR #2436)
- Fixed compile errors when HAVE_LIBJPEG was not defined
(STR #2382)
diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H
index 3ef78fb2a..4d6ec528e 100644
--- a/FL/Fl_Widget.H
+++ b/FL/Fl_Widget.H
@@ -752,9 +752,7 @@ public:
&& visible()) but is faster.
\retval 0 if the widget takes no events
*/
- unsigned int takesevents() const {
- return !output() && active_r() && visible_r();
- }
+ unsigned int takesevents() const {return !(flags_&(INACTIVE|INVISIBLE|OUTPUT));}
/**
Checks if the widget value changed since the last callback.