diff options
| -rw-r--r-- | generic/tkConsole.c | 23 | ||||
| -rw-r--r-- | generic/tkInt.decls | 136 | ||||
| -rw-r--r-- | generic/tkIntDecls.h | 262 | ||||
| -rw-r--r-- | generic/tkIntPlatDecls.h | 110 | ||||
| -rw-r--r-- | generic/tkIntXlibDecls.h | 6 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 141 | ||||
| -rw-r--r-- | generic/tkStubLib.c | 25 |
7 files changed, 527 insertions, 176 deletions
diff --git a/generic/tkConsole.c b/generic/tkConsole.c index ed7bab8..5c43a12 100644 --- a/generic/tkConsole.c +++ b/generic/tkConsole.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkConsole.c,v 1.6 1999/04/28 18:18:06 redman Exp $ + * RCS: @(#) $Id: tkConsole.c,v 1.7 1999/05/25 01:31:05 stanton Exp $ */ #include "tk.h" @@ -127,9 +127,20 @@ Tk_InitConsoleChannels(interp) /* * check for STDIN, otherwise create it + * + * Don't do this check on the Mac, because it is hard to prevent + * callbacks from the SIOUX layer from opening stdout & stdin, but + * we don't want to use the SIOUX console. Since the console is not + * actually created till something is written to the channel, it is + * okay to just ignore it here. + * + * This is still a bit of a hack, however, and should be cleaned up + * when we have a better abstraction for the console. */ +#ifndef MAC_TCL if (Tcl_GetStdChannel(TCL_STDIN) == NULL) { +#endif consoleChannel = Tcl_CreateChannel(&consoleChannelType, "console0", (ClientData) TCL_STDIN, TCL_READABLE); if (consoleChannel != NULL) { @@ -141,13 +152,17 @@ Tk_InitConsoleChannels(interp) "-encoding", "utf-8"); } Tcl_SetStdChannel(consoleChannel, TCL_STDIN); +#ifndef MAC_TCL } +#endif /* * check for STDOUT, otherwise create it */ +#ifndef MAC_TCL if (Tcl_GetStdChannel(TCL_STDOUT) == NULL) { +#endif consoleChannel = Tcl_CreateChannel(&consoleChannelType, "console1", (ClientData) TCL_STDOUT, TCL_WRITABLE); if (consoleChannel != NULL) { @@ -159,13 +174,17 @@ Tk_InitConsoleChannels(interp) "-encoding", "utf-8"); } Tcl_SetStdChannel(consoleChannel, TCL_STDOUT); +#ifndef MAC_TCL } +#endif /* * check for STDERR, otherwise create it */ +#ifndef MAC_TCL if (Tcl_GetStdChannel(TCL_STDERR) == NULL) { +#endif consoleChannel = Tcl_CreateChannel(&consoleChannelType, "console2", (ClientData) TCL_STDERR, TCL_WRITABLE); if (consoleChannel != NULL) { @@ -177,7 +196,9 @@ Tk_InitConsoleChannels(interp) "-encoding", "utf-8"); } Tcl_SetStdChannel(consoleChannel, TCL_STDERR); +#ifndef MAC_TCL } +#endif } Tcl_MutexUnlock(&consoleMutex); } diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 48c8730..5c7693b 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.6 1999/04/24 01:50:48 stanton Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.7 1999/05/25 01:31:05 stanton Exp $ library tk @@ -525,66 +525,93 @@ declare 112 generic { void TkpMenuThreadInit (void) } -declare 113 win { +declare 113 {mac win} { void TkClipBox (TkRegion rgn, XRectangle* rect_return) } -declare 113 mac { - void TkClipBox (TkRegion rgn, XRectangle* rect_return) +declare 114 {mac win} { + TkRegion TkCreateRegion (void) } -declare 114 win { - TkRegion TkCreateRegion (void) +declare 115 {mac win} { + void TkDestroyRegion (TkRegion rgn) } -declare 114 mac { - TkRegion TkCreateRegion (void) +declare 116 {mac win} { + void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return) } -declare 115 win { - void TkDestroyRegion (TkRegion rgn) +declare 117 {mac win} { + int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \ + unsigned int height) } -declare 115 mac { - void TkDestroyRegion (TkRegion rgn) +declare 118 {mac win} { + void TkSetRegion (Display* display, GC gc, TkRegion rgn) } -declare 116 win { - void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return) +declare 119 {mac win} { + void TkUnionRectWithRegion (XRectangle* rect, \ + TkRegion src, TkRegion dr_return) } -declare 116 mac { - void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return) +declare 120 mac { + void TkGenerateActivateEvents (TkWindow *winPtr, int active) } -declare 117 win { - int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \ - unsigned int height) +declare 121 mac { + Pixmap TkpCreateNativeBitmap (Display *display, char * source) } -declare 117 mac { - int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \ - unsigned int height) +declare 122 mac { + void TkpDefineNativeBitmaps (void) } -declare 118 win { - void TkSetRegion (Display* display, GC gc, TkRegion rgn) +declare 123 mac { + unsigned long TkpGetMS (void) } -declare 118 mac { - void TkSetRegion (Display* display, GC gc, TkRegion rgn) +declare 124 mac { + Pixmap TkpGetNativeAppBitmap (Display *display, \ + CONST char *name, int *width, int *height) } -declare 119 win { - void TkUnionRectWithRegion (XRectangle* rect, \ - TkRegion src, TkRegion dr_return) +declare 125 mac { + void TkPointerDeadWindow (TkWindow *winPtr) } -declare 119 mac { - void TkUnionRectWithRegion (XRectangle* rect, \ - TkRegion src, TkRegion dr_return) +declare 126 mac { + void TkpSetCapture (TkWindow *winPtr) +} + +declare 127 mac { + void TkpSetCursor (TkpCursor cursor) +} + +declare 128 mac { + void TkpWmSetState (TkWindow *winPtr, int state) +} + +declare 130 mac { + Window TkGetTransientMaster (TkWindow *winPtr) +} + +declare 131 mac { + int TkGenerateButtonEvent (int x, int y, \ + Window window, unsigned int state) +} + +declare 133 mac { + void TkGenWMDestroyEvent (Tk_Window tkwin) } +declare 134 mac { + void TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \ + int width, int height, int flags) +} + + + ############################################################################## # Define the platform specific internal Tcl interface. These functions are @@ -791,11 +818,6 @@ declare 3 mac { unsigned long TkpGetMS (void) } -declare 4 mac { - Pixmap TkpGetNativeAppBitmap (Display *display, \ - char *name, int *width, int *height) -} - declare 5 mac { void TkPointerDeadWindow (TkWindow *winPtr) } @@ -812,22 +834,10 @@ declare 8 mac { void TkpWmSetState (TkWindow *winPtr, int state) } -declare 9 mac { - int HandleWMEvent (EventRecord *theEvent) -} - declare 10 mac { void TkAboutDlg (void) } -declare 11 mac { - void TkCreateMacEventSource (void) -} - -declare 12 mac { - void TkFontList (Tcl_Interp *interp, Display *display) -} - declare 13 mac { Window TkGetTransientMaster (TkWindow *winPtr) } @@ -837,11 +847,6 @@ declare 14 mac { Window window, unsigned int state) } -declare 15 mac { - int TkGetCharPositions (XFontStruct *font_struct, char *string, \ - int count, short *buffer) -} - declare 16 mac { void TkGenWMDestroyEvent (Tk_Window tkwin) } @@ -879,10 +884,6 @@ declare 24 mac { void TkMacHandleTearoffMenu (void) } -declare 25 mac { - void tkMacInstallMWConsole (Tcl_Interp *interp) -} - declare 26 mac { void TkMacInvalClipRgns (TkWindow *winPtr) } @@ -891,11 +892,6 @@ declare 27 mac { void TkMacDoHLEvent (EventRecord *theEvent) } -declare 28 mac { - void TkMacFontInfo (Font fontId, short *family, \ - short *style, short *size) -} - declare 29 mac { Time TkMacGenerateTime (void) } @@ -960,10 +956,6 @@ declare 44 mac { int TkMacResizable (TkWindow *winPtr) } -declare 45 mac { - void TkMacSetEmbedRgn (TkWindow *winPtr, RgnHandle rgn) -} - declare 46 mac { void TkMacSetHelpMenuItemCount (void) } @@ -1004,10 +996,6 @@ declare 55 mac { void TkMacWindowOffset (WindowRef wRef, int *xOffset, int *yOffset) } -declare 56 mac { - void TkResumeClipboard (void) -} - declare 57 mac { int TkSetMacColor (unsigned long pixel, RGBColor *macColor) } @@ -1020,10 +1008,6 @@ declare 59 mac { void TkSuspendClipboard (void) } -declare 60 mac { - int TkWMGrowToplevel (WindowRef whichWindow, Point start) -} - declare 61 mac { int TkMacZoomToplevel (WindowPtr whichWindow, Point where, short zoomPart) } @@ -1584,7 +1568,7 @@ declare 13 mac { } declare 14 mac { - void XChangeProperty (Display* d, Window w, Atom a, Atom a, int i1, \ + void XChangeProperty (Display* d, Window w, Atom a1, Atom a2, int i1, \ int i2, _Xconst unsigned char* c, int i3) } diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index f46e7c2..8019da4 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.5 1999/04/30 22:49:55 stanton Exp $ + * RCS: @(#) $Id: tkIntDecls.h,v 1.6 1999/05/25 01:31:05 stanton Exp $ */ #ifndef _TKINTDECLS @@ -438,6 +438,67 @@ EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); #endif /* MAC_TCL */ +#ifdef MAC_TCL +/* 120 */ +EXTERN void TkGenerateActivateEvents _ANSI_ARGS_(( + TkWindow * winPtr, int active)); +#endif /* MAC_TCL */ +#ifdef MAC_TCL +/* 121 */ +EXTERN Pixmap TkpCreateNativeBitmap _ANSI_ARGS_((Display * display, + char * source)); +#endif /* MAC_TCL */ +#ifdef MAC_TCL +/* 122 */ +EXTERN void TkpDefineNativeBitmaps _ANSI_ARGS_((void)); +#endif /* MAC_TCL */ +#ifdef MAC_TCL +/* 123 */ +EXTERN unsigned long TkpGetMS _ANSI_ARGS_((void)); +#endif /* MAC_TCL */ +#ifdef MAC_TCL +/* 124 */ +EXTERN Pixmap TkpGetNativeAppBitmap _ANSI_ARGS_((Display * display, + CONST char * name, int * width, int * height)); +#endif /* MAC_TCL */ +#ifdef MAC_TCL +/* 125 */ +EXTERN void TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); +#endif /* MAC_TCL */ +#ifdef MAC_TCL +/* 126 */ +EXTERN void TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr)); +#endif /* MAC_TCL */ +#ifdef MAC_TCL +/* 127 */ +EXTERN void TkpSetCursor _ANSI_ARGS_((TkpCursor cursor)); +#endif /* MAC_TCL */ +#ifdef MAC_TCL +/* 128 */ +EXTERN void TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, + int state)); +#endif /* MAC_TCL */ +/* Slot 129 is reserved */ +#ifdef MAC_TCL +/* 130 */ +EXTERN Window TkGetTransientMaster _ANSI_ARGS_((TkWindow * winPtr)); +#endif /* MAC_TCL */ +#ifdef MAC_TCL +/* 131 */ +EXTERN int TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, + Window window, unsigned int state)); +#endif /* MAC_TCL */ +/* Slot 132 is reserved */ +#ifdef MAC_TCL +/* 133 */ +EXTERN void TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin)); +#endif /* MAC_TCL */ +#ifdef MAC_TCL +/* 134 */ +EXTERN void TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, + int x, int y, int width, int height, + int flags)); +#endif /* MAC_TCL */ typedef struct TkIntStubs { int magic; @@ -619,6 +680,125 @@ typedef struct TkIntStubs { #ifdef MAC_TCL void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */ #endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved120; +#endif /* UNIX */ +#ifdef __WIN32__ + void *reserved120; +#endif /* __WIN32__ */ +#ifdef MAC_TCL + void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 120 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved121; +#endif /* UNIX */ +#ifdef __WIN32__ + void *reserved121; +#endif /* __WIN32__ */ +#ifdef MAC_TCL + Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, char * source)); /* 121 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved122; +#endif /* UNIX */ +#ifdef __WIN32__ + void *reserved122; +#endif /* __WIN32__ */ +#ifdef MAC_TCL + void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 122 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved123; +#endif /* UNIX */ +#ifdef __WIN32__ + void *reserved123; +#endif /* __WIN32__ */ +#ifdef MAC_TCL + unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 123 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved124; +#endif /* UNIX */ +#ifdef __WIN32__ + void *reserved124; +#endif /* __WIN32__ */ +#ifdef MAC_TCL + Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display * display, CONST char * name, int * width, int * height)); /* 124 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved125; +#endif /* UNIX */ +#ifdef __WIN32__ + void *reserved125; +#endif /* __WIN32__ */ +#ifdef MAC_TCL + void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 125 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved126; +#endif /* UNIX */ +#ifdef __WIN32__ + void *reserved126; +#endif /* __WIN32__ */ +#ifdef MAC_TCL + void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 126 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved127; +#endif /* UNIX */ +#ifdef __WIN32__ + void *reserved127; +#endif /* __WIN32__ */ +#ifdef MAC_TCL + void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 127 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved128; +#endif /* UNIX */ +#ifdef __WIN32__ + void *reserved128; +#endif /* __WIN32__ */ +#ifdef MAC_TCL + void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 128 */ +#endif /* MAC_TCL */ + void *reserved129; +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved130; +#endif /* UNIX */ +#ifdef __WIN32__ + void *reserved130; +#endif /* __WIN32__ */ +#ifdef MAC_TCL + Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow * winPtr)); /* 130 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved131; +#endif /* UNIX */ +#ifdef __WIN32__ + void *reserved131; +#endif /* __WIN32__ */ +#ifdef MAC_TCL + int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 131 */ +#endif /* MAC_TCL */ + void *reserved132; +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved133; +#endif /* UNIX */ +#ifdef __WIN32__ + void *reserved133; +#endif /* __WIN32__ */ +#ifdef MAC_TCL + void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 133 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved134; +#endif /* UNIX */ +#ifdef __WIN32__ + void *reserved134; +#endif /* __WIN32__ */ +#ifdef MAC_TCL + void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 134 */ +#endif /* MAC_TCL */ } TkIntStubs; #ifdef __cplusplus @@ -1171,6 +1351,86 @@ extern TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_TCL +#ifndef TkGenerateActivateEvents +#define TkGenerateActivateEvents \ + (tkIntStubsPtr->tkGenerateActivateEvents) /* 120 */ +#endif +#endif /* MAC_TCL */ +#ifdef MAC_TCL +#ifndef TkpCreateNativeBitmap +#define TkpCreateNativeBitmap \ + (tkIntStubsPtr->tkpCreateNativeBitmap) /* 121 */ +#endif +#endif /* MAC_TCL */ +#ifdef MAC_TCL +#ifndef TkpDefineNativeBitmaps +#define TkpDefineNativeBitmaps \ + (tkIntStubsPtr->tkpDefineNativeBitmaps) /* 122 */ +#endif +#endif /* MAC_TCL */ +#ifdef MAC_TCL +#ifndef TkpGetMS +#define TkpGetMS \ + (tkIntStubsPtr->tkpGetMS) /* 123 */ +#endif +#endif /* MAC_TCL */ +#ifdef MAC_TCL +#ifndef TkpGetNativeAppBitmap +#define TkpGetNativeAppBitmap \ + (tkIntStubsPtr->tkpGetNativeAppBitmap) /* 124 */ +#endif +#endif /* MAC_TCL */ +#ifdef MAC_TCL +#ifndef TkPointerDeadWindow +#define TkPointerDeadWindow \ + (tkIntStubsPtr->tkPointerDeadWindow) /* 125 */ +#endif +#endif /* MAC_TCL */ +#ifdef MAC_TCL +#ifndef TkpSetCapture +#define TkpSetCapture \ + (tkIntStubsPtr->tkpSetCapture) /* 126 */ +#endif +#endif /* MAC_TCL */ +#ifdef MAC_TCL +#ifndef TkpSetCursor +#define TkpSetCursor \ + (tkIntStubsPtr->tkpSetCursor) /* 127 */ +#endif +#endif /* MAC_TCL */ +#ifdef MAC_TCL +#ifndef TkpWmSetState +#define TkpWmSetState \ + (tkIntStubsPtr->tkpWmSetState) /* 128 */ +#endif +#endif /* MAC_TCL */ +/* Slot 129 is reserved */ +#ifdef MAC_TCL +#ifndef TkGetTransientMaster +#define TkGetTransientMaster \ + (tkIntStubsPtr->tkGetTransientMaster) /* 130 */ +#endif +#endif /* MAC_TCL */ +#ifdef MAC_TCL +#ifndef TkGenerateButtonEvent +#define TkGenerateButtonEvent \ + (tkIntStubsPtr->tkGenerateButtonEvent) /* 131 */ +#endif +#endif /* MAC_TCL */ +/* Slot 132 is reserved */ +#ifdef MAC_TCL +#ifndef TkGenWMDestroyEvent +#define TkGenWMDestroyEvent \ + (tkIntStubsPtr->tkGenWMDestroyEvent) /* 133 */ +#endif +#endif /* MAC_TCL */ +#ifdef MAC_TCL +#ifndef TkGenWMConfigureEvent +#define TkGenWMConfigureEvent \ + (tkIntStubsPtr->tkGenWMConfigureEvent) /* 134 */ +#endif +#endif /* MAC_TCL */ #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index f1111ec..670e5e9 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.5 1999/04/30 22:49:55 stanton Exp $ + * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.6 1999/05/25 01:31:06 stanton Exp $ */ #ifndef _TKINTPLATDECLS @@ -154,9 +154,7 @@ EXTERN Pixmap TkpCreateNativeBitmap _ANSI_ARGS_((Display * display, EXTERN void TkpDefineNativeBitmaps _ANSI_ARGS_((void)); /* 3 */ EXTERN unsigned long TkpGetMS _ANSI_ARGS_((void)); -/* 4 */ -EXTERN Pixmap TkpGetNativeAppBitmap _ANSI_ARGS_((Display * display, - char * name, int * width, int * height)); +/* Slot 4 is reserved */ /* 5 */ EXTERN void TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); /* 6 */ @@ -166,24 +164,17 @@ EXTERN void TkpSetCursor _ANSI_ARGS_((TkpCursor cursor)); /* 8 */ EXTERN void TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, int state)); -/* 9 */ -EXTERN int HandleWMEvent _ANSI_ARGS_((EventRecord * theEvent)); +/* Slot 9 is reserved */ /* 10 */ EXTERN void TkAboutDlg _ANSI_ARGS_((void)); -/* 11 */ -EXTERN void TkCreateMacEventSource _ANSI_ARGS_((void)); -/* 12 */ -EXTERN void TkFontList _ANSI_ARGS_((Tcl_Interp * interp, - Display * display)); +/* Slot 11 is reserved */ +/* Slot 12 is reserved */ /* 13 */ EXTERN Window TkGetTransientMaster _ANSI_ARGS_((TkWindow * winPtr)); /* 14 */ EXTERN int TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); -/* 15 */ -EXTERN int TkGetCharPositions _ANSI_ARGS_(( - XFontStruct * font_struct, char * string, - int count, short * buffer)); +/* Slot 15 is reserved */ /* 16 */ EXTERN void TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin)); /* 17 */ @@ -207,16 +198,12 @@ EXTERN int TkMacConvertTkEvent _ANSI_ARGS_(( EventRecord * eventPtr, Window window)); /* 24 */ EXTERN void TkMacHandleTearoffMenu _ANSI_ARGS_((void)); -/* 25 */ -EXTERN void tkMacInstallMWConsole _ANSI_ARGS_(( - Tcl_Interp * interp)); +/* Slot 25 is reserved */ /* 26 */ EXTERN void TkMacInvalClipRgns _ANSI_ARGS_((TkWindow * winPtr)); /* 27 */ EXTERN void TkMacDoHLEvent _ANSI_ARGS_((EventRecord * theEvent)); -/* 28 */ -EXTERN void TkMacFontInfo _ANSI_ARGS_((Font fontId, - short * family, short * style, short * size)); +/* Slot 28 is reserved */ /* 29 */ EXTERN Time TkMacGenerateTime _ANSI_ARGS_((void)); /* 30 */ @@ -258,9 +245,7 @@ EXTERN void TkMacRegisterOffScreenWindow _ANSI_ARGS_(( Window window, GWorldPtr portPtr)); /* 44 */ EXTERN int TkMacResizable _ANSI_ARGS_((TkWindow * winPtr)); -/* 45 */ -EXTERN void TkMacSetEmbedRgn _ANSI_ARGS_((TkWindow * winPtr, - RgnHandle rgn)); +/* Slot 45 is reserved */ /* 46 */ EXTERN void TkMacSetHelpMenuItemCount _ANSI_ARGS_((void)); /* 47 */ @@ -285,8 +270,7 @@ EXTERN void TkMacWinBounds _ANSI_ARGS_((TkWindow * winPtr, /* 55 */ EXTERN void TkMacWindowOffset _ANSI_ARGS_((WindowRef wRef, int * xOffset, int * yOffset)); -/* 56 */ -EXTERN void TkResumeClipboard _ANSI_ARGS_((void)); +/* Slot 56 is reserved */ /* 57 */ EXTERN int TkSetMacColor _ANSI_ARGS_((unsigned long pixel, RGBColor * macColor)); @@ -295,9 +279,7 @@ EXTERN void TkSetWMName _ANSI_ARGS_((TkWindow * winPtr, Tk_Uid titleUid)); /* 59 */ EXTERN void TkSuspendClipboard _ANSI_ARGS_((void)); -/* 60 */ -EXTERN int TkWMGrowToplevel _ANSI_ARGS_((WindowRef whichWindow, - Point start)); +/* Slot 60 is reserved */ /* 61 */ EXTERN int TkMacZoomToplevel _ANSI_ARGS_((WindowPtr whichWindow, Point where, short zoomPart)); @@ -365,18 +347,18 @@ typedef struct TkIntPlatStubs { Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, char * source)); /* 1 */ void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 2 */ unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 3 */ - Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display * display, char * name, int * width, int * height)); /* 4 */ + void *reserved4; void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 5 */ void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 6 */ void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 7 */ void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 8 */ - int (*handleWMEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 9 */ + void *reserved9; void (*tkAboutDlg) _ANSI_ARGS_((void)); /* 10 */ - void (*tkCreateMacEventSource) _ANSI_ARGS_((void)); /* 11 */ - void (*tkFontList) _ANSI_ARGS_((Tcl_Interp * interp, Display * display)); /* 12 */ + void *reserved11; + void *reserved12; Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow * winPtr)); /* 13 */ int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 14 */ - int (*tkGetCharPositions) _ANSI_ARGS_((XFontStruct * font_struct, char * string, int count, short * buffer)); /* 15 */ + void *reserved15; void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 16 */ void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 17 */ unsigned int (*tkMacButtonKeyState) _ANSI_ARGS_((void)); /* 18 */ @@ -386,10 +368,10 @@ typedef struct TkIntPlatStubs { void (*tkMacInstallCursor) _ANSI_ARGS_((int resizeOverride)); /* 22 */ int (*tkMacConvertTkEvent) _ANSI_ARGS_((EventRecord * eventPtr, Window window)); /* 23 */ void (*tkMacHandleTearoffMenu) _ANSI_ARGS_((void)); /* 24 */ - void (*tkMacInstallMWConsole) _ANSI_ARGS_((Tcl_Interp * interp)); /* 25 */ + void *reserved25; void (*tkMacInvalClipRgns) _ANSI_ARGS_((TkWindow * winPtr)); /* 26 */ void (*tkMacDoHLEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 27 */ - void (*tkMacFontInfo) _ANSI_ARGS_((Font fontId, short * family, short * style, short * size)); /* 28 */ + void *reserved28; Time (*tkMacGenerateTime) _ANSI_ARGS_((void)); /* 29 */ GWorldPtr (*tkMacGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 30 */ TkWindow * (*tkMacGetScrollbarGrowWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 31 */ @@ -406,7 +388,7 @@ typedef struct TkIntPlatStubs { void (*tkMacMenuClick) _ANSI_ARGS_((void)); /* 42 */ void (*tkMacRegisterOffScreenWindow) _ANSI_ARGS_((Window window, GWorldPtr portPtr)); /* 43 */ int (*tkMacResizable) _ANSI_ARGS_((TkWindow * winPtr)); /* 44 */ - void (*tkMacSetEmbedRgn) _ANSI_ARGS_((TkWindow * winPtr, RgnHandle rgn)); /* 45 */ + void *reserved45; void (*tkMacSetHelpMenuItemCount) _ANSI_ARGS_((void)); /* 46 */ void (*tkMacSetScrollbarGrow) _ANSI_ARGS_((TkWindow * winPtr, int flag)); /* 47 */ void (*tkMacSetUpClippingRgn) _ANSI_ARGS_((Drawable drawable)); /* 48 */ @@ -417,11 +399,11 @@ typedef struct TkIntPlatStubs { RgnHandle (*tkMacVisableClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 53 */ void (*tkMacWinBounds) _ANSI_ARGS_((TkWindow * winPtr, Rect * geometry)); /* 54 */ void (*tkMacWindowOffset) _ANSI_ARGS_((WindowRef wRef, int * xOffset, int * yOffset)); /* 55 */ - void (*tkResumeClipboard) _ANSI_ARGS_((void)); /* 56 */ + void *reserved56; int (*tkSetMacColor) _ANSI_ARGS_((unsigned long pixel, RGBColor * macColor)); /* 57 */ void (*tkSetWMName) _ANSI_ARGS_((TkWindow * winPtr, Tk_Uid titleUid)); /* 58 */ void (*tkSuspendClipboard) _ANSI_ARGS_((void)); /* 59 */ - int (*tkWMGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 60 */ + void *reserved60; int (*tkMacZoomToplevel) _ANSI_ARGS_((WindowPtr whichWindow, Point where, short zoomPart)); /* 61 */ Tk_Window (*tk_TopCoordsToWindow) _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int * newX, int * newY)); /* 62 */ MacDrawable * (*tkMacContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 63 */ @@ -629,10 +611,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkpGetMS \ (tkIntPlatStubsPtr->tkpGetMS) /* 3 */ #endif -#ifndef TkpGetNativeAppBitmap -#define TkpGetNativeAppBitmap \ - (tkIntPlatStubsPtr->tkpGetNativeAppBitmap) /* 4 */ -#endif +/* Slot 4 is reserved */ #ifndef TkPointerDeadWindow #define TkPointerDeadWindow \ (tkIntPlatStubsPtr->tkPointerDeadWindow) /* 5 */ @@ -649,22 +628,13 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkpWmSetState \ (tkIntPlatStubsPtr->tkpWmSetState) /* 8 */ #endif -#ifndef HandleWMEvent -#define HandleWMEvent \ - (tkIntPlatStubsPtr->handleWMEvent) /* 9 */ -#endif +/* Slot 9 is reserved */ #ifndef TkAboutDlg #define TkAboutDlg \ (tkIntPlatStubsPtr->tkAboutDlg) /* 10 */ #endif -#ifndef TkCreateMacEventSource -#define TkCreateMacEventSource \ - (tkIntPlatStubsPtr->tkCreateMacEventSource) /* 11 */ -#endif -#ifndef TkFontList -#define TkFontList \ - (tkIntPlatStubsPtr->tkFontList) /* 12 */ -#endif +/* Slot 11 is reserved */ +/* Slot 12 is reserved */ #ifndef TkGetTransientMaster #define TkGetTransientMaster \ (tkIntPlatStubsPtr->tkGetTransientMaster) /* 13 */ @@ -673,10 +643,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkGenerateButtonEvent \ (tkIntPlatStubsPtr->tkGenerateButtonEvent) /* 14 */ #endif -#ifndef TkGetCharPositions -#define TkGetCharPositions \ - (tkIntPlatStubsPtr->tkGetCharPositions) /* 15 */ -#endif +/* Slot 15 is reserved */ #ifndef TkGenWMDestroyEvent #define TkGenWMDestroyEvent \ (tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 16 */ @@ -713,10 +680,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkMacHandleTearoffMenu \ (tkIntPlatStubsPtr->tkMacHandleTearoffMenu) /* 24 */ #endif -#ifndef tkMacInstallMWConsole -#define tkMacInstallMWConsole \ - (tkIntPlatStubsPtr->tkMacInstallMWConsole) /* 25 */ -#endif +/* Slot 25 is reserved */ #ifndef TkMacInvalClipRgns #define TkMacInvalClipRgns \ (tkIntPlatStubsPtr->tkMacInvalClipRgns) /* 26 */ @@ -725,10 +689,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkMacDoHLEvent \ (tkIntPlatStubsPtr->tkMacDoHLEvent) /* 27 */ #endif -#ifndef TkMacFontInfo -#define TkMacFontInfo \ - (tkIntPlatStubsPtr->tkMacFontInfo) /* 28 */ -#endif +/* Slot 28 is reserved */ #ifndef TkMacGenerateTime #define TkMacGenerateTime \ (tkIntPlatStubsPtr->tkMacGenerateTime) /* 29 */ @@ -793,10 +754,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkMacResizable \ (tkIntPlatStubsPtr->tkMacResizable) /* 44 */ #endif -#ifndef TkMacSetEmbedRgn -#define TkMacSetEmbedRgn \ - (tkIntPlatStubsPtr->tkMacSetEmbedRgn) /* 45 */ -#endif +/* Slot 45 is reserved */ #ifndef TkMacSetHelpMenuItemCount #define TkMacSetHelpMenuItemCount \ (tkIntPlatStubsPtr->tkMacSetHelpMenuItemCount) /* 46 */ @@ -837,10 +795,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkMacWindowOffset \ (tkIntPlatStubsPtr->tkMacWindowOffset) /* 55 */ #endif -#ifndef TkResumeClipboard -#define TkResumeClipboard \ - (tkIntPlatStubsPtr->tkResumeClipboard) /* 56 */ -#endif +/* Slot 56 is reserved */ #ifndef TkSetMacColor #define TkSetMacColor \ (tkIntPlatStubsPtr->tkSetMacColor) /* 57 */ @@ -853,10 +808,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkSuspendClipboard \ (tkIntPlatStubsPtr->tkSuspendClipboard) /* 59 */ #endif -#ifndef TkWMGrowToplevel -#define TkWMGrowToplevel \ - (tkIntPlatStubsPtr->tkWMGrowToplevel) /* 60 */ -#endif +/* Slot 60 is reserved */ #ifndef TkMacZoomToplevel #define TkMacZoomToplevel \ (tkIntPlatStubsPtr->tkMacZoomToplevel) /* 61 */ diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index ae23707..42a486a 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.7 1999/04/30 22:49:55 stanton Exp $ + * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.8 1999/05/25 01:31:06 stanton Exp $ */ #ifndef _TKINTXLIBDECLS @@ -386,7 +386,7 @@ EXTERN Status XAllocColor _ANSI_ARGS_((Display* d, Colormap c, EXTERN void XBell _ANSI_ARGS_((Display* d, int i)); /* 14 */ EXTERN void XChangeProperty _ANSI_ARGS_((Display* d, Window w, - Atom a, Atom a, int i1, int i2, + Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 15 */ EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display* d, @@ -728,7 +728,7 @@ typedef struct TkIntXlibStubs { XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 11 */ Status (*xAllocColor) _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); /* 12 */ void (*xBell) _ANSI_ARGS_((Display* d, int i)); /* 13 */ - void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a, Atom a, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 14 */ + void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 14 */ void (*xChangeWindowAttributes) _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); /* 15 */ void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 16 */ void (*xCopyArea) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 536d688..2ebe002 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.7 1999/04/28 18:18:07 redman Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.8 1999/05/25 01:31:06 stanton Exp $ */ #include "tkInt.h" @@ -218,6 +218,125 @@ TkIntStubs tkIntStubs = { #ifdef MAC_TCL TkUnionRectWithRegion, /* 119 */ #endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 120 */ +#endif /* UNIX */ +#ifdef __WIN32__ + NULL, /* 120 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkGenerateActivateEvents, /* 120 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 121 */ +#endif /* UNIX */ +#ifdef __WIN32__ + NULL, /* 121 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkpCreateNativeBitmap, /* 121 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 122 */ +#endif /* UNIX */ +#ifdef __WIN32__ + NULL, /* 122 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkpDefineNativeBitmaps, /* 122 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 123 */ +#endif /* UNIX */ +#ifdef __WIN32__ + NULL, /* 123 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkpGetMS, /* 123 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 124 */ +#endif /* UNIX */ +#ifdef __WIN32__ + NULL, /* 124 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkpGetNativeAppBitmap, /* 124 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 125 */ +#endif /* UNIX */ +#ifdef __WIN32__ + NULL, /* 125 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkPointerDeadWindow, /* 125 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 126 */ +#endif /* UNIX */ +#ifdef __WIN32__ + NULL, /* 126 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkpSetCapture, /* 126 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 127 */ +#endif /* UNIX */ +#ifdef __WIN32__ + NULL, /* 127 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkpSetCursor, /* 127 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 128 */ +#endif /* UNIX */ +#ifdef __WIN32__ + NULL, /* 128 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkpWmSetState, /* 128 */ +#endif /* MAC_TCL */ + NULL, /* 129 */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 130 */ +#endif /* UNIX */ +#ifdef __WIN32__ + NULL, /* 130 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkGetTransientMaster, /* 130 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 131 */ +#endif /* UNIX */ +#ifdef __WIN32__ + NULL, /* 131 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkGenerateButtonEvent, /* 131 */ +#endif /* MAC_TCL */ + NULL, /* 132 */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 133 */ +#endif /* UNIX */ +#ifdef __WIN32__ + NULL, /* 133 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkGenWMDestroyEvent, /* 133 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 134 */ +#endif /* UNIX */ +#ifdef __WIN32__ + NULL, /* 134 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkGenWMConfigureEvent, /* 134 */ +#endif /* MAC_TCL */ }; TkIntPlatStubs tkIntPlatStubs = { @@ -274,18 +393,18 @@ TkIntPlatStubs tkIntPlatStubs = { TkpCreateNativeBitmap, /* 1 */ TkpDefineNativeBitmaps, /* 2 */ TkpGetMS, /* 3 */ - TkpGetNativeAppBitmap, /* 4 */ + NULL, /* 4 */ TkPointerDeadWindow, /* 5 */ TkpSetCapture, /* 6 */ TkpSetCursor, /* 7 */ TkpWmSetState, /* 8 */ - HandleWMEvent, /* 9 */ + NULL, /* 9 */ TkAboutDlg, /* 10 */ - TkCreateMacEventSource, /* 11 */ - TkFontList, /* 12 */ + NULL, /* 11 */ + NULL, /* 12 */ TkGetTransientMaster, /* 13 */ TkGenerateButtonEvent, /* 14 */ - TkGetCharPositions, /* 15 */ + NULL, /* 15 */ TkGenWMDestroyEvent, /* 16 */ TkGenWMConfigureEvent, /* 17 */ TkMacButtonKeyState, /* 18 */ @@ -295,10 +414,10 @@ TkIntPlatStubs tkIntPlatStubs = { TkMacInstallCursor, /* 22 */ TkMacConvertTkEvent, /* 23 */ TkMacHandleTearoffMenu, /* 24 */ - tkMacInstallMWConsole, /* 25 */ + NULL, /* 25 */ TkMacInvalClipRgns, /* 26 */ TkMacDoHLEvent, /* 27 */ - TkMacFontInfo, /* 28 */ + NULL, /* 28 */ TkMacGenerateTime, /* 29 */ TkMacGetDrawablePort, /* 30 */ TkMacGetScrollbarGrowWindow, /* 31 */ @@ -315,7 +434,7 @@ TkIntPlatStubs tkIntPlatStubs = { TkMacMenuClick, /* 42 */ TkMacRegisterOffScreenWindow, /* 43 */ TkMacResizable, /* 44 */ - TkMacSetEmbedRgn, /* 45 */ + NULL, /* 45 */ TkMacSetHelpMenuItemCount, /* 46 */ TkMacSetScrollbarGrow, /* 47 */ TkMacSetUpClippingRgn, /* 48 */ @@ -326,11 +445,11 @@ TkIntPlatStubs tkIntPlatStubs = { TkMacVisableClipRgn, /* 53 */ TkMacWinBounds, /* 54 */ TkMacWindowOffset, /* 55 */ - TkResumeClipboard, /* 56 */ + NULL, /* 56 */ TkSetMacColor, /* 57 */ TkSetWMName, /* 58 */ TkSuspendClipboard, /* 59 */ - TkWMGrowToplevel, /* 60 */ + NULL, /* 60 */ TkMacZoomToplevel, /* 61 */ Tk_TopCoordsToWindow, /* 62 */ TkMacContainerId, /* 63 */ diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c index 6584ca2..32ba177 100644 --- a/generic/tkStubLib.c +++ b/generic/tkStubLib.c @@ -10,17 +10,27 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkStubLib.c,v 1.4 1999/04/24 01:50:50 stanton Exp $ + * RCS: @(#) $Id: tkStubLib.c,v 1.5 1999/05/25 01:31:06 stanton Exp $ */ /* + * Because of problems with pre-compiled headers on the Mac, we need to + * do these includes before we add the stubs defines. This a hack. + */ + +#ifdef MAC_TCL +#include "tkMacInt.h" +#include "tkInt.h" +#include "tkPort.h" +#endif /* MAC_TCL */ + +/* * We need to ensure that we use the stub macros so that this file contains * no references to any of the stub functions. This will make it possible * to build an extension that references Tk_InitStubs but doesn't end up * including the rest of the stub functions. */ - #ifndef USE_TCL_STUBS #define USE_TCL_STUBS #endif @@ -31,15 +41,16 @@ #endif #undef USE_TK_STUB_PROCS +#ifndef MAC_TCL + #include "tkPort.h" #include "tkInt.h" #ifdef __WIN32__ #include "tkWinInt.h" #endif -#ifdef MAC_TCL -#include "tkMacInt.h" -#endif + +#endif /* !MAC_TCL */ #include "tkDecls.h" #include "tkIntDecls.h" @@ -80,6 +91,10 @@ TkIntXlibStubs *tkIntXlibStubsPtr; *---------------------------------------------------------------------- */ +#ifdef Tk_InitStubs +#undef Tk_InitStubs +#endif + char * Tk_InitStubs(interp, version, exact) Tcl_Interp *interp; |