diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkInt.decls | 16 | ||||
| -rw-r--r-- | generic/tkIntPlatDecls.h | 37 | ||||
| -rw-r--r-- | generic/tkIntPlatStubs.c | 18 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 13 |
4 files changed, 32 insertions, 52 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 1852095..6225529 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.1.2.1 1999/03/06 00:08:03 redman Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.1.2.2 1999/03/06 01:54:58 redman Exp $ library tk @@ -480,26 +480,22 @@ declare 2 unix { } declare 3 unix { - TkWindow * TkpGetContainer (TkWindow *embeddedPtr) -} + int TkpCmapStressed (Tk_Window tkwin, Colormap colormap)} -declare 4 unix { - int TkpCmapStressed (Tk_Window tkwin, Colormap colormap) -} -declare 5 unix { +declare 4 unix { void TkpSync (Display *display) } -declare 6 unix { +declare 5 unix { Window TkUnixContainerId (TkWindow *winPtr) } -declare 7 unix { +declare 6 unix { int TkUnixDoOneXEvent (Tcl_Time *timePtr) } -declare 8 unix { +declare 7 unix { void TkUnixSetMenubar (Tk_Window tkwin, Tk_Window menubar) } diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 303e03c..0a3a88c 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.1.2.1 1999/03/06 00:08:04 redman Exp $ + * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.1.2.2 1999/03/06 01:54:59 redman Exp $ */ #ifndef _TKINTPLATDECLS @@ -160,17 +160,15 @@ EXTERN void TkFreeWindowId _ANSI_ARGS_((TkDisplay * dispPtr, /* 2 */ EXTERN void TkInitXId _ANSI_ARGS_((TkDisplay * dispPtr)); /* 3 */ -EXTERN TkWindow * TkpGetContainer _ANSI_ARGS_((TkWindow * embeddedPtr)); -/* 4 */ EXTERN int TkpCmapStressed _ANSI_ARGS_((Tk_Window tkwin, Colormap colormap)); -/* 5 */ +/* 4 */ EXTERN void TkpSync _ANSI_ARGS_((Display * display)); -/* 6 */ +/* 5 */ EXTERN Window TkUnixContainerId _ANSI_ARGS_((TkWindow * winPtr)); -/* 7 */ +/* 6 */ EXTERN int TkUnixDoOneXEvent _ANSI_ARGS_((Tcl_Time * timePtr)); -/* 8 */ +/* 7 */ EXTERN void TkUnixSetMenubar _ANSI_ARGS_((Tk_Window tkwin, Tk_Window menubar)); #endif /* UNIX */ @@ -417,12 +415,11 @@ typedef struct TkIntPlatStubs { void (*tkCreateXEventSource) _ANSI_ARGS_((void)); /* 0 */ void (*tkFreeWindowId) _ANSI_ARGS_((TkDisplay * dispPtr, Window w)); /* 1 */ void (*tkInitXId) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 2 */ - TkWindow * (*tkpGetContainer) _ANSI_ARGS_((TkWindow * embeddedPtr)); /* 3 */ - int (*tkpCmapStressed) _ANSI_ARGS_((Tk_Window tkwin, Colormap colormap)); /* 4 */ - void (*tkpSync) _ANSI_ARGS_((Display * display)); /* 5 */ - Window (*tkUnixContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 6 */ - int (*tkUnixDoOneXEvent) _ANSI_ARGS_((Tcl_Time * timePtr)); /* 7 */ - void (*tkUnixSetMenubar) _ANSI_ARGS_((Tk_Window tkwin, Tk_Window menubar)); /* 8 */ + int (*tkpCmapStressed) _ANSI_ARGS_((Tk_Window tkwin, Colormap colormap)); /* 3 */ + void (*tkpSync) _ANSI_ARGS_((Display * display)); /* 4 */ + 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 */ #endif /* UNIX */ #ifdef MAC_TCL void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 0 */ @@ -698,29 +695,25 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkInitXId(dispPtr) \ (tkIntPlatStubsPtr->tkInitXId)(dispPtr) /* 2 */ #endif -#ifndef TkpGetContainer -#define TkpGetContainer(embeddedPtr) \ - (tkIntPlatStubsPtr->tkpGetContainer)(embeddedPtr) /* 3 */ -#endif #ifndef TkpCmapStressed #define TkpCmapStressed(tkwin, colormap) \ - (tkIntPlatStubsPtr->tkpCmapStressed)(tkwin, colormap) /* 4 */ + (tkIntPlatStubsPtr->tkpCmapStressed)(tkwin, colormap) /* 3 */ #endif #ifndef TkpSync #define TkpSync(display) \ - (tkIntPlatStubsPtr->tkpSync)(display) /* 5 */ + (tkIntPlatStubsPtr->tkpSync)(display) /* 4 */ #endif #ifndef TkUnixContainerId #define TkUnixContainerId(winPtr) \ - (tkIntPlatStubsPtr->tkUnixContainerId)(winPtr) /* 6 */ + (tkIntPlatStubsPtr->tkUnixContainerId)(winPtr) /* 5 */ #endif #ifndef TkUnixDoOneXEvent #define TkUnixDoOneXEvent(timePtr) \ - (tkIntPlatStubsPtr->tkUnixDoOneXEvent)(timePtr) /* 7 */ + (tkIntPlatStubsPtr->tkUnixDoOneXEvent)(timePtr) /* 6 */ #endif #ifndef TkUnixSetMenubar #define TkUnixSetMenubar(tkwin, menubar) \ - (tkIntPlatStubsPtr->tkUnixSetMenubar)(tkwin, menubar) /* 8 */ + (tkIntPlatStubsPtr->tkUnixSetMenubar)(tkwin, menubar) /* 7 */ #endif #endif /* UNIX */ #ifdef MAC_TCL diff --git a/generic/tkIntPlatStubs.c b/generic/tkIntPlatStubs.c index 4588d8c..58a2339 100644 --- a/generic/tkIntPlatStubs.c +++ b/generic/tkIntPlatStubs.c @@ -7,7 +7,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntPlatStubs.c,v 1.1.2.1 1999/03/06 00:08:04 redman Exp $ + * RCS: @(#) $Id: tkIntPlatStubs.c,v 1.1.2.2 1999/03/06 01:54:59 redman Exp $ */ #include "tkInt.h" @@ -443,14 +443,6 @@ TkInitXId(dispPtr) } /* Slot 3 */ -TkWindow * -TkpGetContainer(embeddedPtr) - TkWindow * embeddedPtr; -{ - return (tkIntPlatStubsPtr->tkpGetContainer)(embeddedPtr); -} - -/* Slot 4 */ int TkpCmapStressed(tkwin, colormap) Tk_Window tkwin; @@ -459,7 +451,7 @@ TkpCmapStressed(tkwin, colormap) return (tkIntPlatStubsPtr->tkpCmapStressed)(tkwin, colormap); } -/* Slot 5 */ +/* Slot 4 */ void TkpSync(display) Display * display; @@ -467,7 +459,7 @@ TkpSync(display) (tkIntPlatStubsPtr->tkpSync)(display); } -/* Slot 6 */ +/* Slot 5 */ Window TkUnixContainerId(winPtr) TkWindow * winPtr; @@ -475,7 +467,7 @@ TkUnixContainerId(winPtr) return (tkIntPlatStubsPtr->tkUnixContainerId)(winPtr); } -/* Slot 7 */ +/* Slot 6 */ int TkUnixDoOneXEvent(timePtr) Tcl_Time * timePtr; @@ -483,7 +475,7 @@ TkUnixDoOneXEvent(timePtr) return (tkIntPlatStubsPtr->tkUnixDoOneXEvent)(timePtr); } -/* Slot 8 */ +/* Slot 7 */ void TkUnixSetMenubar(tkwin, menubar) Tk_Window tkwin; diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index a37b256..99fd46f 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.1.2.1 1999/03/06 00:08:06 redman Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.1.2.2 1999/03/06 01:54:59 redman Exp $ */ #include "tkInt.h" @@ -380,12 +380,11 @@ TkIntPlatStubs tkIntPlatStubs = { TkCreateXEventSource, /* 0 */ TkFreeWindowId, /* 1 */ TkInitXId, /* 2 */ - TkpGetContainer, /* 3 */ - TkpCmapStressed, /* 4 */ - TkpSync, /* 5 */ - TkUnixContainerId, /* 6 */ - TkUnixDoOneXEvent, /* 7 */ - TkUnixSetMenubar, /* 8 */ + TkpCmapStressed, /* 3 */ + TkpSync, /* 4 */ + TkUnixContainerId, /* 5 */ + TkUnixDoOneXEvent, /* 6 */ + TkUnixSetMenubar, /* 7 */ #endif /* UNIX */ #ifdef MAC_TCL TkClipBox, /* 0 */ |