* macosx/tkMacOSXInit.c:

	* macosx/tkMacOSXNotify.c: introduction of new tcl notifier based on
	CFRunLoop allows replacement of the custom TkAqua notifier by a
	standard tcl event source. Removes requirement of threaded tcl core
	for TkAqua, allows to stub-link TkAqua against Tcl by removing use of
	the unstubbed TclInitNotifier & TclFinalizeNotifier. [Tcl Patch 1202052]

	* macosx/Wish.pbproj/project.pbxproj: stub-link TkAqua: build with
	USE_TCL_STUBS and link against libtclstub instead of Tcl.framework,
	unexport libtclstub symbols from Tk to avoid duplicate symbol warnings
	when linking with both Tcl and Tk, fixes for gcc4.0 warnings.

	* macosx/tkMacOSXBitmap.c:
	* macosx/tkMacOSXButton.c:
	* macosx/tkMacOSXDialog.c:
	* macosx/tkMacOSXFont.c:
	* macosx/tkMacOSXHLEvents.c:
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXKeyboard.c:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXWm.c:
	* macosx/tkMacOSXXStubs.c: fixed gcc 4.0 warnings.

	* unix/tcl.m4: sync with tcl
	* unix/configure: autoconf-2.13

1 files changed, 16 insertions, 16 deletions

diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 736a879..0d7cc2b 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.4.2.3 2005/02/22 08:49:14 das Exp $
+ * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.4.2.4 2005/05/14 20:53:31 das Exp $
  */
 #include <Carbon/Carbon.h>
 
@@ -214,7 +214,7 @@ Tk_ChooseColorObjCmd(
     cpinfo.pickerType = 0L;
     cpinfo.eventProc = NULL;
     cpinfo.colorProc = NULL;
-    cpinfo.colorProcData = NULL;
+    cpinfo.colorProcData = 0;
     
     /* This doesn't seem to actually set the title! */
     Tcl_UtfToExternal(NULL, NULL, title, -1, 0, NULL, 
@@ -338,7 +338,7 @@ Tk_GetOpenFileObjCmd(
                 break;
             case OPEN_MESSAGE:
                 choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
-                message = CFStringCreateWithBytes(NULL, choice, choiceLen, 
+                message = CFStringCreateWithBytes(NULL, (unsigned char*) choice, choiceLen, 
                         kCFStringEncodingUTF8, false);
                 break;
             case OPEN_MULTIPLE:
@@ -358,7 +358,7 @@ Tk_GetOpenFileObjCmd(
                 break;
             case OPEN_TITLE:
                 choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
-                title = CFStringCreateWithBytes(NULL, choice, choiceLen, 
+                title = CFStringCreateWithBytes(NULL, (unsigned char*) choice, choiceLen, 
                         kCFStringEncodingUTF8, false);
                 break;
         }
@@ -474,7 +474,7 @@ Tk_GetSaveFileObjCmd(
                 break;
             case SAVE_MESSAGE:
                 choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
-                message = CFStringCreateWithBytes(NULL, choice, choiceLen, 
+                message = CFStringCreateWithBytes(NULL, (unsigned char*) choice, choiceLen, 
                         kCFStringEncodingUTF8, false);
                 break;
             case SAVE_PARENT:
@@ -487,7 +487,7 @@ Tk_GetSaveFileObjCmd(
                 break;
             case SAVE_TITLE:
                 choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
-                title = CFStringCreateWithBytes(NULL, choice, choiceLen, 
+                title = CFStringCreateWithBytes(NULL, (unsigned char*) choice, choiceLen, 
                         kCFStringEncodingUTF8, false);
                 break;
         }
@@ -595,7 +595,7 @@ Tk_ChooseDirectoryObjCmd(clientData, interp, objc, objv)
                 break;
             case CHOOSE_MESSAGE:
                 choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
-                message = CFStringCreateWithBytes(NULL, choice, choiceLen, 
+                message = CFStringCreateWithBytes(NULL, (unsigned char*) choice, choiceLen, 
                         kCFStringEncodingUTF8, false);
                 break;
             case CHOOSE_PARENT:
@@ -608,7 +608,7 @@ Tk_ChooseDirectoryObjCmd(clientData, interp, objc, objv)
                 break;
             case CHOOSE_TITLE:
                 choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);
-                title = CFStringCreateWithBytes(NULL, choice, choiceLen, 
+                title = CFStringCreateWithBytes(NULL, (unsigned char*) choice, choiceLen, 
                         kCFStringEncodingUTF8, false);
                 break;
         }
@@ -657,7 +657,7 @@ HandleInitialDirectory (
             return TCL_ERROR;
         }
 
-        err = FSPathMakeRef(dirName,
+        err = FSPathMakeRef((unsigned char*) dirName,
                 dirRef, &isDirectory);     
 
         if (err != noErr) {
@@ -691,7 +691,7 @@ HandleInitialDirectory (
 
         AECreateList(NULL, 0, false, selectDescPtr);
 
-        err = FSPathMakeRef(namePtr, &fileRef, &isDirectory);
+        err = FSPathMakeRef((unsigned char*) namePtr, &fileRef, &isDirectory);
         if (err != noErr) {
             Tcl_AppendResult(interp, "bad initialfile \"", initialFile,
                     "\" file does not exist.", NULL);
@@ -883,7 +883,7 @@ NavServicesGetFile(
                             != noErr ) {
                         fprintf(stderr,"AEGetDescData failed %d\n", err );
                     } else {
-                        if (err = FSRefMakePath(&fsRef, pathPtr, 1024) ) {
+                        if (err = FSRefMakePath(&fsRef, (unsigned char*) pathPtr, 1024) ) {
                             fprintf(stderr,"FSRefMakePath failed, %d\n", err );
                         } else {
                             if (isOpen == SAVE_FILE) {
@@ -1001,9 +1001,9 @@ OpenFileFilterProc(
                         int len;
                         fileNamePtr = (((FSSpec *) *theItem->dataHandle)->name);
                         len = fileNamePtr[0];
-                        strncpy(fileName, fileNamePtr + 1, len);
+                        strncpy(fileName, (char*) fileNamePtr + 1, len);
                         fileName[len] = '\0';
-                        fileNamePtr = fileName;
+                        fileNamePtr = (unsigned char*) fileName;
 
                     } else if (theItem->descriptorType = typeFSRef) {
                         OSStatus err;
@@ -1017,7 +1017,7 @@ OpenFileFilterProc(
                                     (Tcl_UniChar *) uniFileName.unicode, 
                                     uniFileName.length,
                                     &fileNameDString);
-                            fileNamePtr = Tcl_DStringValue(&fileNameDString);
+                            fileNamePtr = (unsigned char*) Tcl_DStringValue(&fileNameDString);
                         } else {
                             fileNamePtr = NULL;
                         }
@@ -1162,7 +1162,7 @@ MatchOneType(
                  * have "." in it
                  */
 
-                for (q = fileNamePtr; *q; q++) {
+                for (q = (char*) fileNamePtr; *q; q++) {
                     if (*q == '.') {
                         goto glob_unmatched;
                     }
@@ -1170,7 +1170,7 @@ MatchOneType(
                 goto glob_matched;
             }
         
-            if (Tcl_StringMatch(fileNamePtr, ext)) {
+            if (Tcl_StringMatch((char*) fileNamePtr, ext)) {
                 goto glob_matched;
             } else {
                 goto glob_unmatched;