* 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.xcode/project.pbxproj:
	* 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/Wish.xcode/project.pbxproj: sync with Wish.pbproj changes
	since 2004-11-19.
	NOTE: to use this project, need to uncomment the tclConfig.h settings
	at the top of tcl/unix/configure.in, autoconf and rebuild tcl !

	* 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.59

1 files changed, 6 insertions, 5 deletions

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 3c20b5f..b5481ba 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXInit.c,v 1.8 2005/03/09 19:40:52 wolfsuit Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.9 2005/05/14 20:48:15 das Exp $
  */
 
 #include "tkInt.h"
@@ -79,7 +79,7 @@ static Map scriptMap[] = {
     {smEastEurRoman,	"macCentEuro"},
     {smVietnamese,	"macVietnam"},
     {smExtArabic,	"macSindhi"},
-    {NULL,		NULL}
+    {0, 		NULL}
 };
 
 Tcl_Encoding TkMacOSXCarbonEncoding = NULL;
@@ -115,6 +115,8 @@ TkpInit(interp)
     static char tkLibPath[PATH_MAX + 1];
     static int tkMacOSXInitialized = false;
 
+    Tk_MacOSXSetupTkNotifier();
+
     /* 
      * Since it is possible for TkInit to be called multiple times
      * and we don't want to do the initialization multiple times
@@ -128,7 +130,6 @@ TkpInit(interp)
 
     	tkMacOSXInitialized = true;
 
-        Tk_MacOSXSetupTkNotifier();
         TkMacOSXInitAppleEvents(interp);
         TkMacOSXInitCarbonEvents(interp);
         TkMacOSXInitMenus(interp);
@@ -380,13 +381,13 @@ TkMacOSXDefaultStartupScript(void)
             char startupScript[PATH_MAX + 1];
                             
             if (CFURLGetFileSystemRepresentation (appMainURL, true,
-                    startupScript, PATH_MAX)) {
+                    (unsigned char*) startupScript, PATH_MAX)) {
                 Tcl_SetStartupScript(Tcl_NewStringObj(startupScript, -1), NULL);
                 scriptFldrURL = CFURLCreateCopyDeletingLastPathComponent(
                         NULL, appMainURL);
                 if (scriptFldrURL != NULL) {
                     CFURLGetFileSystemRepresentation(scriptFldrURL, 
-                            true, scriptPath, PATH_MAX);
+                            true, (unsigned char*) scriptPath, PATH_MAX);
                     CFRelease(scriptFldrURL);
                 }
             }