diff options
| author | das <das> | 2006-02-09 19:08:50 (GMT) |
|---|---|---|
| committer | das <das> | 2006-02-09 19:08:50 (GMT) |
| commit | 3e97de678ab8cbce3e00a0a396d89ea65ffc5b55 (patch) | |
| tree | 7b697aaeb41435d2223cd2cce400b3e8c002e89f /generic | |
| parent | dcbd07d255f872ce6907e3af83c6fd3b52f30e05 (diff) | |
| download | tk-3e97de678ab8cbce3e00a0a396d89ea65ffc5b55.zip tk-3e97de678ab8cbce3e00a0a396d89ea65ffc5b55.tar.gz tk-3e97de678ab8cbce3e00a0a396d89ea65ffc5b55.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 c1151bf..98dfcd9 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.27 2005/05/27 23:14:28 dkf Exp $ +# RCS: @(#) $Id: tk.decls,v 1.28 2006/02/09 19:08:51 das Exp $ library tk @@ -1338,7 +1338,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 831c905..afc6032 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.85 2005/11/27 02:36:13 das Exp $ + * RCS: @(#) $Id: tk.h,v 1.86 2006/02/09 19:08:51 das Exp $ */ #ifndef _TK @@ -55,17 +55,6 @@ extern "C" { #define TK_VERSION "8.5" #define TK_PATCH_LEVEL "8.5a4" -/* - * The following definitions set up the proper options for Macintosh - * compilers. We use this method because there is no autoconf equivalent. - */ - -#if 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 != 5) diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h index db6719d..9b39cff 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.11 2005/05/29 06:47:04 das Exp $ + * RCS: @(#) $Id: tkPlatDecls.h,v 1.12 2006/02/09 19:08:51 das Exp $ */ #ifndef _TKPLATDECLS @@ -108,7 +108,7 @@ EXTERN void TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, #ifndef TkMacOSXInvalClipRgns_TCL_DECLARED #define TkMacOSXInvalClipRgns_TCL_DECLARED /* 6 */ -EXTERN void TkMacOSXInvalClipRgns _ANSI_ARGS_((TkWindow * winPtr)); +EXTERN void TkMacOSXInvalClipRgns _ANSI_ARGS_((Tk_Window tkwin)); #endif #ifndef TkMacOSXGetDrawablePort_TCL_DECLARED #define TkMacOSXGetDrawablePort_TCL_DECLARED @@ -153,7 +153,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 */ |