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 | |
| 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
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | FL/Fl_Window.H | 6 | ||||
| -rw-r--r-- | src/Fl.cxx | 6 |
3 files changed, 9 insertions, 5 deletions
@@ -1,5 +1,7 @@ CHANGES IN FLTK 1.1.7 + - Fixed a compiler warning in Fl_Window.H (STR #641) + - Tooltips disabled shortcut processing (STR #643) - Fl::event_number() didn't always match the value sent to the handle() method (STR #634) - Fl_Shared_Image::reload() didn't set the image_ diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index b20630b30..c912751f8 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Window.H,v 1.12.2.6.2.9 2004/11/20 03:19:57 easysw Exp $" +// "$Id: Fl_Window.H,v 1.12.2.6.2.10 2004/12/06 03:31:54 easysw Exp $" // // Window header file for the Fast Light Tool Kit (FLTK). // @@ -88,7 +88,7 @@ public: void hotspot(const Fl_Widget& p, int offscreen = 0) {hotspot(&p,offscreen);} void free_position() {clear_flag(FL_FORCE_POSITION);} void size_range(int a, int b, int c=0, int d=0, int e=0, int f=0, int g=0) { - minw=(short)a; minh=(short)b; maxw=(short)c; maxh=(short)d; dw=(short)e; dh=(short)f; aspect=(short)g; size_range_();} + minw=(short)a; minh=(short)b; maxw=(short)c; maxh=(short)d; dw=(uchar)e; dh=(uchar)f; aspect=(uchar)g; size_range_();} const char* label() const {return Fl_Widget::label();} const char* iconlabel() const {return iconlabel_;} @@ -124,5 +124,5 @@ public: #endif // -// End of "$Id: Fl_Window.H,v 1.12.2.6.2.9 2004/11/20 03:19:57 easysw Exp $". +// End of "$Id: Fl_Window.H,v 1.12.2.6.2.10 2004/12/06 03:31:54 easysw Exp $". // 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 $". // |