Handle larger string-lengths in MacOS, when compiling with Tcl 9 headers

5 files changed, 13 insertions, 12 deletions

diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 1915a84..48d1467 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -1846,7 +1846,8 @@ FontchooserConfigureCmd(
     }
 
     for (i = 1; i < objc; i += 2) {
-	int optionIndex, len;
+	int optionIndex;
+	Tcl_Size len;
 
 	if (Tcl_GetIndexFromObjStruct(interp, objv[i], fontchooserOptionStrings,
 		sizeof(char *), "option", 0, &optionIndex) != TCL_OK) {
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index 69ef797..0610374 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -489,8 +489,7 @@ endOfClusterObjCmd(
 {
     TKNSString *S;
     char *stringArg;
-    int numBytes;
-    Tcl_Size index;
+    Tcl_Size index, numBytes;
 
     if ((unsigned)(objc - 3) > 1) {
 	Tcl_WrongNumArgs(interp, 1 , objv, "str start ?locale?");
diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index ee99fce..8e1fff5 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -456,7 +456,7 @@ static void ProcessAppleEvent(
 	    Tcl_DStringLength(&AEInfo->command), TCL_EVAL_GLOBAL);
 
     if (AEInfo->replyEvent && code >= 0) {
-        int reslen;
+        Tcl_Size reslen;
         const char *result = Tcl_GetStringFromObj(Tcl_GetObjResult(AEInfo->interp),
                                                   &reslen);
         if (code == TCL_OK) {
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index 54f32d5..89b8600 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -240,7 +240,7 @@ static Tcl_Obj *	GetWidgetDemoPath(Tcl_Interp *interp);
 		"{{TCL Scripts} {.tcl} TEXT} {{Text Files} {} TEXT}}",
 		TCL_INDEX_NONE, TCL_EVAL_GLOBAL) == TCL_OK) {
 	    Tcl_Obj *path = Tcl_GetObjResult(_eventInterp);
-	    int len;
+	    Tcl_Size len;
 
 	    Tcl_GetStringFromObj(path, &len);
 	    if (len) {
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 39fd62f..d10fecc 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -1812,7 +1812,7 @@ WmSetAttribute(
     case WMATT_TABBINGID: {
 	NSString *oldId = [macWindow tabbingIdentifier];
 	char *valueString;
-	int length;
+	Tcl_Size length;
 	if ([NSApp macOSVersion] < 101300) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		  "Tabbing identifiers require macOS 10.13", TCL_INDEX_NONE));
@@ -2063,7 +2063,8 @@ WmAttributesCmd(
     int attribute = 0;
     NSWindow *macWindow;
     if (winPtr == NULL && objc == 5) {
-	int index, isNew = 0, length;
+	int index, isNew = 0;
+	Tcl_Size length;
 
 	/*
 	 * If we are setting an atttribute of a future window, save the value
@@ -2795,7 +2796,7 @@ WmGroupCmd(
     WmInfo *wmPtr = winPtr->wmInfoPtr;
     Tk_Window tkwin2;
     char *argv3;
-    int length;
+    Tcl_Size length;
 
     if ((objc != 3) && (objc != 4)) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?pathName?");
@@ -2927,7 +2928,7 @@ WmIconbitmapCmd(
     WmInfo *wmPtr = winPtr->wmInfoPtr;
     Pixmap pixmap;
     char *str;
-    int len;
+    Tcl_Size len;
 
     if ((objc != 3) && (objc != 4)) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?bitmap?");
@@ -3136,7 +3137,7 @@ WmIconnameCmd(
 {
     WmInfo *wmPtr = winPtr->wmInfoPtr;
     const char *argv3;
-    int length;
+    Tcl_Size length;
 
     if (objc > 4) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?newName?");
@@ -3747,7 +3748,7 @@ WmProtocolCmd(
     ProtocolHandler *protPtr, *prevPtr;
     Atom protocol;
     char *cmd;
-    int cmdLength;
+    Tcl_Size cmdLength;
     Tcl_Obj *resultObj;
 
     if ((objc < 3) || (objc > 5)) {
@@ -4235,7 +4236,7 @@ WmTitleCmd(
 {
     WmInfo *wmPtr = winPtr->wmInfoPtr;
     char *argv3;
-    int length;
+    Tcl_Size length;
 
     if (objc > 4) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?newTitle?");