diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-12-06 03:31:54 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-12-06 03:31:54 +0000 |
| commit | 24a940f11d53b2eb60e466bdfc6aff7368cffe9c (patch) | |
| tree | f04f61889dfb94d5f440c3f7f592a165557d9814 /src | |
| parent | b5562132e5471c9ed3f714a12f8976d229e5ce0b (diff) | |
Fixed a compiler warning in Fl_Window.H (STR #641)
Tooltips disabled shortcut processing (STR #643)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3936 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index 79ef28a0f..4b6cba3cd 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.24.2.41.2.72 2004/12/03 03:14:15 easysw Exp $" +// "$Id: Fl.cxx,v 1.24.2.41.2.73 2004/12/06 03:31:54 easysw Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -503,6 +503,7 @@ void fl_fix_focus() { // set focus based on Fl::modal() and fl_xfocus Fl_Widget* w = fl_xfocus; if (w) { + int saved = Fl::e_keysym; 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 @@ -510,6 +511,7 @@ void fl_fix_focus() { if (Fl::modal()) w = Fl::modal(); if (!w->contains(Fl::focus())) if (!w->take_focus()) Fl::focus(w); + Fl::e_keysym = saved; } else Fl::focus(0); @@ -1108,5 +1110,5 @@ Fl::do_widget_deletion() { // -// End of "$Id: Fl.cxx,v 1.24.2.41.2.72 2004/12/03 03:14:15 easysw Exp $". +// End of "$Id: Fl.cxx,v 1.24.2.41.2.73 2004/12/06 03:31:54 easysw Exp $". // |