diff options
Diffstat (limited to 'generic/tkWindow.c')
| -rw-r--r-- | generic/tkWindow.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c index a237953..a69c681 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -12,13 +12,13 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWindow.c,v 1.52 2002/08/05 04:30:40 dgp Exp $ + * RCS: @(#) $Id: tkWindow.c,v 1.53 2002/08/31 06:12:28 das Exp $ */ #include "tkPort.h" #include "tkInt.h" -#if !defined(__WIN32__) && !defined(MAC_TCL) +#if !( defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) #include "tkUnixInt.h" #endif @@ -116,7 +116,7 @@ static TkCmd commands[] = { {"selection", NULL, Tk_SelectionObjCmd, 0, 1}, {"tk", NULL, Tk_TkObjCmd, 0, 1}, {"tkwait", NULL, Tk_TkwaitObjCmd, 1, 1}, -#if defined(__WIN32__) || defined(MAC_TCL) +#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK) {"tk_chooseColor", NULL, Tk_ChooseColorObjCmd, 0, 1}, {"tk_chooseDirectory", NULL, Tk_ChooseDirectoryObjCmd, 0, 1}, {"tk_getOpenFile", NULL, Tk_GetOpenFileObjCmd, 0, 1}, @@ -155,7 +155,7 @@ static TkCmd commands[] = { * Misc. */ -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TK) {"::tk::unsupported::MacWindowStyle", TkUnsupported1Cmd, NULL, 1, 1}, #endif @@ -1366,7 +1366,7 @@ Tk_DestroyWindow(tkwin) TkWmRemoveFromColormapWindows(winPtr); } if (winPtr->window != None) { -#if defined(MAC_TCL) || defined(__WIN32__) +#if defined(MAC_TCL) || defined(MAC_OSX_TK) || defined(__WIN32__) XDestroyWindow(winPtr->display, winPtr->window); #else if ((winPtr->flags & TK_TOP_HIERARCHY) @@ -1551,7 +1551,7 @@ void Tk_MapWindow(tkwin) Tk_Window tkwin; /* Token for window to map. */ { - register TkWindow *winPtr = (TkWindow *) tkwin; + TkWindow *winPtr = (TkWindow *) tkwin; XEvent event; if (winPtr->flags & TK_MAPPED) { @@ -2009,7 +2009,7 @@ Tk_DefineCursor(tkwin, cursor) { register TkWindow *winPtr = (TkWindow *) tkwin; -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TK) winPtr->atts.cursor = (XCursor) cursor; #else winPtr->atts.cursor = (Cursor) cursor; |