From c3e0d00464979b61e3ccc6107edf6d061278239d Mon Sep 17 00:00:00 2001 From: hobbs Date: Fri, 12 Apr 2002 10:10:48 +0000 Subject: * generic/tkStubInit.c: * generic/tkIntPlatDecls.h: * generic/tkIntDecls.h: * generic/tkInt.decls: added TkFocusFree, TkClipCleanup and TkGCCleanup generic private procs, and TkWmCleanup, TkSendCleanup and TkFreeXId unix private procs. --- generic/tkInt.decls | 26 +++++++++++++++++++++++++- generic/tkIntDecls.h | 23 ++++++++++++++++++++++- generic/tkIntPlatDecls.h | 23 ++++++++++++++++++++++- generic/tkStubInit.c | 8 +++++++- 4 files changed, 76 insertions(+), 4 deletions(-) diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 38f7dd4..c874a26 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tkInt.decls,v 1.24 2002/01/25 21:09:37 dgp Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.25 2002/04/12 10:10:48 hobbs Exp $ library tk @@ -645,6 +645,18 @@ declare 141 generic { TkWindow ** TkWmStackorderToplevel(TkWindow *parentPtr) } +declare 142 generic { + void TkFocusFree(TkMainInfo *mainPtr) +} + +declare 143 generic { + void TkClipCleanup(TkDisplay *dispPtr) +} + +declare 144 generic { + void TkGCCleanup(TkDisplay *dispPtr) +} + ############################################################################## # Define the platform specific internal Tcl interface. These functions are @@ -691,6 +703,18 @@ declare 8 unix { int TkpScanWindowId (Tcl_Interp *interp, CONST char *string, Window *idPtr) } +declare 9 unix { + void TkWmCleanup (TkDisplay *dispPtr) +} + +declare 10 unix { + void TkSendCleanup (TkDisplay *dispPtr) +} + +declare 11 unix { + void TkFreeXId (TkDisplay *dispPtr) +} + ############################ # Windows specific functions diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index e98e518..ecd9a28 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -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: tkIntDecls.h,v 1.16 2002/01/25 21:09:37 dgp Exp $ + * RCS: @(#) $Id: tkIntDecls.h,v 1.17 2002/04/12 10:10:48 hobbs Exp $ */ #ifndef _TKINTDECLS @@ -483,6 +483,12 @@ EXTERN TkRegion TkPhotoGetValidRegion _ANSI_ARGS_(( /* 141 */ EXTERN TkWindow ** TkWmStackorderToplevel _ANSI_ARGS_(( TkWindow * parentPtr)); +/* 142 */ +EXTERN void TkFocusFree _ANSI_ARGS_((TkMainInfo * mainPtr)); +/* 143 */ +EXTERN void TkClipCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); +/* 144 */ +EXTERN void TkGCCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); typedef struct TkIntStubs { int magic; @@ -710,6 +716,9 @@ typedef struct TkIntStubs { void (*tkpInitKeymapInfo) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 139 */ TkRegion (*tkPhotoGetValidRegion) _ANSI_ARGS_((Tk_PhotoHandle handle)); /* 140 */ TkWindow ** (*tkWmStackorderToplevel) _ANSI_ARGS_((TkWindow * parentPtr)); /* 141 */ + void (*tkFocusFree) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 142 */ + void (*tkClipCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 143 */ + void (*tkGCCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 144 */ } TkIntStubs; #ifdef __cplusplus @@ -1317,6 +1326,18 @@ extern TkIntStubs *tkIntStubsPtr; #define TkWmStackorderToplevel \ (tkIntStubsPtr->tkWmStackorderToplevel) /* 141 */ #endif +#ifndef TkFocusFree +#define TkFocusFree \ + (tkIntStubsPtr->tkFocusFree) /* 142 */ +#endif +#ifndef TkClipCleanup +#define TkClipCleanup \ + (tkIntStubsPtr->tkClipCleanup) /* 143 */ +#endif +#ifndef TkGCCleanup +#define TkGCCleanup \ + (tkIntStubsPtr->tkGCCleanup) /* 144 */ +#endif #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index fffa782..411fc0c 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.10 2001/11/23 02:05:16 das Exp $ + * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.11 2002/04/12 10:10:48 hobbs Exp $ */ #ifndef _TKINTPLATDECLS @@ -55,6 +55,12 @@ EXTERN void TkUnixSetMenubar _ANSI_ARGS_((Tk_Window tkwin, /* 8 */ EXTERN int TkpScanWindowId _ANSI_ARGS_((Tcl_Interp * interp, CONST char * string, Window * idPtr)); +/* 9 */ +EXTERN void TkWmCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); +/* 10 */ +EXTERN void TkSendCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); +/* 11 */ +EXTERN void TkFreeXId _ANSI_ARGS_((TkDisplay * dispPtr)); #endif /* UNIX */ #ifdef __WIN32__ /* 0 */ @@ -297,6 +303,9 @@ typedef struct TkIntPlatStubs { 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 */ + void (*tkWmCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 9 */ + void (*tkSendCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 10 */ + void (*tkFreeXId) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 11 */ #endif /* UNIX */ #ifdef __WIN32__ char * (*tkAlignImageData) _ANSI_ARGS_((XImage * image, int alignment, int bitOrder)); /* 0 */ @@ -456,6 +465,18 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkpScanWindowId \ (tkIntPlatStubsPtr->tkpScanWindowId) /* 8 */ #endif +#ifndef TkWmCleanup +#define TkWmCleanup \ + (tkIntPlatStubsPtr->tkWmCleanup) /* 9 */ +#endif +#ifndef TkSendCleanup +#define TkSendCleanup \ + (tkIntPlatStubsPtr->tkSendCleanup) /* 10 */ +#endif +#ifndef TkFreeXId +#define TkFreeXId \ + (tkIntPlatStubsPtr->tkFreeXId) /* 11 */ +#endif #endif /* UNIX */ #ifdef __WIN32__ #ifndef TkAlignImageData diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 450bab7..848fe96 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -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: tkStubInit.c,v 1.31 2002/04/05 08:38:22 hobbs Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.32 2002/04/12 10:10:48 hobbs Exp $ */ #include "tkInt.h" @@ -269,6 +269,9 @@ TkIntStubs tkIntStubs = { TkpInitKeymapInfo, /* 139 */ TkPhotoGetValidRegion, /* 140 */ TkWmStackorderToplevel, /* 141 */ + TkFocusFree, /* 142 */ + TkClipCleanup, /* 143 */ + TkGCCleanup, /* 144 */ }; TkIntPlatStubs tkIntPlatStubs = { @@ -284,6 +287,9 @@ TkIntPlatStubs tkIntPlatStubs = { TkUnixDoOneXEvent, /* 6 */ TkUnixSetMenubar, /* 7 */ TkpScanWindowId, /* 8 */ + TkWmCleanup, /* 9 */ + TkSendCleanup, /* 10 */ + TkFreeXId, /* 11 */ #endif /* UNIX */ #ifdef __WIN32__ TkAlignImageData, /* 0 */ -- cgit v0.12