diff options
Diffstat (limited to 'generic/tkStubInit.c')
| -rw-r--r-- | generic/tkStubInit.c | 78 |
1 files changed, 58 insertions, 20 deletions
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index dc22008..c2ef290 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -10,11 +10,11 @@ */ #include "tkInt.h" -#include "tkPort.h" -#if !(defined(__WIN32__) && defined(MAC_OSX_TK)) +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* UNIX */ #define UNIX_TK +#include "tkUnixInt.h" #endif #ifdef __WIN32__ @@ -22,14 +22,12 @@ #endif #if defined(MAC_OSX_TK) -/* set this locally .. we could have used _TKMACINT */ +/* we could have used _TKMACINT */ #include "tkMacOSXInt.h" #endif -#include "tkDecls.h" +/* TODO: These ought to come in some other way */ #include "tkPlatDecls.h" -#include "tkIntDecls.h" -#include "tkIntPlatDecls.h" #include "tkIntXlibDecls.h" #ifdef __WIN32__ @@ -86,6 +84,7 @@ XVisualIDFromVisual(Visual *visual) # define TkUnixSetMenubar 0 # define TkWmCleanup (void (*) (TkDisplay *)) doNothing # define TkSendCleanup (void (*) (TkDisplay *)) doNothing +# define TkpTestsendCmd 0 # define XFlush (int (*) (Display *)) doNothing # define XGrabServer (int (*) (Display *)) doNothing # define XUngrabServer (int (*) (Display *)) doNothing @@ -247,14 +246,14 @@ void TkSubtractRegion (TkRegion a, TkRegion b, TkRegion c) # undef TkUnionRectWithRegion # undef TkSubtractRegion -# define TkClipBox (void (*) _ANSI_ARGS_((TkRegion, XRectangle *))) XClipBox +# define TkClipBox (void (*) (TkRegion, XRectangle *)) XClipBox # define TkCreateRegion (TkRegion (*) ()) XCreateRegion -# define TkDestroyRegion (void (*) _ANSI_ARGS_((TkRegion))) XDestroyRegion -# define TkIntersectRegion (void (*) _ANSI_ARGS_((TkRegion, TkRegion, TkRegion))) XIntersectRegion -# define TkRectInRegion (int (*) _ANSI_ARGS_((TkRegion, int, int, unsigned int, unsigned int))) XRectInRegion -# define TkSetRegion (void (*) _ANSI_ARGS_((Display *, GC, TkRegion))) XSetRegion -# define TkUnionRectWithRegion (void (*) _ANSI_ARGS_((XRectangle *, TkRegion, TkRegion))) XUnionRectWithRegion -# define TkSubtractRegion (void (*) _ANSI_ARGS_((TkRegion, TkRegion, TkRegion))) XSubtractRegion +# define TkDestroyRegion (void (*) (TkRegion)) XDestroyRegion +# define TkIntersectRegion (void (*) (TkRegion, TkRegion, TkRegion)) XIntersectRegion +# define TkRectInRegion (int (*) (TkRegion, int, int, unsigned int, unsigned int)) XRectInRegion +# define TkSetRegion (void (*) (Display *, GC, TkRegion)) XSetRegion +# define TkUnionRectWithRegion (void (*) (XRectangle *, TkRegion, TkRegion)) XUnionRectWithRegion +# define TkSubtractRegion (void (*) (TkRegion, TkRegion, TkRegion)) XSubtractRegion # endif #endif /* !__WIN32__ */ @@ -446,9 +445,37 @@ TkIntStubs tkIntStubs = { TkStylePkgFree, /* 147 */ TkToplevelWindowForCommand, /* 148 */ TkGetOptionSpec, /* 149 */ - NULL, /* 150 */ - NULL, /* 151 */ + TkMakeRawCurve, /* 150 */ + TkMakeRawCurvePostscript, /* 151 */ TkpDrawFrame, /* 152 */ + TkCreateThreadExitHandler, /* 153 */ + TkDeleteThreadExitHandler, /* 154 */ + NULL, /* 155 */ + TkpTestembedCmd, /* 156 */ + TkpTesttextCmd, /* 157 */ + NULL, /* 158 */ + NULL, /* 159 */ + NULL, /* 160 */ + NULL, /* 161 */ + NULL, /* 162 */ + NULL, /* 163 */ + NULL, /* 164 */ + NULL, /* 165 */ + NULL, /* 166 */ + NULL, /* 167 */ + NULL, /* 168 */ + TkStateParseProc, /* 169 */ + TkStatePrintProc, /* 170 */ + TkCanvasDashParseProc, /* 171 */ + TkCanvasDashPrintProc, /* 172 */ + TkOffsetParseProc, /* 173 */ + TkOffsetPrintProc, /* 174 */ + TkPixelParseProc, /* 175 */ + TkPixelPrintProc, /* 176 */ + TkOrientParseProc, /* 177 */ + TkOrientPrintProc, /* 178 */ + TkSmoothParseProc, /* 179 */ + TkSmoothPrintProc, /* 180 */ }; TkIntPlatStubs tkIntPlatStubs = { @@ -500,6 +527,7 @@ TkIntPlatStubs tkIntPlatStubs = { TkUnixSetMenubar, /* 42 */ TkWmCleanup, /* 43 */ TkSendCleanup, /* 44 */ + TkpTestsendCmd, /* 45 */ #endif /* WIN */ #ifdef MAC_OSX_TK /* AQUA */ TkGenerateActivateEvents, /* 0 */ @@ -556,6 +584,7 @@ TkIntPlatStubs tkIntPlatStubs = { TkGenWMDestroyEvent, /* 51 */ NULL, /* 52 */ TkpGetMS, /* 53 */ + TkMacOSXDrawable, /* 54 */ #endif /* AQUA */ #if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */ TkCreateXEventSource, /* 0 */ @@ -571,6 +600,7 @@ TkIntPlatStubs tkIntPlatStubs = { TkSendCleanup, /* 10 */ TkFreeXId, /* 11 */ TkpWmSetState, /* 12 */ + TkpTestsendCmd, /* 13 */ #endif /* X11 */ }; @@ -974,9 +1004,9 @@ TkStubs tkStubs = { Tk_PhotoPutZoomedBlock_NoComposite, /* 145 */ Tk_PhotoGetImage, /* 146 */ Tk_PhotoBlank, /* 147 */ - Tk_PhotoExpand, /* 148 */ + Tk_PhotoExpand_Panic, /* 148 */ Tk_PhotoGetSize, /* 149 */ - Tk_PhotoSetSize, /* 150 */ + Tk_PhotoSetSize_Panic, /* 150 */ Tk_PointToChar, /* 151 */ Tk_PostscriptFontName, /* 152 */ Tk_PreserveColormap, /* 153 */ @@ -1072,8 +1102,8 @@ TkStubs tkStubs = { Tk_SetInternalBorderEx, /* 243 */ Tk_SetMinimumRequestSize, /* 244 */ Tk_SetCaretPos, /* 245 */ - Tk_PhotoPutBlock, /* 246 */ - Tk_PhotoPutZoomedBlock, /* 247 */ + Tk_PhotoPutBlock_Panic, /* 246 */ + Tk_PhotoPutZoomedBlock_Panic, /* 247 */ Tk_CollapseMotionEvents, /* 248 */ Tk_RegisterStyleEngine, /* 249 */ Tk_GetStyleEngine, /* 250 */ @@ -1091,10 +1121,18 @@ TkStubs tkStubs = { Tk_GetElementBox, /* 262 */ Tk_GetElementBorderWidth, /* 263 */ Tk_DrawElement, /* 264 */ + Tk_PhotoExpand, /* 265 */ + Tk_PhotoPutBlock, /* 266 */ + Tk_PhotoPutZoomedBlock, /* 267 */ + Tk_PhotoSetSize, /* 268 */ + Tk_GetUserInactiveTime, /* 269 */ + Tk_ResetUserInactiveTime, /* 270 */ + Tk_Interp, /* 271 */ + Tk_CreateOldImageType, /* 272 */ + Tk_CreateOldPhotoImageFormat, /* 273 */ }; /* !END!: Do not edit above this line. */ #undef UNIX_TK -#undef MAC_TK #undef MAC_OSX_TK |