summaryrefslogtreecommitdiff
path: root/src/Fl.cxx
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2002-01-07 18:47:27 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2002-01-07 18:47:27 +0000
commita55363086d594e4df9573144b493da87b667fd27 (patch)
treee63af762994d8e8bb66c2282b6f14fc5b829414b /src/Fl.cxx
parentd725a22d4352540335f82b1ec8e4a1b777f240c7 (diff)
Don't apply tile image to menu or overlay windows.
Add Fl_BMP_Image.H links to fltk.list.in. Reset colors to standard FLTK ones in Fl::get_system_colors(). Don't clear button events when fixing focus. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1918 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl.cxx')
-rw-r--r--src/Fl.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx
index ccf13e541..6278ec4c5 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl.cxx,v 1.24.2.41.2.16 2002/01/01 15:11:29 easysw Exp $"
+// "$Id: Fl.cxx,v 1.24.2.41.2.17 2002/01/07 18:47:27 easysw Exp $"
//
// Main event handling code for the Fast Light Tool Kit (FLTK).
//
@@ -447,7 +447,9 @@ void fl_fix_focus() {
// set focus based on Fl::modal() and fl_xfocus
Fl_Widget* w = fl_xfocus;
if (w) {
- Fl::e_keysym = 0; // make sure widgets don't think a keystroke moved focus
+ if (Fl::e_keysym < (FL_Button + FL_LEFT_MOUSE) ||
+ Fl::e_keysym > (FL_Button + FL_RIGHT_MOUSE))
+ Fl::e_keysym = 0; // make sure widgets don't think a keystroke moved focus
while (w->parent()) w = w->parent();
if (Fl::modal()) w = Fl::modal();
if (!w->contains(Fl::focus()))
@@ -851,5 +853,5 @@ void Fl_Window::flush() {
}
//
-// End of "$Id: Fl.cxx,v 1.24.2.41.2.16 2002/01/01 15:11:29 easysw Exp $".
+// End of "$Id: Fl.cxx,v 1.24.2.41.2.17 2002/01/07 18:47:27 easysw Exp $".
//