diff options
| author | dgp <dgp@users.sourceforge.net> | 2001-09-25 16:25:20 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2001-09-25 16:25:20 (GMT) |
| commit | ac859f541ab22b0778aa06864848fdf336bb49cf (patch) | |
| tree | 6e45150fb4ffc49a55a84c473b393c1b01745056 /generic/tkIntPlatDecls.h | |
| parent | 8fa92e5eb08f440c8993da8965ab7e0e17b173b8 (diff) | |
| download | tk-ac859f541ab22b0778aa06864848fdf336bb49cf.zip tk-ac859f541ab22b0778aa06864848fdf336bb49cf.tar.gz tk-ac859f541ab22b0778aa06864848fdf336bb49cf.tar.bz2 | |
* Corrected definition of
TkpScanWindowId to handle situation where types Window and int
do not have the same number of bits. CONST-ified too.
Diffstat (limited to 'generic/tkIntPlatDecls.h')
| -rw-r--r-- | generic/tkIntPlatDecls.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 01c31e8..234dcd5 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.8 2001/09/21 21:19:43 hobbs Exp $ + * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.9 2001/09/25 16:25:20 dgp Exp $ */ #ifndef _TKINTPLATDECLS @@ -52,6 +52,9 @@ EXTERN int TkUnixDoOneXEvent _ANSI_ARGS_((Tcl_Time * timePtr)); /* 7 */ EXTERN void TkUnixSetMenubar _ANSI_ARGS_((Tk_Window tkwin, Tk_Window menubar)); +/* 8 */ +EXTERN int TkpScanWindowId _ANSI_ARGS_((Tcl_Interp * interp, + CONST char * string, Window * idPtr)); #endif /* UNIX */ #ifdef __WIN32__ /* 0 */ @@ -70,7 +73,7 @@ EXTERN void TkpPrintWindowId _ANSI_ARGS_((char * buf, Window window)); /* 6 */ EXTERN int TkpScanWindowId _ANSI_ARGS_((Tcl_Interp * interp, - char * string, Window * idPtr)); + CONST char * string, Window * idPtr)); /* 7 */ EXTERN void TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr)); /* 8 */ @@ -307,6 +310,7 @@ typedef struct TkIntPlatStubs { Window (*tkUnixContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 5 */ int (*tkUnixDoOneXEvent) _ANSI_ARGS_((Tcl_Time * timePtr)); /* 6 */ void (*tkUnixSetMenubar) _ANSI_ARGS_((Tk_Window tkwin, Tk_Window menubar)); /* 7 */ + int (*tkpScanWindowId) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * string, Window * idPtr)); /* 8 */ #endif /* UNIX */ #ifdef __WIN32__ char * (*tkAlignImageData) _ANSI_ARGS_((XImage * image, int alignment, int bitOrder)); /* 0 */ @@ -315,7 +319,7 @@ typedef struct TkIntPlatStubs { unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 3 */ void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 4 */ void (*tkpPrintWindowId) _ANSI_ARGS_((char * buf, Window window)); /* 5 */ - int (*tkpScanWindowId) _ANSI_ARGS_((Tcl_Interp * interp, char * string, Window * idPtr)); /* 6 */ + int (*tkpScanWindowId) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * string, Window * idPtr)); /* 6 */ void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 7 */ void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 8 */ void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 9 */ @@ -461,6 +465,10 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkUnixSetMenubar \ (tkIntPlatStubsPtr->tkUnixSetMenubar) /* 7 */ #endif +#ifndef TkpScanWindowId +#define TkpScanWindowId \ + (tkIntPlatStubsPtr->tkpScanWindowId) /* 8 */ +#endif #endif /* UNIX */ #ifdef __WIN32__ #ifndef TkAlignImageData |