diff options
| author | das <das> | 2006-02-09 19:09:43 (GMT) |
|---|---|---|
| committer | das <das> | 2006-02-09 19:09:43 (GMT) |
| commit | c8ad1ae45d1ba823877b6a2b63f2ae6504954548 (patch) | |
| tree | 3aa7b0f5431615f40e0dcabaf762aa4c63d2de66 /generic | |
| parent | ee09dd0c7cfc65378fac95dd53067bcd72b390e9 (diff) | |
| download | tk-c8ad1ae45d1ba823877b6a2b63f2ae6504954548.zip tk-c8ad1ae45d1ba823877b6a2b63f2ae6504954548.tar.gz tk-c8ad1ae45d1ba823877b6a2b63f2ae6504954548.tar.bz2 | |
* generic/tk.decls: fix signature of TkMacOSXInvalClipRgns
* generic/tkPlatDecls.h: to use Tk_Window instead of internal
* macosx/tkMacOSXSubwindows.c: type TkWindow (which led to any include
* macosx/tkMacOSXWindowEvent.c: of public header tkMacOSX.h requiring
* macosx/tkMacOSXWm.c: prior include of tkInt.h).
* generic/tk.h: move TkAqua specific REDO_KEYSYM_LOOKUP define
* macosx/tkMacOSXPort.h: out of tk.h into platform header.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tk.decls | 4 | ||||
| -rw-r--r-- | generic/tk.h | 13 | ||||
| -rw-r--r-- | generic/tkPlatDecls.h | 6 |
3 files changed, 6 insertions, 17 deletions
diff --git a/generic/tk.decls b/generic/tk.decls index deece6d..7d3f5f6 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tk.decls,v 1.24 2002/08/31 06:12:19 das Exp $ +# RCS: @(#) $Id: tk.decls,v 1.24.2.1 2006/02/09 19:09:43 das Exp $ library tk @@ -1364,7 +1364,7 @@ declare 5 aqua { } declare 6 aqua { - void TkMacOSXInvalClipRgns (TkWindow *winPtr) + void TkMacOSXInvalClipRgns (Tk_Window tkwin) } declare 7 aqua { diff --git a/generic/tk.h b/generic/tk.h index a11d207..3119f3a 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -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: tk.h,v 1.74.2.13 2005/11/27 02:44:25 das Exp $ + * RCS: @(#) $Id: tk.h,v 1.74.2.14 2006/02/09 19:09:43 das Exp $ */ #ifndef _TK @@ -53,17 +53,6 @@ extern "C" { #define TK_VERSION "8.4" #define TK_PATCH_LEVEL "8.4.12" -/* - * The following definitions set up the proper options for Macintosh - * compilers. We use this method because there is no autoconf equivalent. - */ - -#if defined(MAC_TCL) || defined(MAC_OSX_TK) -# ifndef REDO_KEYSYM_LOOKUP -# define REDO_KEYSYM_LOOKUP -# endif -#endif - #ifndef _TCL # include <tcl.h> # if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION != 4) diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h index 00cad28..5d85c8f 100644 --- a/generic/tkPlatDecls.h +++ b/generic/tkPlatDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPlatDecls.h,v 1.7 2002/08/31 06:12:23 das Exp $ + * RCS: @(#) $Id: tkPlatDecls.h,v 1.7.2.1 2006/02/09 19:09:43 das Exp $ */ #ifndef _TKPLATDECLS @@ -104,7 +104,7 @@ EXTERN void TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 6 */ -EXTERN void TkMacOSXInvalClipRgns _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkMacOSXInvalClipRgns _ANSI_ARGS_((Tk_Window tkwin)); /* 7 */ EXTERN GWorldPtr TkMacOSXGetDrawablePort _ANSI_ARGS_(( Drawable drawable)); @@ -149,7 +149,7 @@ typedef struct TkPlatStubs { void (*tkMacOSXInitMenus) _ANSI_ARGS_((Tcl_Interp * interp)); /* 3 */ void (*tkMacOSXInitAppleEvents) _ANSI_ARGS_((Tcl_Interp * interp)); /* 4 */ void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 5 */ - void (*tkMacOSXInvalClipRgns) _ANSI_ARGS_((TkWindow * winPtr)); /* 6 */ + void (*tkMacOSXInvalClipRgns) _ANSI_ARGS_((Tk_Window tkwin)); /* 6 */ GWorldPtr (*tkMacOSXGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 7 */ ControlRef (*tkMacOSXGetRootControl) _ANSI_ARGS_((Drawable drawable)); /* 8 */ void (*tk_MacOSXSetupTkNotifier) _ANSI_ARGS_((void)); /* 9 */ |