summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXWm.c
diff options
context:
space:
mode:
authordas <das>2005-05-14 20:48:14 (GMT)
committerdas <das>2005-05-14 20:48:14 (GMT)
commitca068809f5fd859cafdfb8827f30e7401e95b835 (patch)
tree2461f0c3bbbdbb7e3c8ac29e9bbb1dd5b651f950 /macosx/tkMacOSXWm.c
parent417308254eb3d2d9ccb15f381abe79090a00f72a (diff)
downloadtk-ca068809f5fd859cafdfb8827f30e7401e95b835.zip
tk-ca068809f5fd859cafdfb8827f30e7401e95b835.tar.gz
tk-ca068809f5fd859cafdfb8827f30e7401e95b835.tar.bz2
* 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
Diffstat (limited to 'macosx/tkMacOSXWm.c')
-rw-r--r--macosx/tkMacOSXWm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index fafa6f8..4ca74d7 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXWm.c,v 1.17 2005/04/07 20:14:24 mdejong Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.18 2005/05/14 20:48:15 das Exp $
*/
#include <Carbon/Carbon.h>
@@ -873,7 +873,7 @@ Tcl_Obj *CONST objv[]; /* Argument objects. */
break;
case WmAttrTitlePathIdx:
err = FSPathMakeRef(
- Tcl_GetStringFromObj(objv[i+1], NULL),
+ (unsigned char*) Tcl_GetStringFromObj(objv[i+1], NULL),
&ref, &isDirectory);
if (err == noErr) {
err = FSNewAlias(NULL, &ref, &alias);
@@ -974,7 +974,7 @@ static void WmAttrGetTitlePath(WindowRef macWindow, Tcl_Obj *result)
err = FSRefMakePath(&ref, path, 2048);
}
if (err == noErr) {
- Tcl_AppendToObj(result, path, -1);
+ Tcl_AppendToObj(result, (char*) path, -1);
} else {
Tcl_AppendToObj(result, "{}", -1);
}
@@ -1687,7 +1687,7 @@ Tcl_Obj *CONST objv[]; /* Argument objects. */
AliasHandle alias;
FSRef ref;
Boolean isDirectory;
- err = FSPathMakeRef(Tcl_GetStringFromObj(objv[3], NULL), &ref, &isDirectory);
+ err = FSPathMakeRef((unsigned char*) Tcl_GetStringFromObj(objv[3], NULL), &ref, &isDirectory);
if (err == noErr) {
err = FSNewAlias(NULL, &ref, &alias);
if (err == noErr) {
@@ -4588,7 +4588,7 @@ TkSetWMName(
}
if (strlen(titleUid) > 0) {
- title = CFStringCreateWithBytes(NULL, titleUid, strlen(titleUid),
+ title = CFStringCreateWithBytes(NULL, (unsigned char*) titleUid, strlen(titleUid),
kCFStringEncodingUTF8, false);
} else {
title = NULL;