From 23bb0590651da3f342cddcd3c87aee38a1d067cc Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sat, 20 Nov 2004 03:19:59 +0000 Subject: Watcom fixes (STR #584, STR #594, STR #595) Fixed library include order when building DSOs on MacOS X (STR #596) fl_xid() could cause a WIN32 application to crash (STR #560, STR #576, STR #618) Fl_Browser::remove_() removed the item from the list before computing the item height, which caused problems with some programs (STR #613) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3897 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Window.H | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'FL/Fl_Window.H') diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 1e22a50dd..b20630b30 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.8 2004/04/11 04:38:54 easysw Exp $" +// "$Id: Fl_Window.H,v 1.12.2.6.2.9 2004/11/20 03:19:57 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=a; minh=b; maxw=c; maxh=d; dw=e; dh=f; aspect=g; size_range_();} + minw=(short)a; minh=(short)b; maxw=(short)c; maxh=(short)d; dw=(short)e; dh=(short)f; aspect=(short)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.8 2004/04/11 04:38:54 easysw Exp $". +// End of "$Id: Fl_Window.H,v 1.12.2.6.2.9 2004/11/20 03:19:57 easysw Exp $". // -- cgit v1.2.3