diff options
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkDecls.h | 8 | ||||
-rw-r--r-- | generic/tkEntry.c | 4 | ||||
-rw-r--r-- | generic/tkImgBmap.c | 11 | ||||
-rw-r--r-- | generic/tkImgPPM.c | 11 | ||||
-rw-r--r-- | generic/tkImgPhoto.c | 11 | ||||
-rw-r--r-- | generic/tkInt.decls | 323 | ||||
-rw-r--r-- | generic/tkIntDecls.h | 223 | ||||
-rw-r--r-- | generic/tkIntPlatDecls.h | 699 | ||||
-rw-r--r-- | generic/tkIntXlibDecls.h | 25 | ||||
-rw-r--r-- | generic/tkMenubutton.c | 4 | ||||
-rw-r--r-- | generic/tkPlatDecls.h | 8 | ||||
-rw-r--r-- | generic/tkStubInit.c | 720 | ||||
-rw-r--r-- | generic/tkStubLib.c | 7 |
13 files changed, 1149 insertions, 905 deletions
diff --git a/generic/tkDecls.h b/generic/tkDecls.h index f0bf66f..45ddfe0 100644 --- a/generic/tkDecls.h +++ b/generic/tkDecls.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: tkDecls.h,v 1.3 1999/04/16 01:51:13 stanton Exp $ + * RCS: @(#) $Id: tkDecls.h,v 1.3.4.1 1999/04/27 21:09:41 stanton Exp $ */ #ifndef _TKDECLS @@ -971,7 +971,13 @@ typedef struct TkStubs { int (*tk_SetOptions) _ANSI_ARGS_((Tcl_Interp * interp, char * recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *CONST objv[], Tk_Window tkwin, Tk_SavedOptions * savePtr, int * maskPtr)); /* 214 */ } TkStubs; +#ifdef __cplusplus +extern "C" { +#endif extern TkStubs *tkStubsPtr; +#ifdef __cplusplus +} +#endif #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) diff --git a/generic/tkEntry.c b/generic/tkEntry.c index 855d22d..7228ed4 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.c @@ -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: tkEntry.c,v 1.3 1999/04/16 01:51:13 stanton Exp $ + * RCS: @(#) $Id: tkEntry.c,v 1.3.4.1 1999/04/24 00:10:49 stanton Exp $ */ #include "tkInt.h" @@ -271,7 +271,7 @@ static Tk_OptionSpec optionSpecs[] = { {TK_OPTION_COLOR, "-selectforeground", "selectForeground", "Background", DEF_ENTRY_SELECT_FG_COLOR, -1, Tk_Offset(Entry, selFgColorPtr), 0, (ClientData) DEF_ENTRY_SELECT_FG_MONO, 0}, - {TK_CONFIG_STRING, "-show", "show", "Show", + {TK_OPTION_STRING, "-show", "show", "Show", DEF_ENTRY_SHOW, -1, Tk_Offset(Entry, showChar), TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_STRING_TABLE, "-state", "state", "State", diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c index 0f23407..7afffa1 100644 --- a/generic/tkImgBmap.c +++ b/generic/tkImgBmap.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: tkImgBmap.c,v 1.8 1999/04/21 21:53:26 rjohnson Exp $ + * RCS: @(#) $Id: tkImgBmap.c,v 1.8.2.1 1999/04/23 16:16:49 redman Exp $ */ #include "tkInt.h" @@ -512,6 +512,15 @@ TkGetBitmapData(interp, string, fileName, widthPtr, heightPtr, } return NULL; } + + if (Tcl_SetChannelOption(interp, pi.chan, "-translation", "binary") + != TCL_OK) { + return NULL; + } + if (Tcl_SetChannelOption(interp, pi.chan, "-encoding", "binary") + != TCL_OK) { + return NULL; + } } else { pi.chan = NULL; } diff --git a/generic/tkImgPPM.c b/generic/tkImgPPM.c index 7482692..47584c0 100644 --- a/generic/tkImgPPM.c +++ b/generic/tkImgPPM.c @@ -13,7 +13,7 @@ * Department of Computer Science, * Australian National University. * - * RCS: @(#) $Id: tkImgPPM.c,v 1.3 1999/04/16 01:51:15 stanton Exp $ + * RCS: @(#) $Id: tkImgPPM.c,v 1.3.4.1 1999/04/23 16:16:49 redman Exp $ */ #include "tkInt.h" @@ -269,6 +269,15 @@ FileWritePPM(interp, fileName, formatString, blockPtr) return TCL_ERROR; } + if (Tcl_SetChannelOption(interp, chan, "-translation", "binary") + != TCL_OK) { + return TCL_ERROR; + } + if (Tcl_SetChannelOption(interp, chan, "-encoding", "binary") + != TCL_OK) { + return TCL_ERROR; + } + sprintf(header, "P6\n%d %d\n255\n", blockPtr->width, blockPtr->height); Tcl_Write(chan, header, -1); diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 9fb74e6..6870a7c 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -15,7 +15,7 @@ * Department of Computer Science, * Australian National University. * - * RCS: @(#) $Id: tkImgPhoto.c,v 1.6 1999/04/16 01:51:15 stanton Exp $ + * RCS: @(#) $Id: tkImgPhoto.c,v 1.6.4.1 1999/04/23 16:16:50 redman Exp $ */ #include "tkInt.h" @@ -851,6 +851,11 @@ ImgPhotoCmd(clientData, interp, argc, argv) != TCL_OK) { return TCL_ERROR; } + if (Tcl_SetChannelOption(interp, chan, "-encoding", "binary") + != TCL_OK) { + return TCL_ERROR; + } + if (MatchFileFormat(interp, chan, options.name, options.format, &imageFormat, &imageWidth, &imageHeight) != TCL_OK) { Tcl_Close(NULL, chan); @@ -1364,6 +1369,10 @@ ImgPhotoConfigureMaster(interp, masterPtr, argc, argv, flags) != TCL_OK) { return TCL_ERROR; } + if (Tcl_SetChannelOption(interp, chan, "-encoding", "binary") + != TCL_OK) { + return TCL_ERROR; + } if (MatchFileFormat(interp, chan, masterPtr->fileString, masterPtr->format, &imageFormat, &imageWidth, &imageHeight) != TCL_OK) { diff --git a/generic/tkInt.decls b/generic/tkInt.decls index edb69f2..f44a46a 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.5 1999/04/16 01:51:15 stanton Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.5.4.2 1999/04/24 01:14:19 stanton Exp $ library tk @@ -525,6 +525,66 @@ declare 112 generic { void TkpMenuThreadInit (void) } +declare 113 win { + void TkClipBox (TkRegion rgn, XRectangle* rect_return) +} + +declare 113 mac { + void TkClipBox (TkRegion rgn, XRectangle* rect_return) +} + +declare 114 win { + TkRegion TkCreateRegion (void) +} + +declare 114 mac { + TkRegion TkCreateRegion (void) +} + +declare 115 win { + void TkDestroyRegion (TkRegion rgn) +} + +declare 115 mac { + void TkDestroyRegion (TkRegion rgn) +} + +declare 116 win { + void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return) +} + +declare 116 mac { + void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return) +} + +declare 117 win { + int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \ + unsigned int height) +} + +declare 117 mac { + int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \ + unsigned int height) +} + +declare 118 win { + void TkSetRegion (Display* display, GC gc, TkRegion rgn) +} + +declare 118 mac { + void TkSetRegion (Display* display, GC gc, TkRegion rgn) +} + +declare 119 win { + void TkUnionRectWithRegion (XRectangle* rect, \ + TkRegion src, TkRegion dr_return) +} + +declare 119 mac { + void TkUnionRectWithRegion (XRectangle* rect, \ + TkRegion src, TkRegion dr_return) +} + ############################################################################## # Define the platform specific internal Tcl interface. These functions are @@ -548,8 +608,8 @@ declare 2 unix { } declare 3 unix { - int TkpCmapStressed (Tk_Window tkwin, Colormap colormap)} - + int TkpCmapStressed (Tk_Window tkwin, Colormap colormap) +} declare 4 unix { void TkpSync (Display *display) @@ -576,169 +636,139 @@ declare 0 win { char * TkAlignImageData (XImage *image, int alignment, int bitOrder) } -declare 1 win { - void TkClipBox (TkRegion rgn, XRectangle* rect_return) -} - declare 2 win { - TkRegion TkCreateRegion (void) -} - -declare 3 win { - void TkDestroyRegion (TkRegion rgn) -} - -declare 4 win { void TkGenerateActivateEvents (TkWindow *winPtr, int active) } -declare 5 win { - void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return) -} - -declare 6 win { +declare 3 win { unsigned long TkpGetMS (void) } -declare 7 win { +declare 4 win { void TkPointerDeadWindow (TkWindow *winPtr) } -declare 8 win { +declare 5 win { void TkpPrintWindowId (char *buf, Window window) } -declare 9 win { +declare 6 win { int TkpScanWindowId (Tcl_Interp *interp, char *string, int *idPtr) } -declare 10 win { +declare 7 win { void TkpSetCapture (TkWindow *winPtr) } -declare 11 win { +declare 8 win { void TkpSetCursor (TkpCursor cursor) } -declare 12 win { +declare 9 win { void TkpWmSetState (TkWindow *winPtr, int state) } -declare 13 win { - int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \ - unsigned int height) -} - -declare 14 win { +declare 10 win { void TkSetPixmapColormap (Pixmap pixmap, Colormap colormap) } -declare 15 win { - void TkSetRegion (Display* display, GC gc, TkRegion rgn) -} - -declare 16 win { - void TkUnionRectWithRegion (XRectangle* rect, \ - TkRegion src, TkRegion dr_return) -} - -declare 17 win { +declare 11 win { void TkWinCancelMouseTimer (void) } -declare 18 win { +declare 12 win { void TkWinClipboardRender (TkDisplay *dispPtr, UINT format) } -declare 19 win { +declare 13 win { LRESULT TkWinEmbeddedEventProc (HWND hwnd, UINT message, \ WPARAM wParam, LPARAM lParam) } -declare 20 win { +declare 14 win { void TkWinFillRect (HDC dc, int x, int y, int width, int height, \ int pixel) } -declare 21 win { +declare 15 win { COLORREF TkWinGetBorderPixels (Tk_Window tkwin, Tk_3DBorder border, \ int which) } -declare 22 win { +declare 16 win { HDC TkWinGetDrawableDC (Display *display, Drawable d, TkWinDCState* state) } -declare 23 win { +declare 17 win { int TkWinGetModifierState (void) } -declare 24 win { +declare 18 win { HPALETTE TkWinGetSystemPalette (void) } -declare 25 win { +declare 19 win { HWND TkWinGetWrapperWindow (Tk_Window tkwin) } -declare 26 win { +declare 20 win { int TkWinHandleMenuEvent (HWND *phwnd, \ UINT *pMessage, WPARAM *pwParam, LPARAM *plParam, \ LRESULT *plResult) } -declare 27 win { +declare 21 win { int TkWinIndexOfColor (XColor *colorPtr) } -declare 28 win { +declare 22 win { void TkWinReleaseDrawableDC (Drawable d, HDC hdc, TkWinDCState* state) } -declare 29 win { +declare 23 win { LRESULT TkWinResendEvent (WNDPROC wndproc, HWND hwnd, XEvent *eventPtr) } -declare 30 win { +declare 24 win { HPALETTE TkWinSelectPalette (HDC dc, Colormap colormap) } -declare 31 win { +declare 25 win { void TkWinSetMenu (Tk_Window tkwin, HMENU hMenu) } -declare 32 win { +declare 26 win { void TkWinSetWindowPos (HWND hwnd, HWND siblingHwnd, int pos) } -declare 33 win { +declare 27 win { void TkWinWmCleanup (HINSTANCE hInstance) } -declare 34 win { +declare 28 win { void TkWinXCleanup (HINSTANCE hInstance) } -declare 35 win { +declare 29 win { void TkWinXInit (HINSTANCE hInstance) } # new for 8.1 -declare 36 win { +declare 30 win { void TkWinSetForegroundWindow (TkWindow *winPtr) } -declare 37 win { +declare 31 win { void TkWinDialogDebug (int debug) } -declare 38 win { +declare 32 win { Tcl_Obj * TkWinGetMenuSystemDefault (Tk_Window tkwin, \ char *dbName, char *className) } -declare 39 win { +declare 33 win { int TkWinGetPlatformId(void) } @@ -746,298 +776,268 @@ declare 39 win { # Mac specific functions declare 0 mac { - void TkClipBox (TkRegion rgn, XRectangle* rect_return) -} - -declare 1 mac { - TkRegion TkCreateRegion (void) -} - -declare 2 mac { - void TkDestroyRegion (TkRegion rgn) -} - -declare 3 mac { void TkGenerateActivateEvents (TkWindow *winPtr, int active) } -declare 4 mac { - void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return) -} - -declare 5 mac { +declare 1 mac { Pixmap TkpCreateNativeBitmap (Display *display, char * source) } -declare 6 mac { +declare 2 mac { void TkpDefineNativeBitmaps (void) } -declare 7 mac { +declare 3 mac { unsigned long TkpGetMS (void) } -declare 8 mac { +declare 4 mac { Pixmap TkpGetNativeAppBitmap (Display *display, \ char *name, int *width, int *height) } -declare 9 mac { +declare 5 mac { void TkPointerDeadWindow (TkWindow *winPtr) } -declare 10 mac { +declare 6 mac { void TkpSetCapture (TkWindow *winPtr) } -declare 11 mac { +declare 7 mac { void TkpSetCursor (TkpCursor cursor) } -declare 12 mac { +declare 8 mac { void TkpWmSetState (TkWindow *winPtr, int state) } -declare 13 mac { - int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \ - unsigned int height) -} - -declare 14 mac { - void TkSetRegion (Display* display, GC gc, TkRegion rgn) -} - -declare 15 mac { - void TkUnionRectWithRegion (XRectangle* rect, \ - TkRegion src, TkRegion dr_return) -} - -declare 16 mac { +declare 9 mac { int HandleWMEvent (EventRecord *theEvent) } -declare 17 mac { +declare 10 mac { void TkAboutDlg (void) } -declare 18 mac { +declare 11 mac { void TkCreateMacEventSource (void) } -declare 19 mac { +declare 12 mac { void TkFontList (Tcl_Interp *interp, Display *display) } -declare 20 mac { +declare 13 mac { Window TkGetTransientMaster (TkWindow *winPtr) } -declare 21 mac { +declare 14 mac { int TkGenerateButtonEvent (int x, int y, \ Window window, unsigned int state) } -declare 22 mac { +declare 15 mac { int TkGetCharPositions (XFontStruct *font_struct, char *string, \ int count, short *buffer) } -declare 23 mac { +declare 16 mac { void TkGenWMDestroyEvent (Tk_Window tkwin) } -declare 24 mac { +declare 17 mac { void TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \ int width, int height, int flags) } -declare 25 mac { +declare 18 mac { unsigned int TkMacButtonKeyState (void) } -declare 26 mac { +declare 19 mac { void TkMacClearMenubarActive (void) } -declare 27 mac { +declare 20 mac { int TkMacConvertEvent (EventRecord *eventPtr) } -declare 28 mac { +declare 21 mac { int TkMacDispatchMenuEvent (int menuID, int index) } -declare 29 mac { +declare 22 mac { void TkMacInstallCursor (int resizeOverride) } -declare 30 mac { +declare 23 mac { int TkMacConvertTkEvent (EventRecord *eventPtr, Window window) } -declare 31 mac { +declare 24 mac { void TkMacHandleTearoffMenu (void) } -declare 32 mac { +declare 25 mac { void tkMacInstallMWConsole (Tcl_Interp *interp) } -declare 33 mac { +declare 26 mac { void TkMacInvalClipRgns (TkWindow *winPtr) } -declare 34 mac { +declare 27 mac { void TkMacDoHLEvent (EventRecord *theEvent) } -declare 35 mac { +declare 28 mac { void TkMacFontInfo (Font fontId, short *family, \ short *style, short *size) } -declare 36 mac { +declare 29 mac { Time TkMacGenerateTime (void) } -declare 37 mac { +declare 30 mac { GWorldPtr TkMacGetDrawablePort (Drawable drawable) } -declare 38 mac { +declare 31 mac { TkWindow * TkMacGetScrollbarGrowWindow (TkWindow *winPtr) } -declare 39 mac { +declare 32 mac { Window TkMacGetXWindow (WindowRef macWinPtr) } -declare 40 mac { +declare 33 mac { int TkMacGrowToplevel (WindowRef whichWindow, Point start) } -declare 41 mac { +declare 34 mac { void TkMacHandleMenuSelect (long mResult, int optionKeyPressed) } -declare 42 mac { +declare 35 mac { int TkMacHaveAppearance (void) } -declare 43 mac { +declare 36 mac { void TkMacInitAppleEvents (Tcl_Interp *interp) } -declare 44 mac { +declare 37 mac { void TkMacInitMenus (Tcl_Interp *interp) } -declare 45 mac { +declare 38 mac { void TkMacInvalidateWindow (MacDrawable *macWin, int flag) } -declare 46 mac { +declare 39 mac { int TkMacIsCharacterMissing (Tk_Font tkfont, unsigned int searchChar) } -declare 47 mac { +declare 40 mac { void TkMacMakeRealWindowExist (TkWindow *winPtr) } -declare 48 mac { +declare 41 mac { BitMapPtr TkMacMakeStippleMap(Drawable d1, Drawable d2) } -declare 49 mac { +declare 42 mac { void TkMacMenuClick (void) } -declare 50 mac { +declare 43 mac { void TkMacRegisterOffScreenWindow (Window window, GWorldPtr portPtr) } -declare 51 mac { +declare 44 mac { int TkMacResizable (TkWindow *winPtr) } -declare 52 mac { +declare 45 mac { void TkMacSetEmbedRgn (TkWindow *winPtr, RgnHandle rgn) } -declare 53 mac { +declare 46 mac { void TkMacSetHelpMenuItemCount (void) } -declare 54 mac { +declare 47 mac { void TkMacSetScrollbarGrow (TkWindow *winPtr, int flag) } -declare 55 mac { +declare 48 mac { void TkMacSetUpClippingRgn (Drawable drawable) } -declare 56 mac { +declare 49 mac { void TkMacSetUpGraphicsPort (GC gc) } -declare 57 mac { +declare 50 mac { void TkMacUpdateClipRgn (TkWindow *winPtr) } -declare 58 mac { +declare 51 mac { void TkMacUnregisterMacWindow (GWorldPtr portPtr) } -declare 59 mac { +declare 52 mac { int TkMacUseMenuID (short macID) } -declare 60 mac { +declare 53 mac { RgnHandle TkMacVisableClipRgn (TkWindow *winPtr) } -declare 61 mac { +declare 54 mac { void TkMacWinBounds (TkWindow *winPtr, Rect *geometry) } -declare 62 mac { +declare 55 mac { void TkMacWindowOffset (WindowRef wRef, int *xOffset, int *yOffset) } -declare 63 mac { +declare 56 mac { void TkResumeClipboard (void) } -declare 64 mac { +declare 57 mac { int TkSetMacColor (unsigned long pixel, RGBColor *macColor) } -declare 65 mac { +declare 58 mac { void TkSetWMName (TkWindow *winPtr, Tk_Uid titleUid) } -declare 66 mac { +declare 59 mac { void TkSuspendClipboard (void) } -declare 67 mac { +declare 60 mac { int TkWMGrowToplevel (WindowRef whichWindow, Point start) } -declare 68 mac { +declare 61 mac { int TkMacZoomToplevel (WindowPtr whichWindow, Point where, short zoomPart) } -declare 69 mac { +declare 62 mac { Tk_Window Tk_TopCoordsToWindow (Tk_Window tkwin, \ int rootX, int rootY, int *newX, int *newY) } -declare 70 mac { +declare 63 mac { MacDrawable * TkMacContainerId (TkWindow *winPtr) } -declare 71 mac { +declare 64 mac { MacDrawable * TkMacGetHostToplevel (TkWindow *winPtr) } @@ -1881,3 +1881,10 @@ declare 79 mac { Status XStringListToTextProperty(char** list, int count, \ XTextProperty* text_prop_return) } +declare 80 mac { + void XDrawSegments(Display *display, Drawable d, GC gc, \ + XSegment *segments, int nsegments) +} +declare 81 mac { + void XForceScreenSaver(Display* display, int mode) +} diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index 2ca0147..4225487 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.3 1999/04/16 01:51:16 stanton Exp $ + * RCS: @(#) $Id: tkIntDecls.h,v 1.3.4.3 1999/04/27 21:09:41 stanton Exp $ */ #ifndef _TKINTDECLS @@ -370,6 +370,74 @@ EXTERN Tcl_Obj * TkpGetSystemDefault _ANSI_ARGS_((Tk_Window tkwin, char * dbName, char * className)); /* 112 */ EXTERN void TkpMenuThreadInit _ANSI_ARGS_((void)); +#ifdef __WIN32__ +/* 113 */ +EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, + XRectangle* rect_return)); +#endif /* __WIN32__ */ +#ifdef MAC_TCL +/* 113 */ +EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, + XRectangle* rect_return)); +#endif /* MAC_TCL */ +#ifdef __WIN32__ +/* 114 */ +EXTERN TkRegion TkCreateRegion _ANSI_ARGS_((void)); +#endif /* __WIN32__ */ +#ifdef MAC_TCL +/* 114 */ +EXTERN TkRegion TkCreateRegion _ANSI_ARGS_((void)); +#endif /* MAC_TCL */ +#ifdef __WIN32__ +/* 115 */ +EXTERN void TkDestroyRegion _ANSI_ARGS_((TkRegion rgn)); +#endif /* __WIN32__ */ +#ifdef MAC_TCL +/* 115 */ +EXTERN void TkDestroyRegion _ANSI_ARGS_((TkRegion rgn)); +#endif /* MAC_TCL */ +#ifdef __WIN32__ +/* 116 */ +EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, + TkRegion srcb, TkRegion dr_return)); +#endif /* __WIN32__ */ +#ifdef MAC_TCL +/* 116 */ +EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, + TkRegion srcb, TkRegion dr_return)); +#endif /* MAC_TCL */ +#ifdef __WIN32__ +/* 117 */ +EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, + int y, unsigned int width, + unsigned int height)); +#endif /* __WIN32__ */ +#ifdef MAC_TCL +/* 117 */ +EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, + int y, unsigned int width, + unsigned int height)); +#endif /* MAC_TCL */ +#ifdef __WIN32__ +/* 118 */ +EXTERN void TkSetRegion _ANSI_ARGS_((Display* display, GC gc, + TkRegion rgn)); +#endif /* __WIN32__ */ +#ifdef MAC_TCL +/* 118 */ +EXTERN void TkSetRegion _ANSI_ARGS_((Display* display, GC gc, + TkRegion rgn)); +#endif /* MAC_TCL */ +#ifdef __WIN32__ +/* 119 */ +EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, + TkRegion src, TkRegion dr_return)); +#endif /* __WIN32__ */ +#ifdef MAC_TCL +/* 119 */ +EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, + TkRegion src, TkRegion dr_return)); +#endif /* MAC_TCL */ typedef struct TkIntStubs { int magic; @@ -488,9 +556,78 @@ typedef struct TkIntStubs { void (*tkpGetSubFonts) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Font tkfont)); /* 110 */ Tcl_Obj * (*tkpGetSystemDefault) _ANSI_ARGS_((Tk_Window tkwin, char * dbName, char * className)); /* 111 */ void (*tkpMenuThreadInit) _ANSI_ARGS_((void)); /* 112 */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved113; +#endif /* UNIX */ +#ifdef __WIN32__ + void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved114; +#endif /* UNIX */ +#ifdef __WIN32__ + TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved115; +#endif /* UNIX */ +#ifdef __WIN32__ + void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved116; +#endif /* UNIX */ +#ifdef __WIN32__ + void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 116 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 116 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved117; +#endif /* UNIX */ +#ifdef __WIN32__ + int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 117 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 117 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved118; +#endif /* UNIX */ +#ifdef __WIN32__ + void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + void *reserved119; +#endif /* UNIX */ +#ifdef __WIN32__ + void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */ +#endif /* MAC_TCL */ } TkIntStubs; +#ifdef __cplusplus +extern "C" { +#endif extern TkIntStubs *tkIntStubsPtr; +#ifdef __cplusplus +} +#endif #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) @@ -950,6 +1087,90 @@ extern TkIntStubs *tkIntStubsPtr; #define TkpMenuThreadInit \ (tkIntStubsPtr->tkpMenuThreadInit) /* 112 */ #endif +#ifdef __WIN32__ +#ifndef TkClipBox +#define TkClipBox \ + (tkIntStubsPtr->tkClipBox) /* 113 */ +#endif +#endif /* __WIN32__ */ +#ifdef MAC_TCL +#ifndef TkClipBox +#define TkClipBox \ + (tkIntStubsPtr->tkClipBox) /* 113 */ +#endif +#endif /* MAC_TCL */ +#ifdef __WIN32__ +#ifndef TkCreateRegion +#define TkCreateRegion \ + (tkIntStubsPtr->tkCreateRegion) /* 114 */ +#endif +#endif /* __WIN32__ */ +#ifdef MAC_TCL +#ifndef TkCreateRegion +#define TkCreateRegion \ + (tkIntStubsPtr->tkCreateRegion) /* 114 */ +#endif +#endif /* MAC_TCL */ +#ifdef __WIN32__ +#ifndef TkDestroyRegion +#define TkDestroyRegion \ + (tkIntStubsPtr->tkDestroyRegion) /* 115 */ +#endif +#endif /* __WIN32__ */ +#ifdef MAC_TCL +#ifndef TkDestroyRegion +#define TkDestroyRegion \ + (tkIntStubsPtr->tkDestroyRegion) /* 115 */ +#endif +#endif /* MAC_TCL */ +#ifdef __WIN32__ +#ifndef TkIntersectRegion +#define TkIntersectRegion \ + (tkIntStubsPtr->tkIntersectRegion) /* 116 */ +#endif +#endif /* __WIN32__ */ +#ifdef MAC_TCL +#ifndef TkIntersectRegion +#define TkIntersectRegion \ + (tkIntStubsPtr->tkIntersectRegion) /* 116 */ +#endif +#endif /* MAC_TCL */ +#ifdef __WIN32__ +#ifndef TkRectInRegion +#define TkRectInRegion \ + (tkIntStubsPtr->tkRectInRegion) /* 117 */ +#endif +#endif /* __WIN32__ */ +#ifdef MAC_TCL +#ifndef TkRectInRegion +#define TkRectInRegion \ + (tkIntStubsPtr->tkRectInRegion) /* 117 */ +#endif +#endif /* MAC_TCL */ +#ifdef __WIN32__ +#ifndef TkSetRegion +#define TkSetRegion \ + (tkIntStubsPtr->tkSetRegion) /* 118 */ +#endif +#endif /* __WIN32__ */ +#ifdef MAC_TCL +#ifndef TkSetRegion +#define TkSetRegion \ + (tkIntStubsPtr->tkSetRegion) /* 118 */ +#endif +#endif /* MAC_TCL */ +#ifdef __WIN32__ +#ifndef TkUnionRectWithRegion +#define TkUnionRectWithRegion \ + (tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */ +#endif +#endif /* __WIN32__ */ +#ifdef MAC_TCL +#ifndef TkUnionRectWithRegion +#define TkUnionRectWithRegion \ + (tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */ +#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 a767f68..e20f963 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.3 1999/04/16 01:51:16 stanton Exp $ + * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.3.4.3 1999/04/27 21:09:42 stanton Exp $ */ #ifndef _TKINTPLATDECLS @@ -57,295 +57,256 @@ EXTERN void TkUnixSetMenubar _ANSI_ARGS_((Tk_Window tkwin, /* 0 */ EXTERN char * TkAlignImageData _ANSI_ARGS_((XImage * image, int alignment, int bitOrder)); -/* 1 */ -EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, - XRectangle* rect_return)); +/* Slot 1 is reserved */ /* 2 */ -EXTERN TkRegion TkCreateRegion _ANSI_ARGS_((void)); -/* 3 */ -EXTERN void TkDestroyRegion _ANSI_ARGS_((TkRegion rgn)); -/* 4 */ EXTERN void TkGenerateActivateEvents _ANSI_ARGS_(( TkWindow * winPtr, int active)); -/* 5 */ -EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, - TkRegion srcb, TkRegion dr_return)); -/* 6 */ +/* 3 */ EXTERN unsigned long TkpGetMS _ANSI_ARGS_((void)); -/* 7 */ +/* 4 */ EXTERN void TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); -/* 8 */ +/* 5 */ EXTERN void TkpPrintWindowId _ANSI_ARGS_((char * buf, Window window)); -/* 9 */ +/* 6 */ EXTERN int TkpScanWindowId _ANSI_ARGS_((Tcl_Interp * interp, char * string, int * idPtr)); -/* 10 */ +/* 7 */ EXTERN void TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr)); -/* 11 */ +/* 8 */ EXTERN void TkpSetCursor _ANSI_ARGS_((TkpCursor cursor)); -/* 12 */ +/* 9 */ EXTERN void TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, int state)); -/* 13 */ -EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, - int y, unsigned int width, - unsigned int height)); -/* 14 */ +/* 10 */ EXTERN void TkSetPixmapColormap _ANSI_ARGS_((Pixmap pixmap, Colormap colormap)); -/* 15 */ -EXTERN void TkSetRegion _ANSI_ARGS_((Display* display, GC gc, - TkRegion rgn)); -/* 16 */ -EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, - TkRegion src, TkRegion dr_return)); -/* 17 */ +/* 11 */ EXTERN void TkWinCancelMouseTimer _ANSI_ARGS_((void)); -/* 18 */ +/* 12 */ EXTERN void TkWinClipboardRender _ANSI_ARGS_(( TkDisplay * dispPtr, UINT format)); -/* 19 */ +/* 13 */ EXTERN LRESULT TkWinEmbeddedEventProc _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); -/* 20 */ +/* 14 */ EXTERN void TkWinFillRect _ANSI_ARGS_((HDC dc, int x, int y, int width, int height, int pixel)); -/* 21 */ +/* 15 */ EXTERN COLORREF TkWinGetBorderPixels _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); -/* 22 */ +/* 16 */ EXTERN HDC TkWinGetDrawableDC _ANSI_ARGS_((Display * display, Drawable d, TkWinDCState* state)); -/* 23 */ +/* 17 */ EXTERN int TkWinGetModifierState _ANSI_ARGS_((void)); -/* 24 */ +/* 18 */ EXTERN HPALETTE TkWinGetSystemPalette _ANSI_ARGS_((void)); -/* 25 */ +/* 19 */ EXTERN HWND TkWinGetWrapperWindow _ANSI_ARGS_((Tk_Window tkwin)); -/* 26 */ +/* 20 */ EXTERN int TkWinHandleMenuEvent _ANSI_ARGS_((HWND * phwnd, UINT * pMessage, WPARAM * pwParam, LPARAM * plParam, LRESULT * plResult)); -/* 27 */ +/* 21 */ EXTERN int TkWinIndexOfColor _ANSI_ARGS_((XColor * colorPtr)); -/* 28 */ +/* 22 */ EXTERN void TkWinReleaseDrawableDC _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState* state)); -/* 29 */ +/* 23 */ EXTERN LRESULT TkWinResendEvent _ANSI_ARGS_((WNDPROC wndproc, HWND hwnd, XEvent * eventPtr)); -/* 30 */ +/* 24 */ EXTERN HPALETTE TkWinSelectPalette _ANSI_ARGS_((HDC dc, Colormap colormap)); -/* 31 */ +/* 25 */ EXTERN void TkWinSetMenu _ANSI_ARGS_((Tk_Window tkwin, HMENU hMenu)); -/* 32 */ +/* 26 */ EXTERN void TkWinSetWindowPos _ANSI_ARGS_((HWND hwnd, HWND siblingHwnd, int pos)); -/* 33 */ +/* 27 */ EXTERN void TkWinWmCleanup _ANSI_ARGS_((HINSTANCE hInstance)); -/* 34 */ +/* 28 */ EXTERN void TkWinXCleanup _ANSI_ARGS_((HINSTANCE hInstance)); -/* 35 */ +/* 29 */ EXTERN void TkWinXInit _ANSI_ARGS_((HINSTANCE hInstance)); -/* 36 */ +/* 30 */ EXTERN void TkWinSetForegroundWindow _ANSI_ARGS_(( TkWindow * winPtr)); -/* 37 */ +/* 31 */ EXTERN void TkWinDialogDebug _ANSI_ARGS_((int debug)); -/* 38 */ +/* 32 */ EXTERN Tcl_Obj * TkWinGetMenuSystemDefault _ANSI_ARGS_(( Tk_Window tkwin, char * dbName, char * className)); -/* 39 */ +/* 33 */ EXTERN int TkWinGetPlatformId _ANSI_ARGS_((void)); #endif /* __WIN32__ */ #ifdef MAC_TCL /* 0 */ -EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, - XRectangle* rect_return)); -/* 1 */ -EXTERN TkRegion TkCreateRegion _ANSI_ARGS_((void)); -/* 2 */ -EXTERN void TkDestroyRegion _ANSI_ARGS_((TkRegion rgn)); -/* 3 */ EXTERN void TkGenerateActivateEvents _ANSI_ARGS_(( TkWindow * winPtr, int active)); -/* 4 */ -EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, - TkRegion srcb, TkRegion dr_return)); -/* 5 */ +/* 1 */ EXTERN Pixmap TkpCreateNativeBitmap _ANSI_ARGS_((Display * display, char * source)); -/* 6 */ +/* 2 */ EXTERN void TkpDefineNativeBitmaps _ANSI_ARGS_((void)); -/* 7 */ +/* 3 */ EXTERN unsigned long TkpGetMS _ANSI_ARGS_((void)); -/* 8 */ +/* 4 */ EXTERN Pixmap TkpGetNativeAppBitmap _ANSI_ARGS_((Display * display, char * name, int * width, int * height)); -/* 9 */ +/* 5 */ EXTERN void TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); -/* 10 */ +/* 6 */ EXTERN void TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr)); -/* 11 */ +/* 7 */ EXTERN void TkpSetCursor _ANSI_ARGS_((TkpCursor cursor)); -/* 12 */ +/* 8 */ EXTERN void TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, int state)); -/* 13 */ -EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, - int y, unsigned int width, - unsigned int height)); -/* 14 */ -EXTERN void TkSetRegion _ANSI_ARGS_((Display* display, GC gc, - TkRegion rgn)); -/* 15 */ -EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, - TkRegion src, TkRegion dr_return)); -/* 16 */ +/* 9 */ EXTERN int HandleWMEvent _ANSI_ARGS_((EventRecord * theEvent)); -/* 17 */ +/* 10 */ EXTERN void TkAboutDlg _ANSI_ARGS_((void)); -/* 18 */ +/* 11 */ EXTERN void TkCreateMacEventSource _ANSI_ARGS_((void)); -/* 19 */ +/* 12 */ EXTERN void TkFontList _ANSI_ARGS_((Tcl_Interp * interp, Display * display)); -/* 20 */ +/* 13 */ EXTERN Window TkGetTransientMaster _ANSI_ARGS_((TkWindow * winPtr)); -/* 21 */ +/* 14 */ EXTERN int TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); -/* 22 */ +/* 15 */ EXTERN int TkGetCharPositions _ANSI_ARGS_(( XFontStruct * font_struct, char * string, int count, short * buffer)); -/* 23 */ +/* 16 */ EXTERN void TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin)); -/* 24 */ +/* 17 */ EXTERN void TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); -/* 25 */ +/* 18 */ EXTERN unsigned int TkMacButtonKeyState _ANSI_ARGS_((void)); -/* 26 */ +/* 19 */ EXTERN void TkMacClearMenubarActive _ANSI_ARGS_((void)); -/* 27 */ +/* 20 */ EXTERN int TkMacConvertEvent _ANSI_ARGS_(( EventRecord * eventPtr)); -/* 28 */ +/* 21 */ EXTERN int TkMacDispatchMenuEvent _ANSI_ARGS_((int menuID, int index)); -/* 29 */ +/* 22 */ EXTERN void TkMacInstallCursor _ANSI_ARGS_((int resizeOverride)); -/* 30 */ +/* 23 */ EXTERN int TkMacConvertTkEvent _ANSI_ARGS_(( EventRecord * eventPtr, Window window)); -/* 31 */ +/* 24 */ EXTERN void TkMacHandleTearoffMenu _ANSI_ARGS_((void)); -/* 32 */ +/* 25 */ EXTERN void tkMacInstallMWConsole _ANSI_ARGS_(( Tcl_Interp * interp)); -/* 33 */ +/* 26 */ EXTERN void TkMacInvalClipRgns _ANSI_ARGS_((TkWindow * winPtr)); -/* 34 */ +/* 27 */ EXTERN void TkMacDoHLEvent _ANSI_ARGS_((EventRecord * theEvent)); -/* 35 */ +/* 28 */ EXTERN void TkMacFontInfo _ANSI_ARGS_((Font fontId, short * family, short * style, short * size)); -/* 36 */ +/* 29 */ EXTERN Time TkMacGenerateTime _ANSI_ARGS_((void)); -/* 37 */ +/* 30 */ EXTERN GWorldPtr TkMacGetDrawablePort _ANSI_ARGS_((Drawable drawable)); -/* 38 */ +/* 31 */ EXTERN TkWindow * TkMacGetScrollbarGrowWindow _ANSI_ARGS_(( TkWindow * winPtr)); -/* 39 */ +/* 32 */ EXTERN Window TkMacGetXWindow _ANSI_ARGS_((WindowRef macWinPtr)); -/* 40 */ +/* 33 */ EXTERN int TkMacGrowToplevel _ANSI_ARGS_((WindowRef whichWindow, Point start)); -/* 41 */ +/* 34 */ EXTERN void TkMacHandleMenuSelect _ANSI_ARGS_((long mResult, int optionKeyPressed)); -/* 42 */ +/* 35 */ EXTERN int TkMacHaveAppearance _ANSI_ARGS_((void)); -/* 43 */ +/* 36 */ EXTERN void TkMacInitAppleEvents _ANSI_ARGS_(( Tcl_Interp * interp)); -/* 44 */ +/* 37 */ EXTERN void TkMacInitMenus _ANSI_ARGS_((Tcl_Interp * interp)); -/* 45 */ +/* 38 */ EXTERN void TkMacInvalidateWindow _ANSI_ARGS_(( MacDrawable * macWin, int flag)); -/* 46 */ +/* 39 */ EXTERN int TkMacIsCharacterMissing _ANSI_ARGS_((Tk_Font tkfont, unsigned int searchChar)); -/* 47 */ +/* 40 */ EXTERN void TkMacMakeRealWindowExist _ANSI_ARGS_(( TkWindow * winPtr)); -/* 48 */ +/* 41 */ EXTERN BitMapPtr TkMacMakeStippleMap _ANSI_ARGS_((Drawable d1, Drawable d2)); -/* 49 */ +/* 42 */ EXTERN void TkMacMenuClick _ANSI_ARGS_((void)); -/* 50 */ +/* 43 */ EXTERN void TkMacRegisterOffScreenWindow _ANSI_ARGS_(( Window window, GWorldPtr portPtr)); -/* 51 */ +/* 44 */ EXTERN int TkMacResizable _ANSI_ARGS_((TkWindow * winPtr)); -/* 52 */ +/* 45 */ EXTERN void TkMacSetEmbedRgn _ANSI_ARGS_((TkWindow * winPtr, RgnHandle rgn)); -/* 53 */ +/* 46 */ EXTERN void TkMacSetHelpMenuItemCount _ANSI_ARGS_((void)); -/* 54 */ +/* 47 */ EXTERN void TkMacSetScrollbarGrow _ANSI_ARGS_((TkWindow * winPtr, int flag)); -/* 55 */ +/* 48 */ EXTERN void TkMacSetUpClippingRgn _ANSI_ARGS_((Drawable drawable)); -/* 56 */ +/* 49 */ EXTERN void TkMacSetUpGraphicsPort _ANSI_ARGS_((GC gc)); -/* 57 */ +/* 50 */ EXTERN void TkMacUpdateClipRgn _ANSI_ARGS_((TkWindow * winPtr)); -/* 58 */ +/* 51 */ EXTERN void TkMacUnregisterMacWindow _ANSI_ARGS_(( GWorldPtr portPtr)); -/* 59 */ +/* 52 */ EXTERN int TkMacUseMenuID _ANSI_ARGS_((short macID)); -/* 60 */ +/* 53 */ EXTERN RgnHandle TkMacVisableClipRgn _ANSI_ARGS_((TkWindow * winPtr)); -/* 61 */ +/* 54 */ EXTERN void TkMacWinBounds _ANSI_ARGS_((TkWindow * winPtr, Rect * geometry)); -/* 62 */ +/* 55 */ EXTERN void TkMacWindowOffset _ANSI_ARGS_((WindowRef wRef, int * xOffset, int * yOffset)); -/* 63 */ +/* 56 */ EXTERN void TkResumeClipboard _ANSI_ARGS_((void)); -/* 64 */ +/* 57 */ EXTERN int TkSetMacColor _ANSI_ARGS_((unsigned long pixel, RGBColor * macColor)); -/* 65 */ +/* 58 */ EXTERN void TkSetWMName _ANSI_ARGS_((TkWindow * winPtr, Tk_Uid titleUid)); -/* 66 */ +/* 59 */ EXTERN void TkSuspendClipboard _ANSI_ARGS_((void)); -/* 67 */ +/* 60 */ EXTERN int TkWMGrowToplevel _ANSI_ARGS_((WindowRef whichWindow, Point start)); -/* 68 */ +/* 61 */ EXTERN int TkMacZoomToplevel _ANSI_ARGS_((WindowPtr whichWindow, Point where, short zoomPart)); -/* 69 */ +/* 62 */ EXTERN Tk_Window Tk_TopCoordsToWindow _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int * newX, int * newY)); -/* 70 */ +/* 63 */ EXTERN MacDrawable * TkMacContainerId _ANSI_ARGS_((TkWindow * winPtr)); -/* 71 */ +/* 64 */ EXTERN MacDrawable * TkMacGetHostToplevel _ANSI_ARGS_((TkWindow * winPtr)); #endif /* MAC_TCL */ @@ -365,123 +326,116 @@ typedef struct TkIntPlatStubs { #endif /* UNIX */ #ifdef __WIN32__ char * (*tkAlignImageData) _ANSI_ARGS_((XImage * image, int alignment, int bitOrder)); /* 0 */ - void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 1 */ - TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 2 */ - void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 3 */ - void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 4 */ - void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 5 */ - unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 6 */ - void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 7 */ - void (*tkpPrintWindowId) _ANSI_ARGS_((char * buf, Window window)); /* 8 */ - int (*tkpScanWindowId) _ANSI_ARGS_((Tcl_Interp * interp, char * string, int * idPtr)); /* 9 */ - void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 10 */ - void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 11 */ - void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 12 */ - int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 13 */ - void (*tkSetPixmapColormap) _ANSI_ARGS_((Pixmap pixmap, Colormap colormap)); /* 14 */ - void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 15 */ - void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 16 */ - void (*tkWinCancelMouseTimer) _ANSI_ARGS_((void)); /* 17 */ - void (*tkWinClipboardRender) _ANSI_ARGS_((TkDisplay * dispPtr, UINT format)); /* 18 */ - LRESULT (*tkWinEmbeddedEventProc) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); /* 19 */ - void (*tkWinFillRect) _ANSI_ARGS_((HDC dc, int x, int y, int width, int height, int pixel)); /* 20 */ - COLORREF (*tkWinGetBorderPixels) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 21 */ - HDC (*tkWinGetDrawableDC) _ANSI_ARGS_((Display * display, Drawable d, TkWinDCState* state)); /* 22 */ - int (*tkWinGetModifierState) _ANSI_ARGS_((void)); /* 23 */ - HPALETTE (*tkWinGetSystemPalette) _ANSI_ARGS_((void)); /* 24 */ - HWND (*tkWinGetWrapperWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 25 */ - int (*tkWinHandleMenuEvent) _ANSI_ARGS_((HWND * phwnd, UINT * pMessage, WPARAM * pwParam, LPARAM * plParam, LRESULT * plResult)); /* 26 */ - int (*tkWinIndexOfColor) _ANSI_ARGS_((XColor * colorPtr)); /* 27 */ - void (*tkWinReleaseDrawableDC) _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState* state)); /* 28 */ - LRESULT (*tkWinResendEvent) _ANSI_ARGS_((WNDPROC wndproc, HWND hwnd, XEvent * eventPtr)); /* 29 */ - HPALETTE (*tkWinSelectPalette) _ANSI_ARGS_((HDC dc, Colormap colormap)); /* 30 */ - void (*tkWinSetMenu) _ANSI_ARGS_((Tk_Window tkwin, HMENU hMenu)); /* 31 */ - void (*tkWinSetWindowPos) _ANSI_ARGS_((HWND hwnd, HWND siblingHwnd, int pos)); /* 32 */ - void (*tkWinWmCleanup) _ANSI_ARGS_((HINSTANCE hInstance)); /* 33 */ - void (*tkWinXCleanup) _ANSI_ARGS_((HINSTANCE hInstance)); /* 34 */ - void (*tkWinXInit) _ANSI_ARGS_((HINSTANCE hInstance)); /* 35 */ - void (*tkWinSetForegroundWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 36 */ - void (*tkWinDialogDebug) _ANSI_ARGS_((int debug)); /* 37 */ - Tcl_Obj * (*tkWinGetMenuSystemDefault) _ANSI_ARGS_((Tk_Window tkwin, char * dbName, char * className)); /* 38 */ - int (*tkWinGetPlatformId) _ANSI_ARGS_((void)); /* 39 */ + void *reserved1; + void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 2 */ + 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, int * 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 */ + void (*tkSetPixmapColormap) _ANSI_ARGS_((Pixmap pixmap, Colormap colormap)); /* 10 */ + void (*tkWinCancelMouseTimer) _ANSI_ARGS_((void)); /* 11 */ + void (*tkWinClipboardRender) _ANSI_ARGS_((TkDisplay * dispPtr, UINT format)); /* 12 */ + LRESULT (*tkWinEmbeddedEventProc) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); /* 13 */ + void (*tkWinFillRect) _ANSI_ARGS_((HDC dc, int x, int y, int width, int height, int pixel)); /* 14 */ + COLORREF (*tkWinGetBorderPixels) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 15 */ + HDC (*tkWinGetDrawableDC) _ANSI_ARGS_((Display * display, Drawable d, TkWinDCState* state)); /* 16 */ + int (*tkWinGetModifierState) _ANSI_ARGS_((void)); /* 17 */ + HPALETTE (*tkWinGetSystemPalette) _ANSI_ARGS_((void)); /* 18 */ + HWND (*tkWinGetWrapperWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 19 */ + int (*tkWinHandleMenuEvent) _ANSI_ARGS_((HWND * phwnd, UINT * pMessage, WPARAM * pwParam, LPARAM * plParam, LRESULT * plResult)); /* 20 */ + int (*tkWinIndexOfColor) _ANSI_ARGS_((XColor * colorPtr)); /* 21 */ + void (*tkWinReleaseDrawableDC) _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState* state)); /* 22 */ + LRESULT (*tkWinResendEvent) _ANSI_ARGS_((WNDPROC wndproc, HWND hwnd, XEvent * eventPtr)); /* 23 */ + HPALETTE (*tkWinSelectPalette) _ANSI_ARGS_((HDC dc, Colormap colormap)); /* 24 */ + void (*tkWinSetMenu) _ANSI_ARGS_((Tk_Window tkwin, HMENU hMenu)); /* 25 */ + void (*tkWinSetWindowPos) _ANSI_ARGS_((HWND hwnd, HWND siblingHwnd, int pos)); /* 26 */ + void (*tkWinWmCleanup) _ANSI_ARGS_((HINSTANCE hInstance)); /* 27 */ + void (*tkWinXCleanup) _ANSI_ARGS_((HINSTANCE hInstance)); /* 28 */ + void (*tkWinXInit) _ANSI_ARGS_((HINSTANCE hInstance)); /* 29 */ + void (*tkWinSetForegroundWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 30 */ + void (*tkWinDialogDebug) _ANSI_ARGS_((int debug)); /* 31 */ + Tcl_Obj * (*tkWinGetMenuSystemDefault) _ANSI_ARGS_((Tk_Window tkwin, char * dbName, char * className)); /* 32 */ + int (*tkWinGetPlatformId) _ANSI_ARGS_((void)); /* 33 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 0 */ - TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 1 */ - void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 2 */ - void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 3 */ - void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 4 */ - Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, char * source)); /* 5 */ - void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 6 */ - unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 7 */ - Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display * display, char * name, int * width, int * height)); /* 8 */ - void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 9 */ - void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 10 */ - void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 11 */ - void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 12 */ - int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 13 */ - void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 14 */ - void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 15 */ - int (*handleWMEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 16 */ - void (*tkAboutDlg) _ANSI_ARGS_((void)); /* 17 */ - void (*tkCreateMacEventSource) _ANSI_ARGS_((void)); /* 18 */ - void (*tkFontList) _ANSI_ARGS_((Tcl_Interp * interp, Display * display)); /* 19 */ - Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow * winPtr)); /* 20 */ - int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 21 */ - int (*tkGetCharPositions) _ANSI_ARGS_((XFontStruct * font_struct, char * string, int count, short * buffer)); /* 22 */ - void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 23 */ - void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 24 */ - unsigned int (*tkMacButtonKeyState) _ANSI_ARGS_((void)); /* 25 */ - void (*tkMacClearMenubarActive) _ANSI_ARGS_((void)); /* 26 */ - int (*tkMacConvertEvent) _ANSI_ARGS_((EventRecord * eventPtr)); /* 27 */ - int (*tkMacDispatchMenuEvent) _ANSI_ARGS_((int menuID, int index)); /* 28 */ - void (*tkMacInstallCursor) _ANSI_ARGS_((int resizeOverride)); /* 29 */ - int (*tkMacConvertTkEvent) _ANSI_ARGS_((EventRecord * eventPtr, Window window)); /* 30 */ - void (*tkMacHandleTearoffMenu) _ANSI_ARGS_((void)); /* 31 */ - void (*tkMacInstallMWConsole) _ANSI_ARGS_((Tcl_Interp * interp)); /* 32 */ - void (*tkMacInvalClipRgns) _ANSI_ARGS_((TkWindow * winPtr)); /* 33 */ - void (*tkMacDoHLEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 34 */ - void (*tkMacFontInfo) _ANSI_ARGS_((Font fontId, short * family, short * style, short * size)); /* 35 */ - Time (*tkMacGenerateTime) _ANSI_ARGS_((void)); /* 36 */ - GWorldPtr (*tkMacGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 37 */ - TkWindow * (*tkMacGetScrollbarGrowWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 38 */ - Window (*tkMacGetXWindow) _ANSI_ARGS_((WindowRef macWinPtr)); /* 39 */ - int (*tkMacGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 40 */ - void (*tkMacHandleMenuSelect) _ANSI_ARGS_((long mResult, int optionKeyPressed)); /* 41 */ - int (*tkMacHaveAppearance) _ANSI_ARGS_((void)); /* 42 */ - void (*tkMacInitAppleEvents) _ANSI_ARGS_((Tcl_Interp * interp)); /* 43 */ - void (*tkMacInitMenus) _ANSI_ARGS_((Tcl_Interp * interp)); /* 44 */ - void (*tkMacInvalidateWindow) _ANSI_ARGS_((MacDrawable * macWin, int flag)); /* 45 */ - int (*tkMacIsCharacterMissing) _ANSI_ARGS_((Tk_Font tkfont, unsigned int searchChar)); /* 46 */ - void (*tkMacMakeRealWindowExist) _ANSI_ARGS_((TkWindow * winPtr)); /* 47 */ - BitMapPtr (*tkMacMakeStippleMap) _ANSI_ARGS_((Drawable d1, Drawable d2)); /* 48 */ - void (*tkMacMenuClick) _ANSI_ARGS_((void)); /* 49 */ - void (*tkMacRegisterOffScreenWindow) _ANSI_ARGS_((Window window, GWorldPtr portPtr)); /* 50 */ - int (*tkMacResizable) _ANSI_ARGS_((TkWindow * winPtr)); /* 51 */ - void (*tkMacSetEmbedRgn) _ANSI_ARGS_((TkWindow * winPtr, RgnHandle rgn)); /* 52 */ - void (*tkMacSetHelpMenuItemCount) _ANSI_ARGS_((void)); /* 53 */ - void (*tkMacSetScrollbarGrow) _ANSI_ARGS_((TkWindow * winPtr, int flag)); /* 54 */ - void (*tkMacSetUpClippingRgn) _ANSI_ARGS_((Drawable drawable)); /* 55 */ - void (*tkMacSetUpGraphicsPort) _ANSI_ARGS_((GC gc)); /* 56 */ - void (*tkMacUpdateClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 57 */ - void (*tkMacUnregisterMacWindow) _ANSI_ARGS_((GWorldPtr portPtr)); /* 58 */ - int (*tkMacUseMenuID) _ANSI_ARGS_((short macID)); /* 59 */ - RgnHandle (*tkMacVisableClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 60 */ - void (*tkMacWinBounds) _ANSI_ARGS_((TkWindow * winPtr, Rect * geometry)); /* 61 */ - void (*tkMacWindowOffset) _ANSI_ARGS_((WindowRef wRef, int * xOffset, int * yOffset)); /* 62 */ - void (*tkResumeClipboard) _ANSI_ARGS_((void)); /* 63 */ - int (*tkSetMacColor) _ANSI_ARGS_((unsigned long pixel, RGBColor * macColor)); /* 64 */ - void (*tkSetWMName) _ANSI_ARGS_((TkWindow * winPtr, Tk_Uid titleUid)); /* 65 */ - void (*tkSuspendClipboard) _ANSI_ARGS_((void)); /* 66 */ - int (*tkWMGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 67 */ - int (*tkMacZoomToplevel) _ANSI_ARGS_((WindowPtr whichWindow, Point where, short zoomPart)); /* 68 */ - Tk_Window (*tk_TopCoordsToWindow) _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int * newX, int * newY)); /* 69 */ - MacDrawable * (*tkMacContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 70 */ - MacDrawable * (*tkMacGetHostToplevel) _ANSI_ARGS_((TkWindow * winPtr)); /* 71 */ + void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */ + 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 (*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 (*tkAboutDlg) _ANSI_ARGS_((void)); /* 10 */ + void (*tkCreateMacEventSource) _ANSI_ARGS_((void)); /* 11 */ + void (*tkFontList) _ANSI_ARGS_((Tcl_Interp * interp, Display * display)); /* 12 */ + 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 (*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 */ + void (*tkMacClearMenubarActive) _ANSI_ARGS_((void)); /* 19 */ + int (*tkMacConvertEvent) _ANSI_ARGS_((EventRecord * eventPtr)); /* 20 */ + int (*tkMacDispatchMenuEvent) _ANSI_ARGS_((int menuID, int index)); /* 21 */ + 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 (*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 */ + Time (*tkMacGenerateTime) _ANSI_ARGS_((void)); /* 29 */ + GWorldPtr (*tkMacGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 30 */ + TkWindow * (*tkMacGetScrollbarGrowWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 31 */ + Window (*tkMacGetXWindow) _ANSI_ARGS_((WindowRef macWinPtr)); /* 32 */ + int (*tkMacGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 33 */ + void (*tkMacHandleMenuSelect) _ANSI_ARGS_((long mResult, int optionKeyPressed)); /* 34 */ + int (*tkMacHaveAppearance) _ANSI_ARGS_((void)); /* 35 */ + void (*tkMacInitAppleEvents) _ANSI_ARGS_((Tcl_Interp * interp)); /* 36 */ + void (*tkMacInitMenus) _ANSI_ARGS_((Tcl_Interp * interp)); /* 37 */ + void (*tkMacInvalidateWindow) _ANSI_ARGS_((MacDrawable * macWin, int flag)); /* 38 */ + int (*tkMacIsCharacterMissing) _ANSI_ARGS_((Tk_Font tkfont, unsigned int searchChar)); /* 39 */ + void (*tkMacMakeRealWindowExist) _ANSI_ARGS_((TkWindow * winPtr)); /* 40 */ + BitMapPtr (*tkMacMakeStippleMap) _ANSI_ARGS_((Drawable d1, Drawable d2)); /* 41 */ + 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 (*tkMacSetHelpMenuItemCount) _ANSI_ARGS_((void)); /* 46 */ + void (*tkMacSetScrollbarGrow) _ANSI_ARGS_((TkWindow * winPtr, int flag)); /* 47 */ + void (*tkMacSetUpClippingRgn) _ANSI_ARGS_((Drawable drawable)); /* 48 */ + void (*tkMacSetUpGraphicsPort) _ANSI_ARGS_((GC gc)); /* 49 */ + void (*tkMacUpdateClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 50 */ + void (*tkMacUnregisterMacWindow) _ANSI_ARGS_((GWorldPtr portPtr)); /* 51 */ + int (*tkMacUseMenuID) _ANSI_ARGS_((short macID)); /* 52 */ + 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 */ + 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 */ + 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 */ + MacDrawable * (*tkMacGetHostToplevel) _ANSI_ARGS_((TkWindow * winPtr)); /* 64 */ #endif /* MAC_TCL */ } TkIntPlatStubs; +#ifdef __cplusplus +extern "C" { +#endif extern TkIntPlatStubs *tkIntPlatStubsPtr; +#ifdef __cplusplus +} +#endif #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) @@ -528,451 +482,396 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkAlignImageData \ (tkIntPlatStubsPtr->tkAlignImageData) /* 0 */ #endif -#ifndef TkClipBox -#define TkClipBox \ - (tkIntPlatStubsPtr->tkClipBox) /* 1 */ -#endif -#ifndef TkCreateRegion -#define TkCreateRegion \ - (tkIntPlatStubsPtr->tkCreateRegion) /* 2 */ -#endif -#ifndef TkDestroyRegion -#define TkDestroyRegion \ - (tkIntPlatStubsPtr->tkDestroyRegion) /* 3 */ -#endif +/* Slot 1 is reserved */ #ifndef TkGenerateActivateEvents #define TkGenerateActivateEvents \ - (tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 4 */ -#endif -#ifndef TkIntersectRegion -#define TkIntersectRegion \ - (tkIntPlatStubsPtr->tkIntersectRegion) /* 5 */ + (tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 2 */ #endif #ifndef TkpGetMS #define TkpGetMS \ - (tkIntPlatStubsPtr->tkpGetMS) /* 6 */ + (tkIntPlatStubsPtr->tkpGetMS) /* 3 */ #endif #ifndef TkPointerDeadWindow #define TkPointerDeadWindow \ - (tkIntPlatStubsPtr->tkPointerDeadWindow) /* 7 */ + (tkIntPlatStubsPtr->tkPointerDeadWindow) /* 4 */ #endif #ifndef TkpPrintWindowId #define TkpPrintWindowId \ - (tkIntPlatStubsPtr->tkpPrintWindowId) /* 8 */ + (tkIntPlatStubsPtr->tkpPrintWindowId) /* 5 */ #endif #ifndef TkpScanWindowId #define TkpScanWindowId \ - (tkIntPlatStubsPtr->tkpScanWindowId) /* 9 */ + (tkIntPlatStubsPtr->tkpScanWindowId) /* 6 */ #endif #ifndef TkpSetCapture #define TkpSetCapture \ - (tkIntPlatStubsPtr->tkpSetCapture) /* 10 */ + (tkIntPlatStubsPtr->tkpSetCapture) /* 7 */ #endif #ifndef TkpSetCursor #define TkpSetCursor \ - (tkIntPlatStubsPtr->tkpSetCursor) /* 11 */ + (tkIntPlatStubsPtr->tkpSetCursor) /* 8 */ #endif #ifndef TkpWmSetState #define TkpWmSetState \ - (tkIntPlatStubsPtr->tkpWmSetState) /* 12 */ -#endif -#ifndef TkRectInRegion -#define TkRectInRegion \ - (tkIntPlatStubsPtr->tkRectInRegion) /* 13 */ + (tkIntPlatStubsPtr->tkpWmSetState) /* 9 */ #endif #ifndef TkSetPixmapColormap #define TkSetPixmapColormap \ - (tkIntPlatStubsPtr->tkSetPixmapColormap) /* 14 */ -#endif -#ifndef TkSetRegion -#define TkSetRegion \ - (tkIntPlatStubsPtr->tkSetRegion) /* 15 */ -#endif -#ifndef TkUnionRectWithRegion -#define TkUnionRectWithRegion \ - (tkIntPlatStubsPtr->tkUnionRectWithRegion) /* 16 */ + (tkIntPlatStubsPtr->tkSetPixmapColormap) /* 10 */ #endif #ifndef TkWinCancelMouseTimer #define TkWinCancelMouseTimer \ - (tkIntPlatStubsPtr->tkWinCancelMouseTimer) /* 17 */ + (tkIntPlatStubsPtr->tkWinCancelMouseTimer) /* 11 */ #endif #ifndef TkWinClipboardRender #define TkWinClipboardRender \ - (tkIntPlatStubsPtr->tkWinClipboardRender) /* 18 */ + (tkIntPlatStubsPtr->tkWinClipboardRender) /* 12 */ #endif #ifndef TkWinEmbeddedEventProc #define TkWinEmbeddedEventProc \ - (tkIntPlatStubsPtr->tkWinEmbeddedEventProc) /* 19 */ + (tkIntPlatStubsPtr->tkWinEmbeddedEventProc) /* 13 */ #endif #ifndef TkWinFillRect #define TkWinFillRect \ - (tkIntPlatStubsPtr->tkWinFillRect) /* 20 */ + (tkIntPlatStubsPtr->tkWinFillRect) /* 14 */ #endif #ifndef TkWinGetBorderPixels #define TkWinGetBorderPixels \ - (tkIntPlatStubsPtr->tkWinGetBorderPixels) /* 21 */ + (tkIntPlatStubsPtr->tkWinGetBorderPixels) /* 15 */ #endif #ifndef TkWinGetDrawableDC #define TkWinGetDrawableDC \ - (tkIntPlatStubsPtr->tkWinGetDrawableDC) /* 22 */ + (tkIntPlatStubsPtr->tkWinGetDrawableDC) /* 16 */ #endif #ifndef TkWinGetModifierState #define TkWinGetModifierState \ - (tkIntPlatStubsPtr->tkWinGetModifierState) /* 23 */ + (tkIntPlatStubsPtr->tkWinGetModifierState) /* 17 */ #endif #ifndef TkWinGetSystemPalette #define TkWinGetSystemPalette \ - (tkIntPlatStubsPtr->tkWinGetSystemPalette) /* 24 */ + (tkIntPlatStubsPtr->tkWinGetSystemPalette) /* 18 */ #endif #ifndef TkWinGetWrapperWindow #define TkWinGetWrapperWindow \ - (tkIntPlatStubsPtr->tkWinGetWrapperWindow) /* 25 */ + (tkIntPlatStubsPtr->tkWinGetWrapperWindow) /* 19 */ #endif #ifndef TkWinHandleMenuEvent #define TkWinHandleMenuEvent \ - (tkIntPlatStubsPtr->tkWinHandleMenuEvent) /* 26 */ + (tkIntPlatStubsPtr->tkWinHandleMenuEvent) /* 20 */ #endif #ifndef TkWinIndexOfColor #define TkWinIndexOfColor \ - (tkIntPlatStubsPtr->tkWinIndexOfColor) /* 27 */ + (tkIntPlatStubsPtr->tkWinIndexOfColor) /* 21 */ #endif #ifndef TkWinReleaseDrawableDC #define TkWinReleaseDrawableDC \ - (tkIntPlatStubsPtr->tkWinReleaseDrawableDC) /* 28 */ + (tkIntPlatStubsPtr->tkWinReleaseDrawableDC) /* 22 */ #endif #ifndef TkWinResendEvent #define TkWinResendEvent \ - (tkIntPlatStubsPtr->tkWinResendEvent) /* 29 */ + (tkIntPlatStubsPtr->tkWinResendEvent) /* 23 */ #endif #ifndef TkWinSelectPalette #define TkWinSelectPalette \ - (tkIntPlatStubsPtr->tkWinSelectPalette) /* 30 */ + (tkIntPlatStubsPtr->tkWinSelectPalette) /* 24 */ #endif #ifndef TkWinSetMenu #define TkWinSetMenu \ - (tkIntPlatStubsPtr->tkWinSetMenu) /* 31 */ + (tkIntPlatStubsPtr->tkWinSetMenu) /* 25 */ #endif #ifndef TkWinSetWindowPos #define TkWinSetWindowPos \ - (tkIntPlatStubsPtr->tkWinSetWindowPos) /* 32 */ + (tkIntPlatStubsPtr->tkWinSetWindowPos) /* 26 */ #endif #ifndef TkWinWmCleanup #define TkWinWmCleanup \ - (tkIntPlatStubsPtr->tkWinWmCleanup) /* 33 */ + (tkIntPlatStubsPtr->tkWinWmCleanup) /* 27 */ #endif #ifndef TkWinXCleanup #define TkWinXCleanup \ - (tkIntPlatStubsPtr->tkWinXCleanup) /* 34 */ + (tkIntPlatStubsPtr->tkWinXCleanup) /* 28 */ #endif #ifndef TkWinXInit #define TkWinXInit \ - (tkIntPlatStubsPtr->tkWinXInit) /* 35 */ + (tkIntPlatStubsPtr->tkWinXInit) /* 29 */ #endif #ifndef TkWinSetForegroundWindow #define TkWinSetForegroundWindow \ - (tkIntPlatStubsPtr->tkWinSetForegroundWindow) /* 36 */ + (tkIntPlatStubsPtr->tkWinSetForegroundWindow) /* 30 */ #endif #ifndef TkWinDialogDebug #define TkWinDialogDebug \ - (tkIntPlatStubsPtr->tkWinDialogDebug) /* 37 */ + (tkIntPlatStubsPtr->tkWinDialogDebug) /* 31 */ #endif #ifndef TkWinGetMenuSystemDefault #define TkWinGetMenuSystemDefault \ - (tkIntPlatStubsPtr->tkWinGetMenuSystemDefault) /* 38 */ + (tkIntPlatStubsPtr->tkWinGetMenuSystemDefault) /* 32 */ #endif #ifndef TkWinGetPlatformId #define TkWinGetPlatformId \ - (tkIntPlatStubsPtr->tkWinGetPlatformId) /* 39 */ + (tkIntPlatStubsPtr->tkWinGetPlatformId) /* 33 */ #endif #endif /* __WIN32__ */ #ifdef MAC_TCL -#ifndef TkClipBox -#define TkClipBox \ - (tkIntPlatStubsPtr->tkClipBox) /* 0 */ -#endif -#ifndef TkCreateRegion -#define TkCreateRegion \ - (tkIntPlatStubsPtr->tkCreateRegion) /* 1 */ -#endif -#ifndef TkDestroyRegion -#define TkDestroyRegion \ - (tkIntPlatStubsPtr->tkDestroyRegion) /* 2 */ -#endif #ifndef TkGenerateActivateEvents #define TkGenerateActivateEvents \ - (tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 3 */ -#endif -#ifndef TkIntersectRegion -#define TkIntersectRegion \ - (tkIntPlatStubsPtr->tkIntersectRegion) /* 4 */ + (tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */ #endif #ifndef TkpCreateNativeBitmap #define TkpCreateNativeBitmap \ - (tkIntPlatStubsPtr->tkpCreateNativeBitmap) /* 5 */ + (tkIntPlatStubsPtr->tkpCreateNativeBitmap) /* 1 */ #endif #ifndef TkpDefineNativeBitmaps #define TkpDefineNativeBitmaps \ - (tkIntPlatStubsPtr->tkpDefineNativeBitmaps) /* 6 */ + (tkIntPlatStubsPtr->tkpDefineNativeBitmaps) /* 2 */ #endif #ifndef TkpGetMS #define TkpGetMS \ - (tkIntPlatStubsPtr->tkpGetMS) /* 7 */ + (tkIntPlatStubsPtr->tkpGetMS) /* 3 */ #endif #ifndef TkpGetNativeAppBitmap #define TkpGetNativeAppBitmap \ - (tkIntPlatStubsPtr->tkpGetNativeAppBitmap) /* 8 */ + (tkIntPlatStubsPtr->tkpGetNativeAppBitmap) /* 4 */ #endif #ifndef TkPointerDeadWindow #define TkPointerDeadWindow \ - (tkIntPlatStubsPtr->tkPointerDeadWindow) /* 9 */ + (tkIntPlatStubsPtr->tkPointerDeadWindow) /* 5 */ #endif #ifndef TkpSetCapture #define TkpSetCapture \ - (tkIntPlatStubsPtr->tkpSetCapture) /* 10 */ + (tkIntPlatStubsPtr->tkpSetCapture) /* 6 */ #endif #ifndef TkpSetCursor #define TkpSetCursor \ - (tkIntPlatStubsPtr->tkpSetCursor) /* 11 */ + (tkIntPlatStubsPtr->tkpSetCursor) /* 7 */ #endif #ifndef TkpWmSetState #define TkpWmSetState \ - (tkIntPlatStubsPtr->tkpWmSetState) /* 12 */ -#endif -#ifndef TkRectInRegion -#define TkRectInRegion \ - (tkIntPlatStubsPtr->tkRectInRegion) /* 13 */ -#endif -#ifndef TkSetRegion -#define TkSetRegion \ - (tkIntPlatStubsPtr->tkSetRegion) /* 14 */ -#endif -#ifndef TkUnionRectWithRegion -#define TkUnionRectWithRegion \ - (tkIntPlatStubsPtr->tkUnionRectWithRegion) /* 15 */ + (tkIntPlatStubsPtr->tkpWmSetState) /* 8 */ #endif #ifndef HandleWMEvent #define HandleWMEvent \ - (tkIntPlatStubsPtr->handleWMEvent) /* 16 */ + (tkIntPlatStubsPtr->handleWMEvent) /* 9 */ #endif #ifndef TkAboutDlg #define TkAboutDlg \ - (tkIntPlatStubsPtr->tkAboutDlg) /* 17 */ + (tkIntPlatStubsPtr->tkAboutDlg) /* 10 */ #endif #ifndef TkCreateMacEventSource #define TkCreateMacEventSource \ - (tkIntPlatStubsPtr->tkCreateMacEventSource) /* 18 */ + (tkIntPlatStubsPtr->tkCreateMacEventSource) /* 11 */ #endif #ifndef TkFontList #define TkFontList \ - (tkIntPlatStubsPtr->tkFontList) /* 19 */ + (tkIntPlatStubsPtr->tkFontList) /* 12 */ #endif #ifndef TkGetTransientMaster #define TkGetTransientMaster \ - (tkIntPlatStubsPtr->tkGetTransientMaster) /* 20 */ + (tkIntPlatStubsPtr->tkGetTransientMaster) /* 13 */ #endif #ifndef TkGenerateButtonEvent #define TkGenerateButtonEvent \ - (tkIntPlatStubsPtr->tkGenerateButtonEvent) /* 21 */ + (tkIntPlatStubsPtr->tkGenerateButtonEvent) /* 14 */ #endif #ifndef TkGetCharPositions #define TkGetCharPositions \ - (tkIntPlatStubsPtr->tkGetCharPositions) /* 22 */ + (tkIntPlatStubsPtr->tkGetCharPositions) /* 15 */ #endif #ifndef TkGenWMDestroyEvent #define TkGenWMDestroyEvent \ - (tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 23 */ + (tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 16 */ #endif #ifndef TkGenWMConfigureEvent #define TkGenWMConfigureEvent \ - (tkIntPlatStubsPtr->tkGenWMConfigureEvent) /* 24 */ + (tkIntPlatStubsPtr->tkGenWMConfigureEvent) /* 17 */ #endif #ifndef TkMacButtonKeyState #define TkMacButtonKeyState \ - (tkIntPlatStubsPtr->tkMacButtonKeyState) /* 25 */ + (tkIntPlatStubsPtr->tkMacButtonKeyState) /* 18 */ #endif #ifndef TkMacClearMenubarActive #define TkMacClearMenubarActive \ - (tkIntPlatStubsPtr->tkMacClearMenubarActive) /* 26 */ + (tkIntPlatStubsPtr->tkMacClearMenubarActive) /* 19 */ #endif #ifndef TkMacConvertEvent #define TkMacConvertEvent \ - (tkIntPlatStubsPtr->tkMacConvertEvent) /* 27 */ + (tkIntPlatStubsPtr->tkMacConvertEvent) /* 20 */ #endif #ifndef TkMacDispatchMenuEvent #define TkMacDispatchMenuEvent \ - (tkIntPlatStubsPtr->tkMacDispatchMenuEvent) /* 28 */ + (tkIntPlatStubsPtr->tkMacDispatchMenuEvent) /* 21 */ #endif #ifndef TkMacInstallCursor #define TkMacInstallCursor \ - (tkIntPlatStubsPtr->tkMacInstallCursor) /* 29 */ + (tkIntPlatStubsPtr->tkMacInstallCursor) /* 22 */ #endif #ifndef TkMacConvertTkEvent #define TkMacConvertTkEvent \ - (tkIntPlatStubsPtr->tkMacConvertTkEvent) /* 30 */ + (tkIntPlatStubsPtr->tkMacConvertTkEvent) /* 23 */ #endif #ifndef TkMacHandleTearoffMenu #define TkMacHandleTearoffMenu \ - (tkIntPlatStubsPtr->tkMacHandleTearoffMenu) /* 31 */ + (tkIntPlatStubsPtr->tkMacHandleTearoffMenu) /* 24 */ #endif #ifndef tkMacInstallMWConsole #define tkMacInstallMWConsole \ - (tkIntPlatStubsPtr->tkMacInstallMWConsole) /* 32 */ + (tkIntPlatStubsPtr->tkMacInstallMWConsole) /* 25 */ #endif #ifndef TkMacInvalClipRgns #define TkMacInvalClipRgns \ - (tkIntPlatStubsPtr->tkMacInvalClipRgns) /* 33 */ + (tkIntPlatStubsPtr->tkMacInvalClipRgns) /* 26 */ #endif #ifndef TkMacDoHLEvent #define TkMacDoHLEvent \ - (tkIntPlatStubsPtr->tkMacDoHLEvent) /* 34 */ + (tkIntPlatStubsPtr->tkMacDoHLEvent) /* 27 */ #endif #ifndef TkMacFontInfo #define TkMacFontInfo \ - (tkIntPlatStubsPtr->tkMacFontInfo) /* 35 */ + (tkIntPlatStubsPtr->tkMacFontInfo) /* 28 */ #endif #ifndef TkMacGenerateTime #define TkMacGenerateTime \ - (tkIntPlatStubsPtr->tkMacGenerateTime) /* 36 */ + (tkIntPlatStubsPtr->tkMacGenerateTime) /* 29 */ #endif #ifndef TkMacGetDrawablePort #define TkMacGetDrawablePort \ - (tkIntPlatStubsPtr->tkMacGetDrawablePort) /* 37 */ + (tkIntPlatStubsPtr->tkMacGetDrawablePort) /* 30 */ #endif #ifndef TkMacGetScrollbarGrowWindow #define TkMacGetScrollbarGrowWindow \ - (tkIntPlatStubsPtr->tkMacGetScrollbarGrowWindow) /* 38 */ + (tkIntPlatStubsPtr->tkMacGetScrollbarGrowWindow) /* 31 */ #endif #ifndef TkMacGetXWindow #define TkMacGetXWindow \ - (tkIntPlatStubsPtr->tkMacGetXWindow) /* 39 */ + (tkIntPlatStubsPtr->tkMacGetXWindow) /* 32 */ #endif #ifndef TkMacGrowToplevel #define TkMacGrowToplevel \ - (tkIntPlatStubsPtr->tkMacGrowToplevel) /* 40 */ + (tkIntPlatStubsPtr->tkMacGrowToplevel) /* 33 */ #endif #ifndef TkMacHandleMenuSelect #define TkMacHandleMenuSelect \ - (tkIntPlatStubsPtr->tkMacHandleMenuSelect) /* 41 */ + (tkIntPlatStubsPtr->tkMacHandleMenuSelect) /* 34 */ #endif #ifndef TkMacHaveAppearance #define TkMacHaveAppearance \ - (tkIntPlatStubsPtr->tkMacHaveAppearance) /* 42 */ + (tkIntPlatStubsPtr->tkMacHaveAppearance) /* 35 */ #endif #ifndef TkMacInitAppleEvents #define TkMacInitAppleEvents \ - (tkIntPlatStubsPtr->tkMacInitAppleEvents) /* 43 */ + (tkIntPlatStubsPtr->tkMacInitAppleEvents) /* 36 */ #endif #ifndef TkMacInitMenus #define TkMacInitMenus \ - (tkIntPlatStubsPtr->tkMacInitMenus) /* 44 */ + (tkIntPlatStubsPtr->tkMacInitMenus) /* 37 */ #endif #ifndef TkMacInvalidateWindow #define TkMacInvalidateWindow \ - (tkIntPlatStubsPtr->tkMacInvalidateWindow) /* 45 */ + (tkIntPlatStubsPtr->tkMacInvalidateWindow) /* 38 */ #endif #ifndef TkMacIsCharacterMissing #define TkMacIsCharacterMissing \ - (tkIntPlatStubsPtr->tkMacIsCharacterMissing) /* 46 */ + (tkIntPlatStubsPtr->tkMacIsCharacterMissing) /* 39 */ #endif #ifndef TkMacMakeRealWindowExist #define TkMacMakeRealWindowExist \ - (tkIntPlatStubsPtr->tkMacMakeRealWindowExist) /* 47 */ + (tkIntPlatStubsPtr->tkMacMakeRealWindowExist) /* 40 */ #endif #ifndef TkMacMakeStippleMap #define TkMacMakeStippleMap \ - (tkIntPlatStubsPtr->tkMacMakeStippleMap) /* 48 */ + (tkIntPlatStubsPtr->tkMacMakeStippleMap) /* 41 */ #endif #ifndef TkMacMenuClick #define TkMacMenuClick \ - (tkIntPlatStubsPtr->tkMacMenuClick) /* 49 */ + (tkIntPlatStubsPtr->tkMacMenuClick) /* 42 */ #endif #ifndef TkMacRegisterOffScreenWindow #define TkMacRegisterOffScreenWindow \ - (tkIntPlatStubsPtr->tkMacRegisterOffScreenWindow) /* 50 */ + (tkIntPlatStubsPtr->tkMacRegisterOffScreenWindow) /* 43 */ #endif #ifndef TkMacResizable #define TkMacResizable \ - (tkIntPlatStubsPtr->tkMacResizable) /* 51 */ + (tkIntPlatStubsPtr->tkMacResizable) /* 44 */ #endif #ifndef TkMacSetEmbedRgn #define TkMacSetEmbedRgn \ - (tkIntPlatStubsPtr->tkMacSetEmbedRgn) /* 52 */ + (tkIntPlatStubsPtr->tkMacSetEmbedRgn) /* 45 */ #endif #ifndef TkMacSetHelpMenuItemCount #define TkMacSetHelpMenuItemCount \ - (tkIntPlatStubsPtr->tkMacSetHelpMenuItemCount) /* 53 */ + (tkIntPlatStubsPtr->tkMacSetHelpMenuItemCount) /* 46 */ #endif #ifndef TkMacSetScrollbarGrow #define TkMacSetScrollbarGrow \ - (tkIntPlatStubsPtr->tkMacSetScrollbarGrow) /* 54 */ + (tkIntPlatStubsPtr->tkMacSetScrollbarGrow) /* 47 */ #endif #ifndef TkMacSetUpClippingRgn #define TkMacSetUpClippingRgn \ - (tkIntPlatStubsPtr->tkMacSetUpClippingRgn) /* 55 */ + (tkIntPlatStubsPtr->tkMacSetUpClippingRgn) /* 48 */ #endif #ifndef TkMacSetUpGraphicsPort #define TkMacSetUpGraphicsPort \ - (tkIntPlatStubsPtr->tkMacSetUpGraphicsPort) /* 56 */ + (tkIntPlatStubsPtr->tkMacSetUpGraphicsPort) /* 49 */ #endif #ifndef TkMacUpdateClipRgn #define TkMacUpdateClipRgn \ - (tkIntPlatStubsPtr->tkMacUpdateClipRgn) /* 57 */ + (tkIntPlatStubsPtr->tkMacUpdateClipRgn) /* 50 */ #endif #ifndef TkMacUnregisterMacWindow #define TkMacUnregisterMacWindow \ - (tkIntPlatStubsPtr->tkMacUnregisterMacWindow) /* 58 */ + (tkIntPlatStubsPtr->tkMacUnregisterMacWindow) /* 51 */ #endif #ifndef TkMacUseMenuID #define TkMacUseMenuID \ - (tkIntPlatStubsPtr->tkMacUseMenuID) /* 59 */ + (tkIntPlatStubsPtr->tkMacUseMenuID) /* 52 */ #endif #ifndef TkMacVisableClipRgn #define TkMacVisableClipRgn \ - (tkIntPlatStubsPtr->tkMacVisableClipRgn) /* 60 */ + (tkIntPlatStubsPtr->tkMacVisableClipRgn) /* 53 */ #endif #ifndef TkMacWinBounds #define TkMacWinBounds \ - (tkIntPlatStubsPtr->tkMacWinBounds) /* 61 */ + (tkIntPlatStubsPtr->tkMacWinBounds) /* 54 */ #endif #ifndef TkMacWindowOffset #define TkMacWindowOffset \ - (tkIntPlatStubsPtr->tkMacWindowOffset) /* 62 */ + (tkIntPlatStubsPtr->tkMacWindowOffset) /* 55 */ #endif #ifndef TkResumeClipboard #define TkResumeClipboard \ - (tkIntPlatStubsPtr->tkResumeClipboard) /* 63 */ + (tkIntPlatStubsPtr->tkResumeClipboard) /* 56 */ #endif #ifndef TkSetMacColor #define TkSetMacColor \ - (tkIntPlatStubsPtr->tkSetMacColor) /* 64 */ + (tkIntPlatStubsPtr->tkSetMacColor) /* 57 */ #endif #ifndef TkSetWMName #define TkSetWMName \ - (tkIntPlatStubsPtr->tkSetWMName) /* 65 */ + (tkIntPlatStubsPtr->tkSetWMName) /* 58 */ #endif #ifndef TkSuspendClipboard #define TkSuspendClipboard \ - (tkIntPlatStubsPtr->tkSuspendClipboard) /* 66 */ + (tkIntPlatStubsPtr->tkSuspendClipboard) /* 59 */ #endif #ifndef TkWMGrowToplevel #define TkWMGrowToplevel \ - (tkIntPlatStubsPtr->tkWMGrowToplevel) /* 67 */ + (tkIntPlatStubsPtr->tkWMGrowToplevel) /* 60 */ #endif #ifndef TkMacZoomToplevel #define TkMacZoomToplevel \ - (tkIntPlatStubsPtr->tkMacZoomToplevel) /* 68 */ + (tkIntPlatStubsPtr->tkMacZoomToplevel) /* 61 */ #endif #ifndef Tk_TopCoordsToWindow #define Tk_TopCoordsToWindow \ - (tkIntPlatStubsPtr->tk_TopCoordsToWindow) /* 69 */ + (tkIntPlatStubsPtr->tk_TopCoordsToWindow) /* 62 */ #endif #ifndef TkMacContainerId #define TkMacContainerId \ - (tkIntPlatStubsPtr->tkMacContainerId) /* 70 */ + (tkIntPlatStubsPtr->tkMacContainerId) /* 63 */ #endif #ifndef TkMacGetHostToplevel #define TkMacGetHostToplevel \ - (tkIntPlatStubsPtr->tkMacGetHostToplevel) /* 71 */ + (tkIntPlatStubsPtr->tkMacGetHostToplevel) /* 64 */ #endif #endif /* MAC_TCL */ diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 03d8209..47cd27d 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.5 1999/04/16 01:51:18 stanton Exp $ + * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.5.4.2 1999/04/27 21:09:42 stanton Exp $ */ #ifndef _TKINTXLIBDECLS @@ -594,6 +594,13 @@ EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display* display, /* 79 */ EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char** list, int count, XTextProperty* text_prop_return)); +/* 80 */ +EXTERN void XDrawSegments _ANSI_ARGS_((Display * display, + Drawable d, GC gc, XSegment * segments, + int nsegments)); +/* 81 */ +EXTERN void XForceScreenSaver _ANSI_ARGS_((Display* display, + int mode)); #endif /* MAC_TCL */ typedef struct TkIntXlibStubs { @@ -787,10 +794,18 @@ typedef struct TkIntXlibStubs { XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display* display, long vinfo_mask, XVisualInfo* vinfo_template, int* nitems_return)); /* 77 */ void (*xSetWMClientMachine) _ANSI_ARGS_((Display* display, Window w, XTextProperty* text_prop)); /* 78 */ Status (*xStringListToTextProperty) _ANSI_ARGS_((char** list, int count, XTextProperty* text_prop_return)); /* 79 */ + void (*xDrawSegments) _ANSI_ARGS_((Display * display, Drawable d, GC gc, XSegment * segments, int nsegments)); /* 80 */ + void (*xForceScreenSaver) _ANSI_ARGS_((Display* display, int mode)); /* 81 */ #endif /* MAC_TCL */ } TkIntXlibStubs; +#ifdef __cplusplus +extern "C" { +#endif extern TkIntXlibStubs *tkIntXlibStubsPtr; +#ifdef __cplusplus +} +#endif #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) @@ -1528,6 +1543,14 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr; #define XStringListToTextProperty \ (tkIntXlibStubsPtr->xStringListToTextProperty) /* 79 */ #endif +#ifndef XDrawSegments +#define XDrawSegments \ + (tkIntXlibStubsPtr->xDrawSegments) /* 80 */ +#endif +#ifndef XForceScreenSaver +#define XForceScreenSaver \ + (tkIntXlibStubsPtr->xForceScreenSaver) /* 81 */ +#endif #endif /* MAC_TCL */ #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c index b9f0ddf..837f4e3 100644 --- a/generic/tkMenubutton.c +++ b/generic/tkMenubutton.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: tkMenubutton.c,v 1.3 1999/04/16 01:51:19 stanton Exp $ + * RCS: @(#) $Id: tkMenubutton.c,v 1.3.4.1 1999/04/24 00:10:55 stanton Exp $ */ #include "tkMenubutton.h" @@ -148,7 +148,7 @@ static char *commandNames[] = { }; enum command { - COMMAND_CGET, COMMAND_CONFIGURE, + COMMAND_CGET, COMMAND_CONFIGURE }; /* diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h index e0dd331..a5f39bf 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.3 1999/04/16 01:51:21 stanton Exp $ + * RCS: @(#) $Id: tkPlatDecls.h,v 1.3.4.1 1999/04/27 21:09:42 stanton Exp $ */ #ifndef _TKPLATDECLS @@ -111,7 +111,13 @@ typedef struct TkPlatStubs { #endif /* MAC_TCL */ } TkPlatStubs; +#ifdef __cplusplus +extern "C" { +#endif extern TkPlatStubs *tkPlatStubsPtr; +#ifdef __cplusplus +} +#endif #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 4e685c5..fd2b1a3 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.5 1999/04/16 01:51:22 stanton Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.5.4.4 1999/04/27 21:09:43 stanton Exp $ */ #include "tkInt.h" @@ -17,6 +17,9 @@ #ifdef __WIN32__ #include "tkWinInt.h" #endif +#ifdef MAC_TCL +#include "tkMacInt.h" +#endif #include "tkDecls.h" #include "tkPlatDecls.h" @@ -36,228 +39,6 @@ /* !BEGIN!: Do not edit below this line. */ -static TkStubHooks tkStubHooks; - -TkStubs tkStubs = { - TCL_STUB_MAGIC, - &tkStubHooks, - Tk_MainLoop, /* 0 */ - Tk_3DBorderColor, /* 1 */ - Tk_3DBorderGC, /* 2 */ - Tk_3DHorizontalBevel, /* 3 */ - Tk_3DVerticalBevel, /* 4 */ - Tk_AddOption, /* 5 */ - Tk_BindEvent, /* 6 */ - Tk_CanvasDrawableCoords, /* 7 */ - Tk_CanvasEventuallyRedraw, /* 8 */ - Tk_CanvasGetCoord, /* 9 */ - Tk_CanvasGetTextInfo, /* 10 */ - Tk_CanvasPsBitmap, /* 11 */ - Tk_CanvasPsColor, /* 12 */ - Tk_CanvasPsFont, /* 13 */ - Tk_CanvasPsPath, /* 14 */ - Tk_CanvasPsStipple, /* 15 */ - Tk_CanvasPsY, /* 16 */ - Tk_CanvasSetStippleOrigin, /* 17 */ - Tk_CanvasTagsParseProc, /* 18 */ - Tk_CanvasTagsPrintProc, /* 19 */ - Tk_CanvasTkwin, /* 20 */ - Tk_CanvasWindowCoords, /* 21 */ - Tk_ChangeWindowAttributes, /* 22 */ - Tk_CharBbox, /* 23 */ - Tk_ClearSelection, /* 24 */ - Tk_ClipboardAppend, /* 25 */ - Tk_ClipboardClear, /* 26 */ - Tk_ConfigureInfo, /* 27 */ - Tk_ConfigureValue, /* 28 */ - Tk_ConfigureWidget, /* 29 */ - Tk_ConfigureWindow, /* 30 */ - Tk_ComputeTextLayout, /* 31 */ - Tk_CoordsToWindow, /* 32 */ - Tk_CreateBinding, /* 33 */ - Tk_CreateBindingTable, /* 34 */ - Tk_CreateErrorHandler, /* 35 */ - Tk_CreateEventHandler, /* 36 */ - Tk_CreateGenericHandler, /* 37 */ - Tk_CreateImageType, /* 38 */ - Tk_CreateItemType, /* 39 */ - Tk_CreatePhotoImageFormat, /* 40 */ - Tk_CreateSelHandler, /* 41 */ - Tk_CreateWindow, /* 42 */ - Tk_CreateWindowFromPath, /* 43 */ - Tk_DefineBitmap, /* 44 */ - Tk_DefineCursor, /* 45 */ - Tk_DeleteAllBindings, /* 46 */ - Tk_DeleteBinding, /* 47 */ - Tk_DeleteBindingTable, /* 48 */ - Tk_DeleteErrorHandler, /* 49 */ - Tk_DeleteEventHandler, /* 50 */ - Tk_DeleteGenericHandler, /* 51 */ - Tk_DeleteImage, /* 52 */ - Tk_DeleteSelHandler, /* 53 */ - Tk_DestroyWindow, /* 54 */ - Tk_DisplayName, /* 55 */ - Tk_DistanceToTextLayout, /* 56 */ - Tk_Draw3DPolygon, /* 57 */ - Tk_Draw3DRectangle, /* 58 */ - Tk_DrawChars, /* 59 */ - Tk_DrawFocusHighlight, /* 60 */ - Tk_DrawTextLayout, /* 61 */ - Tk_Fill3DPolygon, /* 62 */ - Tk_Fill3DRectangle, /* 63 */ - Tk_FindPhoto, /* 64 */ - Tk_FontId, /* 65 */ - Tk_Free3DBorder, /* 66 */ - Tk_FreeBitmap, /* 67 */ - Tk_FreeColor, /* 68 */ - Tk_FreeColormap, /* 69 */ - Tk_FreeCursor, /* 70 */ - Tk_FreeFont, /* 71 */ - Tk_FreeGC, /* 72 */ - Tk_FreeImage, /* 73 */ - Tk_FreeOptions, /* 74 */ - Tk_FreePixmap, /* 75 */ - Tk_FreeTextLayout, /* 76 */ - Tk_FreeXId, /* 77 */ - Tk_GCForColor, /* 78 */ - Tk_GeometryRequest, /* 79 */ - Tk_Get3DBorder, /* 80 */ - Tk_GetAllBindings, /* 81 */ - Tk_GetAnchor, /* 82 */ - Tk_GetAtomName, /* 83 */ - Tk_GetBinding, /* 84 */ - Tk_GetBitmap, /* 85 */ - Tk_GetBitmapFromData, /* 86 */ - Tk_GetCapStyle, /* 87 */ - Tk_GetColor, /* 88 */ - Tk_GetColorByValue, /* 89 */ - Tk_GetColormap, /* 90 */ - Tk_GetCursor, /* 91 */ - Tk_GetCursorFromData, /* 92 */ - Tk_GetFont, /* 93 */ - Tk_GetFontFromObj, /* 94 */ - Tk_GetFontMetrics, /* 95 */ - Tk_GetGC, /* 96 */ - Tk_GetImage, /* 97 */ - Tk_GetImageMasterData, /* 98 */ - Tk_GetItemTypes, /* 99 */ - Tk_GetJoinStyle, /* 100 */ - Tk_GetJustify, /* 101 */ - Tk_GetNumMainWindows, /* 102 */ - Tk_GetOption, /* 103 */ - Tk_GetPixels, /* 104 */ - Tk_GetPixmap, /* 105 */ - Tk_GetRelief, /* 106 */ - Tk_GetRootCoords, /* 107 */ - Tk_GetScrollInfo, /* 108 */ - Tk_GetScreenMM, /* 109 */ - Tk_GetSelection, /* 110 */ - Tk_GetUid, /* 111 */ - Tk_GetVisual, /* 112 */ - Tk_GetVRootGeometry, /* 113 */ - Tk_Grab, /* 114 */ - Tk_HandleEvent, /* 115 */ - Tk_IdToWindow, /* 116 */ - Tk_ImageChanged, /* 117 */ - Tk_Init, /* 118 */ - Tk_InternAtom, /* 119 */ - Tk_IntersectTextLayout, /* 120 */ - Tk_MaintainGeometry, /* 121 */ - Tk_MainWindow, /* 122 */ - Tk_MakeWindowExist, /* 123 */ - Tk_ManageGeometry, /* 124 */ - Tk_MapWindow, /* 125 */ - Tk_MeasureChars, /* 126 */ - Tk_MoveResizeWindow, /* 127 */ - Tk_MoveWindow, /* 128 */ - Tk_MoveToplevelWindow, /* 129 */ - Tk_NameOf3DBorder, /* 130 */ - Tk_NameOfAnchor, /* 131 */ - Tk_NameOfBitmap, /* 132 */ - Tk_NameOfCapStyle, /* 133 */ - Tk_NameOfColor, /* 134 */ - Tk_NameOfCursor, /* 135 */ - Tk_NameOfFont, /* 136 */ - Tk_NameOfImage, /* 137 */ - Tk_NameOfJoinStyle, /* 138 */ - Tk_NameOfJustify, /* 139 */ - Tk_NameOfRelief, /* 140 */ - Tk_NameToWindow, /* 141 */ - Tk_OwnSelection, /* 142 */ - Tk_ParseArgv, /* 143 */ - Tk_PhotoPutBlock, /* 144 */ - Tk_PhotoPutZoomedBlock, /* 145 */ - Tk_PhotoGetImage, /* 146 */ - Tk_PhotoBlank, /* 147 */ - Tk_PhotoExpand, /* 148 */ - Tk_PhotoGetSize, /* 149 */ - Tk_PhotoSetSize, /* 150 */ - Tk_PointToChar, /* 151 */ - Tk_PostscriptFontName, /* 152 */ - Tk_PreserveColormap, /* 153 */ - Tk_QueueWindowEvent, /* 154 */ - Tk_RedrawImage, /* 155 */ - Tk_ResizeWindow, /* 156 */ - Tk_RestackWindow, /* 157 */ - Tk_RestrictEvents, /* 158 */ - Tk_SafeInit, /* 159 */ - Tk_SetAppName, /* 160 */ - Tk_SetBackgroundFromBorder, /* 161 */ - Tk_SetClass, /* 162 */ - Tk_SetGrid, /* 163 */ - Tk_SetInternalBorder, /* 164 */ - Tk_SetWindowBackground, /* 165 */ - Tk_SetWindowBackgroundPixmap, /* 166 */ - Tk_SetWindowBorder, /* 167 */ - Tk_SetWindowBorderWidth, /* 168 */ - Tk_SetWindowBorderPixmap, /* 169 */ - Tk_SetWindowColormap, /* 170 */ - Tk_SetWindowVisual, /* 171 */ - Tk_SizeOfBitmap, /* 172 */ - Tk_SizeOfImage, /* 173 */ - Tk_StrictMotif, /* 174 */ - Tk_TextLayoutToPostscript, /* 175 */ - Tk_TextWidth, /* 176 */ - Tk_UndefineCursor, /* 177 */ - Tk_UnderlineChars, /* 178 */ - Tk_UnderlineTextLayout, /* 179 */ - Tk_Ungrab, /* 180 */ - Tk_UnmaintainGeometry, /* 181 */ - Tk_UnmapWindow, /* 182 */ - Tk_UnsetGrid, /* 183 */ - Tk_UpdatePointer, /* 184 */ - Tk_AllocBitmapFromObj, /* 185 */ - Tk_Alloc3DBorderFromObj, /* 186 */ - Tk_AllocColorFromObj, /* 187 */ - Tk_AllocCursorFromObj, /* 188 */ - Tk_AllocFontFromObj, /* 189 */ - Tk_CreateOptionTable, /* 190 */ - Tk_DeleteOptionTable, /* 191 */ - Tk_Free3DBorderFromObj, /* 192 */ - Tk_FreeBitmapFromObj, /* 193 */ - Tk_FreeColorFromObj, /* 194 */ - Tk_FreeConfigOptions, /* 195 */ - Tk_FreeSavedOptions, /* 196 */ - Tk_FreeCursorFromObj, /* 197 */ - Tk_FreeFontFromObj, /* 198 */ - Tk_Get3DBorderFromObj, /* 199 */ - Tk_GetAnchorFromObj, /* 200 */ - Tk_GetBitmapFromObj, /* 201 */ - Tk_GetColorFromObj, /* 202 */ - Tk_GetCursorFromObj, /* 203 */ - Tk_GetOptionInfo, /* 204 */ - Tk_GetOptionValue, /* 205 */ - Tk_GetJustifyFromObj, /* 206 */ - Tk_GetMMFromObj, /* 207 */ - Tk_GetPixelsFromObj, /* 208 */ - Tk_GetReliefFromObj, /* 209 */ - Tk_GetScrollInfoObj, /* 210 */ - Tk_InitOptions, /* 211 */ - Tk_MainEx, /* 212 */ - Tk_RestoreSavedOptions, /* 213 */ - Tk_SetOptions, /* 214 */ -}; - TkIntStubs tkIntStubs = { TCL_STUB_MAGIC, NULL, @@ -374,6 +155,69 @@ TkIntStubs tkIntStubs = { TkpGetSubFonts, /* 110 */ TkpGetSystemDefault, /* 111 */ TkpMenuThreadInit, /* 112 */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 113 */ +#endif /* UNIX */ +#ifdef __WIN32__ + TkClipBox, /* 113 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkClipBox, /* 113 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 114 */ +#endif /* UNIX */ +#ifdef __WIN32__ + TkCreateRegion, /* 114 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkCreateRegion, /* 114 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 115 */ +#endif /* UNIX */ +#ifdef __WIN32__ + TkDestroyRegion, /* 115 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkDestroyRegion, /* 115 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 116 */ +#endif /* UNIX */ +#ifdef __WIN32__ + TkIntersectRegion, /* 116 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkIntersectRegion, /* 116 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 117 */ +#endif /* UNIX */ +#ifdef __WIN32__ + TkRectInRegion, /* 117 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkRectInRegion, /* 117 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 118 */ +#endif /* UNIX */ +#ifdef __WIN32__ + TkSetRegion, /* 118 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkSetRegion, /* 118 */ +#endif /* MAC_TCL */ +#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ + NULL, /* 119 */ +#endif /* UNIX */ +#ifdef __WIN32__ + TkUnionRectWithRegion, /* 119 */ +#endif /* __WIN32__ */ +#ifdef MAC_TCL + TkUnionRectWithRegion, /* 119 */ +#endif /* MAC_TCL */ }; TkIntPlatStubs tkIntPlatStubs = { @@ -391,119 +235,106 @@ TkIntPlatStubs tkIntPlatStubs = { #endif /* UNIX */ #ifdef __WIN32__ TkAlignImageData, /* 0 */ - TkClipBox, /* 1 */ - TkCreateRegion, /* 2 */ - TkDestroyRegion, /* 3 */ - TkGenerateActivateEvents, /* 4 */ - TkIntersectRegion, /* 5 */ - TkpGetMS, /* 6 */ - TkPointerDeadWindow, /* 7 */ - TkpPrintWindowId, /* 8 */ - TkpScanWindowId, /* 9 */ - TkpSetCapture, /* 10 */ - TkpSetCursor, /* 11 */ - TkpWmSetState, /* 12 */ - TkRectInRegion, /* 13 */ - TkSetPixmapColormap, /* 14 */ - TkSetRegion, /* 15 */ - TkUnionRectWithRegion, /* 16 */ - TkWinCancelMouseTimer, /* 17 */ - TkWinClipboardRender, /* 18 */ - TkWinEmbeddedEventProc, /* 19 */ - TkWinFillRect, /* 20 */ - TkWinGetBorderPixels, /* 21 */ - TkWinGetDrawableDC, /* 22 */ - TkWinGetModifierState, /* 23 */ - TkWinGetSystemPalette, /* 24 */ - TkWinGetWrapperWindow, /* 25 */ - TkWinHandleMenuEvent, /* 26 */ - TkWinIndexOfColor, /* 27 */ - TkWinReleaseDrawableDC, /* 28 */ - TkWinResendEvent, /* 29 */ - TkWinSelectPalette, /* 30 */ - TkWinSetMenu, /* 31 */ - TkWinSetWindowPos, /* 32 */ - TkWinWmCleanup, /* 33 */ - TkWinXCleanup, /* 34 */ - TkWinXInit, /* 35 */ - TkWinSetForegroundWindow, /* 36 */ - TkWinDialogDebug, /* 37 */ - TkWinGetMenuSystemDefault, /* 38 */ - TkWinGetPlatformId, /* 39 */ + NULL, /* 1 */ + TkGenerateActivateEvents, /* 2 */ + TkpGetMS, /* 3 */ + TkPointerDeadWindow, /* 4 */ + TkpPrintWindowId, /* 5 */ + TkpScanWindowId, /* 6 */ + TkpSetCapture, /* 7 */ + TkpSetCursor, /* 8 */ + TkpWmSetState, /* 9 */ + TkSetPixmapColormap, /* 10 */ + TkWinCancelMouseTimer, /* 11 */ + TkWinClipboardRender, /* 12 */ + TkWinEmbeddedEventProc, /* 13 */ + TkWinFillRect, /* 14 */ + TkWinGetBorderPixels, /* 15 */ + TkWinGetDrawableDC, /* 16 */ + TkWinGetModifierState, /* 17 */ + TkWinGetSystemPalette, /* 18 */ + TkWinGetWrapperWindow, /* 19 */ + TkWinHandleMenuEvent, /* 20 */ + TkWinIndexOfColor, /* 21 */ + TkWinReleaseDrawableDC, /* 22 */ + TkWinResendEvent, /* 23 */ + TkWinSelectPalette, /* 24 */ + TkWinSetMenu, /* 25 */ + TkWinSetWindowPos, /* 26 */ + TkWinWmCleanup, /* 27 */ + TkWinXCleanup, /* 28 */ + TkWinXInit, /* 29 */ + TkWinSetForegroundWindow, /* 30 */ + TkWinDialogDebug, /* 31 */ + TkWinGetMenuSystemDefault, /* 32 */ + TkWinGetPlatformId, /* 33 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - TkClipBox, /* 0 */ - TkCreateRegion, /* 1 */ - TkDestroyRegion, /* 2 */ - TkGenerateActivateEvents, /* 3 */ - TkIntersectRegion, /* 4 */ - TkpCreateNativeBitmap, /* 5 */ - TkpDefineNativeBitmaps, /* 6 */ - TkpGetMS, /* 7 */ - TkpGetNativeAppBitmap, /* 8 */ - TkPointerDeadWindow, /* 9 */ - TkpSetCapture, /* 10 */ - TkpSetCursor, /* 11 */ - TkpWmSetState, /* 12 */ - TkRectInRegion, /* 13 */ - TkSetRegion, /* 14 */ - TkUnionRectWithRegion, /* 15 */ - HandleWMEvent, /* 16 */ - TkAboutDlg, /* 17 */ - TkCreateMacEventSource, /* 18 */ - TkFontList, /* 19 */ - TkGetTransientMaster, /* 20 */ - TkGenerateButtonEvent, /* 21 */ - TkGetCharPositions, /* 22 */ - TkGenWMDestroyEvent, /* 23 */ - TkGenWMConfigureEvent, /* 24 */ - TkMacButtonKeyState, /* 25 */ - TkMacClearMenubarActive, /* 26 */ - TkMacConvertEvent, /* 27 */ - TkMacDispatchMenuEvent, /* 28 */ - TkMacInstallCursor, /* 29 */ - TkMacConvertTkEvent, /* 30 */ - TkMacHandleTearoffMenu, /* 31 */ - tkMacInstallMWConsole, /* 32 */ - TkMacInvalClipRgns, /* 33 */ - TkMacDoHLEvent, /* 34 */ - TkMacFontInfo, /* 35 */ - TkMacGenerateTime, /* 36 */ - TkMacGetDrawablePort, /* 37 */ - TkMacGetScrollbarGrowWindow, /* 38 */ - TkMacGetXWindow, /* 39 */ - TkMacGrowToplevel, /* 40 */ - TkMacHandleMenuSelect, /* 41 */ - TkMacHaveAppearance, /* 42 */ - TkMacInitAppleEvents, /* 43 */ - TkMacInitMenus, /* 44 */ - TkMacInvalidateWindow, /* 45 */ - TkMacIsCharacterMissing, /* 46 */ - TkMacMakeRealWindowExist, /* 47 */ - TkMacMakeStippleMap, /* 48 */ - TkMacMenuClick, /* 49 */ - TkMacRegisterOffScreenWindow, /* 50 */ - TkMacResizable, /* 51 */ - TkMacSetEmbedRgn, /* 52 */ - TkMacSetHelpMenuItemCount, /* 53 */ - TkMacSetScrollbarGrow, /* 54 */ - TkMacSetUpClippingRgn, /* 55 */ - TkMacSetUpGraphicsPort, /* 56 */ - TkMacUpdateClipRgn, /* 57 */ - TkMacUnregisterMacWindow, /* 58 */ - TkMacUseMenuID, /* 59 */ - TkMacVisableClipRgn, /* 60 */ - TkMacWinBounds, /* 61 */ - TkMacWindowOffset, /* 62 */ - TkResumeClipboard, /* 63 */ - TkSetMacColor, /* 64 */ - TkSetWMName, /* 65 */ - TkSuspendClipboard, /* 66 */ - TkWMGrowToplevel, /* 67 */ - TkMacZoomToplevel, /* 68 */ - Tk_TopCoordsToWindow, /* 69 */ - TkMacContainerId, /* 70 */ - TkMacGetHostToplevel, /* 71 */ + TkGenerateActivateEvents, /* 0 */ + TkpCreateNativeBitmap, /* 1 */ + TkpDefineNativeBitmaps, /* 2 */ + TkpGetMS, /* 3 */ + TkpGetNativeAppBitmap, /* 4 */ + TkPointerDeadWindow, /* 5 */ + TkpSetCapture, /* 6 */ + TkpSetCursor, /* 7 */ + TkpWmSetState, /* 8 */ + HandleWMEvent, /* 9 */ + TkAboutDlg, /* 10 */ + TkCreateMacEventSource, /* 11 */ + TkFontList, /* 12 */ + TkGetTransientMaster, /* 13 */ + TkGenerateButtonEvent, /* 14 */ + TkGetCharPositions, /* 15 */ + TkGenWMDestroyEvent, /* 16 */ + TkGenWMConfigureEvent, /* 17 */ + TkMacButtonKeyState, /* 18 */ + TkMacClearMenubarActive, /* 19 */ + TkMacConvertEvent, /* 20 */ + TkMacDispatchMenuEvent, /* 21 */ + TkMacInstallCursor, /* 22 */ + TkMacConvertTkEvent, /* 23 */ + TkMacHandleTearoffMenu, /* 24 */ + tkMacInstallMWConsole, /* 25 */ + TkMacInvalClipRgns, /* 26 */ + TkMacDoHLEvent, /* 27 */ + TkMacFontInfo, /* 28 */ + TkMacGenerateTime, /* 29 */ + TkMacGetDrawablePort, /* 30 */ + TkMacGetScrollbarGrowWindow, /* 31 */ + TkMacGetXWindow, /* 32 */ + TkMacGrowToplevel, /* 33 */ + TkMacHandleMenuSelect, /* 34 */ + TkMacHaveAppearance, /* 35 */ + TkMacInitAppleEvents, /* 36 */ + TkMacInitMenus, /* 37 */ + TkMacInvalidateWindow, /* 38 */ + TkMacIsCharacterMissing, /* 39 */ + TkMacMakeRealWindowExist, /* 40 */ + TkMacMakeStippleMap, /* 41 */ + TkMacMenuClick, /* 42 */ + TkMacRegisterOffScreenWindow, /* 43 */ + TkMacResizable, /* 44 */ + TkMacSetEmbedRgn, /* 45 */ + TkMacSetHelpMenuItemCount, /* 46 */ + TkMacSetScrollbarGrow, /* 47 */ + TkMacSetUpClippingRgn, /* 48 */ + TkMacSetUpGraphicsPort, /* 49 */ + TkMacUpdateClipRgn, /* 50 */ + TkMacUnregisterMacWindow, /* 51 */ + TkMacUseMenuID, /* 52 */ + TkMacVisableClipRgn, /* 53 */ + TkMacWinBounds, /* 54 */ + TkMacWindowOffset, /* 55 */ + TkResumeClipboard, /* 56 */ + TkSetMacColor, /* 57 */ + TkSetWMName, /* 58 */ + TkSuspendClipboard, /* 59 */ + TkWMGrowToplevel, /* 60 */ + TkMacZoomToplevel, /* 61 */ + Tk_TopCoordsToWindow, /* 62 */ + TkMacContainerId, /* 63 */ + TkMacGetHostToplevel, /* 64 */ #endif /* MAC_TCL */ }; @@ -697,6 +528,8 @@ TkIntXlibStubs tkIntXlibStubs = { XGetVisualInfo, /* 77 */ XSetWMClientMachine, /* 78 */ XStringListToTextProperty, /* 79 */ + XDrawSegments, /* 80 */ + XForceScreenSaver, /* 81 */ #endif /* MAC_TCL */ }; @@ -733,5 +566,224 @@ static TkStubHooks tkStubHooks = { &tkIntXlibStubs }; +TkStubs tkStubs = { + TCL_STUB_MAGIC, + &tkStubHooks, + Tk_MainLoop, /* 0 */ + Tk_3DBorderColor, /* 1 */ + Tk_3DBorderGC, /* 2 */ + Tk_3DHorizontalBevel, /* 3 */ + Tk_3DVerticalBevel, /* 4 */ + Tk_AddOption, /* 5 */ + Tk_BindEvent, /* 6 */ + Tk_CanvasDrawableCoords, /* 7 */ + Tk_CanvasEventuallyRedraw, /* 8 */ + Tk_CanvasGetCoord, /* 9 */ + Tk_CanvasGetTextInfo, /* 10 */ + Tk_CanvasPsBitmap, /* 11 */ + Tk_CanvasPsColor, /* 12 */ + Tk_CanvasPsFont, /* 13 */ + Tk_CanvasPsPath, /* 14 */ + Tk_CanvasPsStipple, /* 15 */ + Tk_CanvasPsY, /* 16 */ + Tk_CanvasSetStippleOrigin, /* 17 */ + Tk_CanvasTagsParseProc, /* 18 */ + Tk_CanvasTagsPrintProc, /* 19 */ + Tk_CanvasTkwin, /* 20 */ + Tk_CanvasWindowCoords, /* 21 */ + Tk_ChangeWindowAttributes, /* 22 */ + Tk_CharBbox, /* 23 */ + Tk_ClearSelection, /* 24 */ + Tk_ClipboardAppend, /* 25 */ + Tk_ClipboardClear, /* 26 */ + Tk_ConfigureInfo, /* 27 */ + Tk_ConfigureValue, /* 28 */ + Tk_ConfigureWidget, /* 29 */ + Tk_ConfigureWindow, /* 30 */ + Tk_ComputeTextLayout, /* 31 */ + Tk_CoordsToWindow, /* 32 */ + Tk_CreateBinding, /* 33 */ + Tk_CreateBindingTable, /* 34 */ + Tk_CreateErrorHandler, /* 35 */ + Tk_CreateEventHandler, /* 36 */ + Tk_CreateGenericHandler, /* 37 */ + Tk_CreateImageType, /* 38 */ + Tk_CreateItemType, /* 39 */ + Tk_CreatePhotoImageFormat, /* 40 */ + Tk_CreateSelHandler, /* 41 */ + Tk_CreateWindow, /* 42 */ + Tk_CreateWindowFromPath, /* 43 */ + Tk_DefineBitmap, /* 44 */ + Tk_DefineCursor, /* 45 */ + Tk_DeleteAllBindings, /* 46 */ + Tk_DeleteBinding, /* 47 */ + Tk_DeleteBindingTable, /* 48 */ + Tk_DeleteErrorHandler, /* 49 */ + Tk_DeleteEventHandler, /* 50 */ + Tk_DeleteGenericHandler, /* 51 */ + Tk_DeleteImage, /* 52 */ + Tk_DeleteSelHandler, /* 53 */ + Tk_DestroyWindow, /* 54 */ + Tk_DisplayName, /* 55 */ + Tk_DistanceToTextLayout, /* 56 */ + Tk_Draw3DPolygon, /* 57 */ + Tk_Draw3DRectangle, /* 58 */ + Tk_DrawChars, /* 59 */ + Tk_DrawFocusHighlight, /* 60 */ + Tk_DrawTextLayout, /* 61 */ + Tk_Fill3DPolygon, /* 62 */ + Tk_Fill3DRectangle, /* 63 */ + Tk_FindPhoto, /* 64 */ + Tk_FontId, /* 65 */ + Tk_Free3DBorder, /* 66 */ + Tk_FreeBitmap, /* 67 */ + Tk_FreeColor, /* 68 */ + Tk_FreeColormap, /* 69 */ + Tk_FreeCursor, /* 70 */ + Tk_FreeFont, /* 71 */ + Tk_FreeGC, /* 72 */ + Tk_FreeImage, /* 73 */ + Tk_FreeOptions, /* 74 */ + Tk_FreePixmap, /* 75 */ + Tk_FreeTextLayout, /* 76 */ + Tk_FreeXId, /* 77 */ + Tk_GCForColor, /* 78 */ + Tk_GeometryRequest, /* 79 */ + Tk_Get3DBorder, /* 80 */ + Tk_GetAllBindings, /* 81 */ + Tk_GetAnchor, /* 82 */ + Tk_GetAtomName, /* 83 */ + Tk_GetBinding, /* 84 */ + Tk_GetBitmap, /* 85 */ + Tk_GetBitmapFromData, /* 86 */ + Tk_GetCapStyle, /* 87 */ + Tk_GetColor, /* 88 */ + Tk_GetColorByValue, /* 89 */ + Tk_GetColormap, /* 90 */ + Tk_GetCursor, /* 91 */ + Tk_GetCursorFromData, /* 92 */ + Tk_GetFont, /* 93 */ + Tk_GetFontFromObj, /* 94 */ + Tk_GetFontMetrics, /* 95 */ + Tk_GetGC, /* 96 */ + Tk_GetImage, /* 97 */ + Tk_GetImageMasterData, /* 98 */ + Tk_GetItemTypes, /* 99 */ + Tk_GetJoinStyle, /* 100 */ + Tk_GetJustify, /* 101 */ + Tk_GetNumMainWindows, /* 102 */ + Tk_GetOption, /* 103 */ + Tk_GetPixels, /* 104 */ + Tk_GetPixmap, /* 105 */ + Tk_GetRelief, /* 106 */ + Tk_GetRootCoords, /* 107 */ + Tk_GetScrollInfo, /* 108 */ + Tk_GetScreenMM, /* 109 */ + Tk_GetSelection, /* 110 */ + Tk_GetUid, /* 111 */ + Tk_GetVisual, /* 112 */ + Tk_GetVRootGeometry, /* 113 */ + Tk_Grab, /* 114 */ + Tk_HandleEvent, /* 115 */ + Tk_IdToWindow, /* 116 */ + Tk_ImageChanged, /* 117 */ + Tk_Init, /* 118 */ + Tk_InternAtom, /* 119 */ + Tk_IntersectTextLayout, /* 120 */ + Tk_MaintainGeometry, /* 121 */ + Tk_MainWindow, /* 122 */ + Tk_MakeWindowExist, /* 123 */ + Tk_ManageGeometry, /* 124 */ + Tk_MapWindow, /* 125 */ + Tk_MeasureChars, /* 126 */ + Tk_MoveResizeWindow, /* 127 */ + Tk_MoveWindow, /* 128 */ + Tk_MoveToplevelWindow, /* 129 */ + Tk_NameOf3DBorder, /* 130 */ + Tk_NameOfAnchor, /* 131 */ + Tk_NameOfBitmap, /* 132 */ + Tk_NameOfCapStyle, /* 133 */ + Tk_NameOfColor, /* 134 */ + Tk_NameOfCursor, /* 135 */ + Tk_NameOfFont, /* 136 */ + Tk_NameOfImage, /* 137 */ + Tk_NameOfJoinStyle, /* 138 */ + Tk_NameOfJustify, /* 139 */ + Tk_NameOfRelief, /* 140 */ + Tk_NameToWindow, /* 141 */ + Tk_OwnSelection, /* 142 */ + Tk_ParseArgv, /* 143 */ + Tk_PhotoPutBlock, /* 144 */ + Tk_PhotoPutZoomedBlock, /* 145 */ + Tk_PhotoGetImage, /* 146 */ + Tk_PhotoBlank, /* 147 */ + Tk_PhotoExpand, /* 148 */ + Tk_PhotoGetSize, /* 149 */ + Tk_PhotoSetSize, /* 150 */ + Tk_PointToChar, /* 151 */ + Tk_PostscriptFontName, /* 152 */ + Tk_PreserveColormap, /* 153 */ + Tk_QueueWindowEvent, /* 154 */ + Tk_RedrawImage, /* 155 */ + Tk_ResizeWindow, /* 156 */ + Tk_RestackWindow, /* 157 */ + Tk_RestrictEvents, /* 158 */ + Tk_SafeInit, /* 159 */ + Tk_SetAppName, /* 160 */ + Tk_SetBackgroundFromBorder, /* 161 */ + Tk_SetClass, /* 162 */ + Tk_SetGrid, /* 163 */ + Tk_SetInternalBorder, /* 164 */ + Tk_SetWindowBackground, /* 165 */ + Tk_SetWindowBackgroundPixmap, /* 166 */ + Tk_SetWindowBorder, /* 167 */ + Tk_SetWindowBorderWidth, /* 168 */ + Tk_SetWindowBorderPixmap, /* 169 */ + Tk_SetWindowColormap, /* 170 */ + Tk_SetWindowVisual, /* 171 */ + Tk_SizeOfBitmap, /* 172 */ + Tk_SizeOfImage, /* 173 */ + Tk_StrictMotif, /* 174 */ + Tk_TextLayoutToPostscript, /* 175 */ + Tk_TextWidth, /* 176 */ + Tk_UndefineCursor, /* 177 */ + Tk_UnderlineChars, /* 178 */ + Tk_UnderlineTextLayout, /* 179 */ + Tk_Ungrab, /* 180 */ + Tk_UnmaintainGeometry, /* 181 */ + Tk_UnmapWindow, /* 182 */ + Tk_UnsetGrid, /* 183 */ + Tk_UpdatePointer, /* 184 */ + Tk_AllocBitmapFromObj, /* 185 */ + Tk_Alloc3DBorderFromObj, /* 186 */ + Tk_AllocColorFromObj, /* 187 */ + Tk_AllocCursorFromObj, /* 188 */ + Tk_AllocFontFromObj, /* 189 */ + Tk_CreateOptionTable, /* 190 */ + Tk_DeleteOptionTable, /* 191 */ + Tk_Free3DBorderFromObj, /* 192 */ + Tk_FreeBitmapFromObj, /* 193 */ + Tk_FreeColorFromObj, /* 194 */ + Tk_FreeConfigOptions, /* 195 */ + Tk_FreeSavedOptions, /* 196 */ + Tk_FreeCursorFromObj, /* 197 */ + Tk_FreeFontFromObj, /* 198 */ + Tk_Get3DBorderFromObj, /* 199 */ + Tk_GetAnchorFromObj, /* 200 */ + Tk_GetBitmapFromObj, /* 201 */ + Tk_GetColorFromObj, /* 202 */ + Tk_GetCursorFromObj, /* 203 */ + Tk_GetOptionInfo, /* 204 */ + Tk_GetOptionValue, /* 205 */ + Tk_GetJustifyFromObj, /* 206 */ + Tk_GetMMFromObj, /* 207 */ + Tk_GetPixelsFromObj, /* 208 */ + Tk_GetReliefFromObj, /* 209 */ + Tk_GetScrollInfoObj, /* 210 */ + Tk_InitOptions, /* 211 */ + Tk_MainEx, /* 212 */ + Tk_RestoreSavedOptions, /* 213 */ + Tk_SetOptions, /* 214 */ +}; /* !END!: Do not edit above this line. */ diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c index 438226f..9d14a6d 100644 --- a/generic/tkStubLib.c +++ b/generic/tkStubLib.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: tkStubLib.c,v 1.3 1999/04/16 01:51:22 stanton Exp $ + * RCS: @(#) $Id: tkStubLib.c,v 1.3.4.1 1999/04/24 00:11:36 stanton Exp $ */ /* @@ -31,12 +31,15 @@ #endif #undef USE_TK_STUB_PROCS -#include "tkInt.h" #include "tkPort.h" +#include "tkInt.h" #ifdef __WIN32__ #include "tkWinInt.h" #endif +#ifdef MAC_TCL +#include "tkMacInt.h" +#endif #include "tkDecls.h" #include "tkIntDecls.h" |