Enforce explicit downcasting of numeric values

As part of the change, upgrade tkblt internal structures from
short/float to int/double, as those are artifacts of the legacy code
relying on X.  Downcast to short at the latest stage: when interfacing
with X.

1 files changed, 7 insertions, 7 deletions

diff --git a/generic/tkbltGrElemBar.h b/generic/tkbltGrElemBar.h
index 9207a9f..8b48114 100644
--- a/generic/tkbltGrElemBar.h
+++ b/generic/tkbltGrElemBar.h
@@ -49,7 +49,7 @@ namespace Blt {
   typedef struct {
     Weight weight;
     BarPen* penPtr;
-    XRectangle* bars;
+    Rectangle* bars;
     int nBars;
     GraphSegments xeb;
     GraphSegments yeb;
@@ -88,9 +88,9 @@ namespace Blt {
   protected:
     BarPen* builtinPenPtr;
     int* barToData_;
-    XRectangle* bars_;
+    Rectangle* bars_;
     int* activeToData_;
-    XRectangle* activeRects_;
+    Rectangle* activeRects_;
     int nBars_;
     int nActive_;
     GraphSegments xeb_;
@@ -103,10 +103,10 @@ namespace Blt {
     void mapActive();
     void reset();
     void mapErrorBars(BarStyle**);
-    void drawSegments(Drawable, BarPen*, XRectangle*, int);
-    void drawValues(Drawable, BarPen*, XRectangle*, int, int*);
-    void printSegments(PSOutput*, BarPen*, XRectangle*, int);
-    void printValues(PSOutput*, BarPen*, XRectangle*, int, int*);
+    void drawSegments(Drawable, BarPen*, Rectangle*, int);
+    void drawValues(Drawable, BarPen*, Rectangle*, int, int*);
+    void printSegments(PSOutput*, BarPen*, Rectangle*, int);
+    void printValues(PSOutput*, BarPen*, Rectangle*, int, int*);
 
   public:
     BarElement(Graph*, const char*, Tcl_HashEntry*);