All widget coordinates are now 32 bit. Beware though, on a 16 bit graphics system, line drawing and window positioning is still messed up for coordinates beyond 16 bit. See STR #1929.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6112 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 11 insertions, 10 deletions

diff --git a/FL/Fl_Group.H b/FL/Fl_Group.H
index ac1ad0876..c140b3c5c 100644
--- a/FL/Fl_Group.H
+++ b/FL/Fl_Group.H
@@ -38,7 +38,7 @@ class FL_EXPORT Fl_Group : public Fl_Widget {
   Fl_Widget* savedfocus_;
   Fl_Widget* resizable_;
   int children_;
-  short *sizes_; // remembered initial sizes of children
+  int *sizes_; // remembered initial sizes of children
 
   int navigation(int);
   static Fl_Group *current_;
@@ -58,7 +58,7 @@ protected:
   void draw_children();
   void draw_outside_label(const Fl_Widget&) const ;
   void update_child(Fl_Widget&) const;
-  short* sizes();
+  int  *sizes();
 
 public:
 
diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H
index f4c7b1d89..0fee9f311 100644
--- a/FL/Fl_Widget.H
+++ b/FL/Fl_Widget.H
@@ -58,7 +58,7 @@ class FL_EXPORT Fl_Widget {
   Fl_Group* parent_;
   Fl_Callback* callback_;
   void* user_data_;
-  short x_,y_,w_,h_;
+  int x_,y_,w_,h_;
   Fl_Label label_;
   int flags_;
   unsigned color_;
@@ -79,10 +79,10 @@ protected:
 
   Fl_Widget(int,int,int,int,const char* =0);
 
-  void x(int v) {x_ = (short)v;}
-  void y(int v) {y_ = (short)v;}
-  void w(int v) {w_ = (short)v;}
-  void h(int v) {h_ = (short)v;}
+  void x(int v) {x_ = v;}
+  void y(int v) {y_ = v;}
+  void w(int v) {w_ = v;}
+  void h(int v) {h_ = v;}
 
   int flags() const {return flags_;}
   void set_flag(int c) {flags_ |= c;}
diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H
index 9006d4766..2d518ac0e 100644
--- a/FL/Fl_Window.H
+++ b/FL/Fl_Window.H
@@ -44,8 +44,9 @@ class FL_EXPORT Fl_Window : public Fl_Group {
   const char* xclass_;
   const void* icon_;
   // size_range stuff:
-  short minw, minh, maxw, maxh;
-  uchar dw, dh, aspect, size_range_set;
+  int minw, minh, maxw, maxh;
+  int dw, dh, aspect;
+  uchar size_range_set;
   // cursor stuff
   Fl_Cursor cursor_default;
   Fl_Color cursor_fg, cursor_bg;
@@ -94,7 +95,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=(uchar)e; dh=(uchar)f; aspect=(uchar)g; size_range_();}
+    minw=a; minh=b; maxw=c; maxh=d; dw=e; dh=f; aspect=g; size_range_();}
 
   const char* label() const	{return Fl_Widget::label();}
   const char* iconlabel() const	{return iconlabel_;}