Updated to TCL 9 API.

Author: highperformancecoder

include/tcl++.h

@@ -49,6 +49,10 @@ into a simple I/O stream and tclindex, a simple iterator through a TCL array */
 #define CONST const
 #endif
 
+#if TCL_MAJOR_VERSION < 9
+using Tcl_Size=int;
+#endif
+
 #ifdef TK
 #include <tk.h>
 /* undefine all those spurious macros X11 defines - we don't need 'em! */

src/TCL_obj.cc

@@ -167,7 +167,9 @@ namespace ecolab
   {
     /* delete all member commands associated with this */ 
     tclcmd c;
-    int i, elemc; CONST84 char **elem;
+    int i;
+    Tcl_Size elemc;
+    CONST84 char **elem;
     c | "info commands "|desc|".*\n";
     if (Tcl_SplitList(interp(),c.result.c_str(),&elemc,&elem)!=TCL_OK) 
       throw error("");

src/analysis.cc

@@ -38,11 +38,7 @@ int palette_class::size=0;
 
 palette_class::palette_class()
 {
-#if TCL_MAJOR_VERSION >= 9
   Tcl_Size  elemc;
-#else
-  int elemc;
-#endif
 
   if (size==0)
    {

src/cairoSurfaceImage.cc

@@ -77,7 +77,7 @@ namespace
     };
 
     // Define a new image type that renders a minsky::Canvas
-    int createCI(Tcl_Interp* interp, CONST86 char* name, int objc, Tcl_Obj *const objv[],
+    int createCI(Tcl_Interp* interp, CONST86 char* name, Tcl_Size objc, Tcl_Obj *const objv[],
                  CONST86 Tk_ImageType* typePtr, Tk_ImageMaster master, ClientData *masterData)
     {
       try

src/cairo_types.cc

@@ -98,11 +98,11 @@ namespace ecolab
       {
         //-image is deprecated, and not used
         {TK_CONFIG_STRING, "-image", NULL, NULL,
-         NULL, Tk_Offset(ImageItem, imageString), TK_CONFIG_NULL_OK},
+         NULL, offsetof(ImageItem, imageString), TK_CONFIG_NULL_OK},
         {TK_CONFIG_DOUBLE, "-scale", NULL, NULL,
-         "1.0", Tk_Offset(ImageItem, scale), TK_CONFIG_NULL_OK},
+         "1.0", offsetof(ImageItem, scale), TK_CONFIG_NULL_OK},
         {TK_CONFIG_DOUBLE, "-rotation", NULL, NULL,
-         "0.0", Tk_Offset(ImageItem, rotation), TK_CONFIG_NULL_OK},
+         "0.0", offsetof(ImageItem, rotation), TK_CONFIG_NULL_OK},
         {TK_CONFIG_CUSTOM, "-tags", NULL, NULL,
          NULL, 0, TK_CONFIG_NULL_OK, &tagsOption},
         {TK_CONFIG_END}
@@ -452,7 +452,7 @@ namespace ecolab
                   Tk_Canvas canvas,		/* Canvas containing item. */
                   Tk_Item *itemPtr,		/* Item whose coordinates are to be read or
                                                  * modified. */
-                  int objc,			/* Number of coordinates supplied in objv. */
+                  Tcl_Size objc,			/* Number of coordinates supplied in objv. */
                   Tcl_Obj *CONST objv[])	/* Array of coordinates: x1, y1, x2, y2, ... */
       {
         ImageItem *imgPtr = (ImageItem *) itemPtr;
@@ -526,7 +526,10 @@ namespace ecolab
 
         tkwin = Tk_CanvasTkwin(canvas);
         if (TCL_OK != Tk_ConfigureWidget(interp, tkwin, configSpecs, objc,
-                                         (CONST char **) objv, (char *) imgPtr, flags|TK_CONFIG_OBJS)) {
+#if TCL_MAJOR_VERSION < 9
+                                         (CONST char **)
+#endif
+                                         objv, (char *) imgPtr, flags|TK_CONFIG_OBJS)) {
           return TCL_ERROR;
         }
 
@@ -592,7 +595,7 @@ namespace ecolab
                      Tcl_Interp *interp,		/* Used for error reporting. */
                      Tk_Canvas canvas,		/* Canvas containing itemPtr. */
                      Tk_Item *itemPtr,		/* Image item to reconfigure. */
-                     int objc,			/* Number of elements in objv.  */
+                     Tcl_Size objc,			/* Number of elements in objv.  */
                      Tcl_Obj *CONST objv[],	/* Arguments describing things to configure. */
                      int flags)
       {

src/tcl_arrays.cc

@@ -103,7 +103,7 @@ NEWCMD(pcoord,1)
 
 NEWCMD(max,1)
 {
-  int i,n;
+  Tcl_Size i,n;
   CONST84 char **v;
   double m=-DBL_MAX;
   tclreturn result;
@@ -116,7 +116,7 @@ NEWCMD(max,1)
 
 NEWCMD(min,1)
 {
-  int i,n;
+  Tcl_Size i,n;
   CONST84 char **v;
   double m=DBL_MAX;
   tclreturn result;
@@ -129,7 +129,7 @@ NEWCMD(min,1)
 
 NEWCMD(av,1)
 {
-  int i,n;
+  Tcl_Size i,n;
   CONST84 char **v;
   double m=0;
   tclreturn result;

src/tclmain.cc

@@ -503,7 +503,7 @@ NEWCMD(cli,0)
 
 NEWCMD(string_map,2)
 {
-  int elemc;
+  Tcl_Size elemc;
   CONST84 char **elem;
   Tcl_SplitList(interp(),const_cast<char*>(argv[1]),&elemc,&elem);
   tclreturn retval;