[Patch 3034251]: Backport ttkGenStubs.tcl features to genStubs.tcl, partly:

Use void (*reserved$i)(void) = 0 instead of void *reserved$i = NULL for unused stub entries, in case pointer-to-function and pointer-to-object are different sizes.

6 files changed, 130 insertions, 125 deletions

diff --git a/ChangeLog b/ChangeLog
index effec7c..3fdfaf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-21  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tk*Decls.h:   (regenerated with modified genStubs.tcl)
+	* generic/tk*StubInit.c
+
 2010-08-18  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/ttk/ttkGenStubs.tcl [Patch 3034251] partly: remove
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index e839171..280c0c9 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.49 2010/08/19 05:05:55 nijtmans Exp $
+ * RCS: @(#) $Id: tkDecls.h,v 1.50 2010/08/21 16:35:34 nijtmans Exp $
  */
 
 #ifndef _TKDECLS
@@ -1100,8 +1100,8 @@ typedef struct TkStubs {
     void (*tk_InitConsoleChannels) (Tcl_Interp *interp); /* 215 */
     int (*tk_CreateConsoleWindow) (Tcl_Interp *interp); /* 216 */
     void (*tk_CreateSmoothMethod) (Tcl_Interp *interp, const Tk_SmoothMethod *method); /* 217 */
-    void *reserved218;
-    void *reserved219;
+    void (*reserved218)(void);
+    void (*reserved219)(void);
     int (*tk_GetDash) (Tcl_Interp *interp, const char *value, Tk_Dash *dash); /* 220 */
     void (*tk_CreateOutline) (Tk_Outline *outline); /* 221 */
     void (*tk_DeleteOutline) (Display *display, Tk_Outline *outline); /* 222 */
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 2b27d8e..6eaf8f9 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.53 2010/08/19 05:05:55 nijtmans Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.54 2010/08/21 16:35:32 nijtmans Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -589,15 +589,15 @@ typedef struct TkIntStubs {
     TkWindow * (*tkAllocWindow) (TkDisplay *dispPtr, int screenNum, TkWindow *parentPtr); /* 0 */
     void (*tkBezierPoints) (double control[], int numSteps, double *coordPtr); /* 1 */
     void (*tkBezierScreenPoints) (Tk_Canvas canvas, double control[], int numSteps, XPoint *xPointPtr); /* 2 */
-    void *reserved3;
+    void (*reserved3)(void);
     void (*tkBindEventProc) (TkWindow *winPtr, XEvent *eventPtr); /* 4 */
     void (*tkBindFree) (TkMainInfo *mainPtr); /* 5 */
     void (*tkBindInit) (TkMainInfo *mainPtr); /* 6 */
     void (*tkChangeEventWindow) (XEvent *eventPtr, TkWindow *winPtr); /* 7 */
     int (*tkClipInit) (Tcl_Interp *interp, TkDisplay *dispPtr); /* 8 */
     void (*tkComputeAnchor) (Tk_Anchor anchor, Tk_Window tkwin, int padX, int padY, int innerWidth, int innerHeight, int *xPtr, int *yPtr); /* 9 */
-    void *reserved10;
-    void *reserved11;
+    void (*reserved10)(void);
+    void (*reserved11)(void);
     TkCursor * (*tkCreateCursorFromData) (Tk_Window tkwin, const char *source, const char *mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg); /* 12 */
     int (*tkCreateFrame) (ClientData clientData, Tcl_Interp *interp, int argc, const char *const *argv, int toplevel, const char *appName); /* 13 */
     Tk_Window (*tkCreateMainWindow) (Tcl_Interp *interp, const char *screenName, const char *baseName); /* 14 */
@@ -662,7 +662,7 @@ typedef struct TkIntStubs {
     void (*tkpRedirectKeyEvent) (TkWindow *winPtr, XEvent *eventPtr); /* 73 */
     void (*tkpSetMainMenubar) (Tcl_Interp *interp, Tk_Window tkwin, const char *menuName); /* 74 */
     int (*tkpUseWindow) (Tcl_Interp *interp, Tk_Window tkwin, const char *string); /* 75 */
-    void *reserved76;
+    void (*reserved76)(void);
     void (*tkQueueEventForAllChildren) (TkWindow *winPtr, XEvent *eventPtr); /* 77 */
     int (*tkReadBitmapFile) (Display *display, Drawable d, const char *filename, unsigned int *width_return, unsigned int *height_return, Pixmap *bitmap_return, int *x_hot_return, int *y_hot_return); /* 78 */
     int (*tkScrollWindow) (Tk_Window tkwin, GC gc, int x, int y, int width, int height, int dx, int dy, TkRegion damageRgn); /* 79 */
@@ -670,7 +670,7 @@ typedef struct TkIntStubs {
     void (*tkSelEventProc) (Tk_Window tkwin, XEvent *eventPtr); /* 81 */
     void (*tkSelInit) (Tk_Window tkwin); /* 82 */
     void (*tkSelPropProc) (XEvent *eventPtr); /* 83 */
-    void *reserved84;
+    void (*reserved84)(void);
     void (*tkSetWindowMenuBar) (Tcl_Interp *interp, Tk_Window tkwin, const char *oldMenuName, const char *menuName); /* 85 */
     KeySym (*tkStringToKeysym) (const char *name); /* 86 */
     int (*tkThickPolyLineToArea) (double *coordPtr, int numPoints, double width, int capStyle, int joinStyle, double *rectPtr); /* 87 */
@@ -700,117 +700,117 @@ typedef struct TkIntStubs {
     Tcl_Obj * (*tkpGetSystemDefault) (Tk_Window tkwin, const char *dbName, const char *className); /* 111 */
     void (*tkpMenuThreadInit) (void); /* 112 */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    void *reserved113;
+    void (*reserved113)(void);
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     void (*tkClipBox) (TkRegion rgn, XRectangle *rect_return); /* 113 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void *reserved113; /* Dummy entry for stubs table backwards compatibility */
+    void (*reserved113)(void); /* Dummy entry for stubs table backwards compatibility */
     void (*tkClipBox) (TkRegion rgn, XRectangle *rect_return); /* 113 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    void *reserved114;
+    void (*reserved114)(void);
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     TkRegion (*tkCreateRegion) (void); /* 114 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void *reserved114; /* Dummy entry for stubs table backwards compatibility */
+    void (*reserved114)(void); /* Dummy entry for stubs table backwards compatibility */
     TkRegion (*tkCreateRegion) (void); /* 114 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    void *reserved115;
+    void (*reserved115)(void);
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     void (*tkDestroyRegion) (TkRegion rgn); /* 115 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void *reserved115; /* Dummy entry for stubs table backwards compatibility */
+    void (*reserved115)(void); /* Dummy entry for stubs table backwards compatibility */
     void (*tkDestroyRegion) (TkRegion rgn); /* 115 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    void *reserved116;
+    void (*reserved116)(void);
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     void (*tkIntersectRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 116 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void *reserved116; /* Dummy entry for stubs table backwards compatibility */
+    void (*reserved116)(void); /* Dummy entry for stubs table backwards compatibility */
     void (*tkIntersectRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 116 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    void *reserved117;
+    void (*reserved117)(void);
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     int (*tkRectInRegion) (TkRegion rgn, int x, int y, unsigned int width, unsigned int height); /* 117 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void *reserved117; /* Dummy entry for stubs table backwards compatibility */
+    void (*reserved117)(void); /* Dummy entry for stubs table backwards compatibility */
     int (*tkRectInRegion) (TkRegion rgn, int x, int y, unsigned int width, unsigned int height); /* 117 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    void *reserved118;
+    void (*reserved118)(void);
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     void (*tkSetRegion) (Display *display, GC gc, TkRegion rgn); /* 118 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void *reserved118; /* Dummy entry for stubs table backwards compatibility */
+    void (*reserved118)(void); /* Dummy entry for stubs table backwards compatibility */
     void (*tkSetRegion) (Display *display, GC gc, TkRegion rgn); /* 118 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    void *reserved119;
+    void (*reserved119)(void);
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     void (*tkUnionRectWithRegion) (XRectangle *rect, TkRegion src, TkRegion dr_return); /* 119 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void *reserved119; /* Dummy entry for stubs table backwards compatibility */
+    void (*reserved119)(void); /* Dummy entry for stubs table backwards compatibility */
     void (*tkUnionRectWithRegion) (XRectangle *rect, TkRegion src, TkRegion dr_return); /* 119 */
 #endif /* AQUA */
-    void *reserved120;
+    void (*reserved120)(void);
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    void *reserved121;
+    void (*reserved121)(void);
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
-    void *reserved121;
+    void (*reserved121)(void);
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void *reserved121; /* Dummy entry for stubs table backwards compatibility */
+    void (*reserved121)(void); /* Dummy entry for stubs table backwards compatibility */
     Pixmap (*tkpCreateNativeBitmap) (Display *display, const void *source); /* 121 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    void *reserved122;
+    void (*reserved122)(void);
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
-    void *reserved122;
+    void (*reserved122)(void);
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void *reserved122; /* Dummy entry for stubs table backwards compatibility */
+    void (*reserved122)(void); /* Dummy entry for stubs table backwards compatibility */
     void (*tkpDefineNativeBitmaps) (void); /* 122 */
 #endif /* AQUA */
-    void *reserved123;
+    void (*reserved123)(void);
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    void *reserved124;
+    void (*reserved124)(void);
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
-    void *reserved124;
+    void (*reserved124)(void);
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void *reserved124; /* Dummy entry for stubs table backwards compatibility */
+    void (*reserved124)(void); /* Dummy entry for stubs table backwards compatibility */
     Pixmap (*tkpGetNativeAppBitmap) (Display *display, const char *name, int *width, int *height); /* 124 */
 #endif /* AQUA */
-    void *reserved125;
-    void *reserved126;
-    void *reserved127;
-    void *reserved128;
-    void *reserved129;
-    void *reserved130;
-    void *reserved131;
-    void *reserved132;
-    void *reserved133;
-    void *reserved134;
+    void (*reserved125)(void);
+    void (*reserved126)(void);
+    void (*reserved127)(void);
+    void (*reserved128)(void);
+    void (*reserved129)(void);
+    void (*reserved130)(void);
+    void (*reserved131)(void);
+    void (*reserved132)(void);
+    void (*reserved133)(void);
+    void (*reserved134)(void);
     void (*tkpDrawHighlightBorder) (Tk_Window tkwin, GC fgGC, GC bgGC, int highlightWidth, Drawable drawable); /* 135 */
     void (*tkSetFocusWin) (TkWindow *winPtr, int force); /* 136 */
     void (*tkpSetKeycodeAndState) (Tk_Window tkwin, KeySym keySym, XEvent *eventPtr); /* 137 */
@@ -822,13 +822,13 @@ typedef struct TkIntStubs {
     void (*tkClipCleanup) (TkDisplay *dispPtr); /* 143 */
     void (*tkGCCleanup) (TkDisplay *dispPtr); /* 144 */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    void *reserved145;
+    void (*reserved145)(void);
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     void (*tkSubtractRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 145 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void *reserved145; /* Dummy entry for stubs table backwards compatibility */
+    void (*reserved145)(void); /* Dummy entry for stubs table backwards compatibility */
     void (*tkSubtractRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 145 */
 #endif /* AQUA */
     void (*tkStylePkgInit) (TkMainInfo *mainPtr); /* 146 */
@@ -840,7 +840,7 @@ typedef struct TkIntStubs {
     void (*tkpDrawFrame) (Tk_Window tkwin, Tk_3DBorder border, int highlightWidth, int borderWidth, int relief); /* 152 */
     void (*tkCreateThreadExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 153 */
     void (*tkDeleteThreadExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 154 */
-    void *reserved155;
+    void (*reserved155)(void);
     int (*tkpTestembedCmd) (ClientData clientData, Tcl_Interp *interp, int argc, const char **argv); /* 156 */
     int (*tkpTesttextCmd) (ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); /* 157 */
     int (*tkSelGetSelection) (Tcl_Interp *interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc *proc, ClientData clientData); /* 158 */
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 1fb81bf..0de1b83 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.39 2010/08/19 05:05:54 nijtmans Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.40 2010/08/21 16:35:31 nijtmans Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -269,7 +269,7 @@ typedef struct TkIntPlatStubs {
 
 #ifdef __WIN32__ /* WIN */
     char * (*tkAlignImageData) (XImage *image, int alignment, int bitOrder); /* 0 */
-    void *reserved1;
+    void (*reserved1)(void);
     void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 2 */
     unsigned long (*tkpGetMS) (void); /* 3 */
     void (*tkPointerDeadWindow) (TkWindow *winPtr); /* 4 */
@@ -308,8 +308,8 @@ typedef struct TkIntPlatStubs {
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 0 */
-    void *reserved1;
-    void *reserved2;
+    void (*reserved1)(void);
+    void (*reserved2)(void);
     void (*tkPointerDeadWindow) (TkWindow *winPtr); /* 3 */
     void (*tkpSetCapture) (TkWindow *winPtr); /* 4 */
     void (*tkpSetCursor) (TkpCursor cursor); /* 5 */
@@ -320,14 +320,14 @@ typedef struct TkIntPlatStubs {
     int (*tkMacOSXDispatchMenuEvent) (int menuID, int index); /* 10 */
     void (*tkMacOSXInstallCursor) (int resizeOverride); /* 11 */
     void (*tkMacOSXHandleTearoffMenu) (void); /* 12 */
-    void *reserved13;
+    void (*reserved13)(void);
     int (*tkMacOSXDoHLEvent) (void *theEvent); /* 14 */
-    void *reserved15;
+    void (*reserved15)(void);
     Window (*tkMacOSXGetXWindow) (void *macWinPtr); /* 16 */
     int (*tkMacOSXGrowToplevel) (void *whichWindow, XPoint start); /* 17 */
     void (*tkMacOSXHandleMenuSelect) (short theMenu, unsigned short theItem, int optionKeyPressed); /* 18 */
-    void *reserved19;
-    void *reserved20;
+    void (*reserved19)(void);
+    void (*reserved20)(void);
     void (*tkMacOSXInvalidateWindow) (MacDrawable *macWin, int flag); /* 21 */
     int (*tkMacOSXIsCharacterMissing) (Tk_Font tkfont, unsigned int searchChar); /* 22 */
     void (*tkMacOSXMakeRealWindowExist) (TkWindow *winPtr); /* 23 */
@@ -355,17 +355,17 @@ typedef struct TkIntPlatStubs {
     void (*tkMacOSXPreprocessMenu) (void); /* 45 */
     int (*tkpIsWindowFloating) (void *window); /* 46 */
     Tk_Window (*tkMacOSXGetCapture) (void); /* 47 */
-    void *reserved48;
+    void (*reserved48)(void);
     Window (*tkGetTransientMaster) (TkWindow *winPtr); /* 49 */
     int (*tkGenerateButtonEvent) (int x, int y, Window window, unsigned int state); /* 50 */
     void (*tkGenWMDestroyEvent) (Tk_Window tkwin); /* 51 */
-    void *reserved52;
+    void (*reserved52)(void);
     unsigned long (*tkpGetMS) (void); /* 53 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void (*tkCreateXEventSource) (void); /* 0 */
-    void *reserved1;
-    void *reserved2;
+    void (*reserved1)(void);
+    void (*reserved2)(void);
     int (*tkpCmapStressed) (Tk_Window tkwin, Colormap colormap); /* 3 */
     void (*tkpSync) (Display *display); /* 4 */
     Window (*tkUnixContainerId) (TkWindow *winPtr); /* 5 */
@@ -374,7 +374,7 @@ typedef struct TkIntPlatStubs {
     int (*tkpScanWindowId) (Tcl_Interp *interp, const char *string, Window *idPtr); /* 8 */
     void (*tkWmCleanup) (TkDisplay *dispPtr); /* 9 */
     void (*tkSendCleanup) (TkDisplay *dispPtr); /* 10 */
-    void *reserved11;
+    void (*reserved11)(void);
     int (*tkpWmSetState) (TkWindow *winPtr, int state); /* 12 */
     int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp *interp, int argc, const char **argv); /* 13 */
 #endif /* X11 */
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 8ce9ab6..1149d39 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.31 2010/08/19 05:05:55 nijtmans Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.32 2010/08/21 16:35:33 nijtmans Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -687,7 +687,7 @@ typedef struct TkIntXlibStubs {
     Bool (*xFilterEvent) (XEvent *x, Window w); /* 78 */
     int (*xmbLookupString) (XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s); /* 79 */
     void (*tkPutImage) (unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height); /* 80 */
-    void *reserved81;
+    void (*reserved81)(void);
     Status (*xParseColor) (Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 82 */
     GC (*xCreateGC) (Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 83 */
     void (*xFreeGC) (Display *display, GC gc); /* 84 */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index d9b8c95..0bf6634 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.75 2010/06/21 12:14:08 nijtmans Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.76 2010/08/21 16:35:34 nijtmans Exp $
  */
 
 #include "tkInt.h"
@@ -44,19 +44,19 @@ MODULE_SCOPE const TkStubs tkStubs;
 
 static const TkIntStubs tkIntStubs = {
     TCL_STUB_MAGIC,
-    NULL,
+    0,
     TkAllocWindow, /* 0 */
     TkBezierPoints, /* 1 */
     TkBezierScreenPoints, /* 2 */
-    NULL, /* 3 */
+    0, /* 3 */
     TkBindEventProc, /* 4 */
     TkBindFree, /* 5 */
     TkBindInit, /* 6 */
     TkChangeEventWindow, /* 7 */
     TkClipInit, /* 8 */
     TkComputeAnchor, /* 9 */
-    NULL, /* 10 */
-    NULL, /* 11 */
+    0, /* 10 */
+    0, /* 11 */
     TkCreateCursorFromData, /* 12 */
     TkCreateFrame, /* 13 */
     TkCreateMainWindow, /* 14 */
@@ -121,7 +121,7 @@ static const TkIntStubs tkIntStubs = {
     TkpRedirectKeyEvent, /* 73 */
     TkpSetMainMenubar, /* 74 */
     TkpUseWindow, /* 75 */
-    NULL, /* 76 */
+    0, /* 76 */
     TkQueueEventForAllChildren, /* 77 */
     TkReadBitmapFile, /* 78 */
     TkScrollWindow, /* 79 */
@@ -129,7 +129,7 @@ static const TkIntStubs tkIntStubs = {
     TkSelEventProc, /* 81 */
     TkSelInit, /* 82 */
     TkSelPropProc, /* 83 */
-    NULL, /* 84 */
+    0, /* 84 */
     TkSetWindowMenuBar, /* 85 */
     TkStringToKeysym, /* 86 */
     TkThickPolyLineToArea, /* 87 */
@@ -159,117 +159,117 @@ static const TkIntStubs tkIntStubs = {
     TkpGetSystemDefault, /* 111 */
     TkpMenuThreadInit, /* 112 */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 113 */
+    0, /* 113 */
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     TkClipBox, /* 113 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 113 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 113 */ /* Dummy entry for stubs table backwards compatibility */
     TkClipBox, /* 113 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 114 */
+    0, /* 114 */
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     TkCreateRegion, /* 114 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 114 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 114 */ /* Dummy entry for stubs table backwards compatibility */
     TkCreateRegion, /* 114 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 115 */
+    0, /* 115 */
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     TkDestroyRegion, /* 115 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 115 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 115 */ /* Dummy entry for stubs table backwards compatibility */
     TkDestroyRegion, /* 115 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 116 */
+    0, /* 116 */
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     TkIntersectRegion, /* 116 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 116 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 116 */ /* Dummy entry for stubs table backwards compatibility */
     TkIntersectRegion, /* 116 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 117 */
+    0, /* 117 */
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     TkRectInRegion, /* 117 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 117 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 117 */ /* Dummy entry for stubs table backwards compatibility */
     TkRectInRegion, /* 117 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 118 */
+    0, /* 118 */
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     TkSetRegion, /* 118 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 118 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 118 */ /* Dummy entry for stubs table backwards compatibility */
     TkSetRegion, /* 118 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 119 */
+    0, /* 119 */
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     TkUnionRectWithRegion, /* 119 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 119 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 119 */ /* Dummy entry for stubs table backwards compatibility */
     TkUnionRectWithRegion, /* 119 */
 #endif /* AQUA */
-    NULL, /* 120 */
+    0, /* 120 */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 121 */
+    0, /* 121 */
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
-    NULL, /* 121 */
+    0, /* 121 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 121 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 121 */ /* Dummy entry for stubs table backwards compatibility */
     TkpCreateNativeBitmap, /* 121 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 122 */
+    0, /* 122 */
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
-    NULL, /* 122 */
+    0, /* 122 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 122 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 122 */ /* Dummy entry for stubs table backwards compatibility */
     TkpDefineNativeBitmaps, /* 122 */
 #endif /* AQUA */
-    NULL, /* 123 */
+    0, /* 123 */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 124 */
+    0, /* 124 */
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
-    NULL, /* 124 */
+    0, /* 124 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 124 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 124 */ /* Dummy entry for stubs table backwards compatibility */
     TkpGetNativeAppBitmap, /* 124 */
 #endif /* AQUA */
-    NULL, /* 125 */
-    NULL, /* 126 */
-    NULL, /* 127 */
-    NULL, /* 128 */
-    NULL, /* 129 */
-    NULL, /* 130 */
-    NULL, /* 131 */
-    NULL, /* 132 */
-    NULL, /* 133 */
-    NULL, /* 134 */
+    0, /* 125 */
+    0, /* 126 */
+    0, /* 127 */
+    0, /* 128 */
+    0, /* 129 */
+    0, /* 130 */
+    0, /* 131 */
+    0, /* 132 */
+    0, /* 133 */
+    0, /* 134 */
     TkpDrawHighlightBorder, /* 135 */
     TkSetFocusWin, /* 136 */
     TkpSetKeycodeAndState, /* 137 */
@@ -281,13 +281,13 @@ static const TkIntStubs tkIntStubs = {
     TkClipCleanup, /* 143 */
     TkGCCleanup, /* 144 */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 145 */
+    0, /* 145 */
 #endif /* X11 */
 #ifdef __WIN32__ /* WIN */
     TkSubtractRegion, /* 145 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 145 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 145 */ /* Dummy entry for stubs table backwards compatibility */
     TkSubtractRegion, /* 145 */
 #endif /* AQUA */
     TkStylePkgInit, /* 146 */
@@ -299,7 +299,7 @@ static const TkIntStubs tkIntStubs = {
     TkpDrawFrame, /* 152 */
     TkCreateThreadExitHandler, /* 153 */
     TkDeleteThreadExitHandler, /* 154 */
-    NULL, /* 155 */
+    0, /* 155 */
     TkpTestembedCmd, /* 156 */
     TkpTesttextCmd, /* 157 */
     TkSelGetSelection, /* 158 */
@@ -329,10 +329,10 @@ static const TkIntStubs tkIntStubs = {
 
 static const TkIntPlatStubs tkIntPlatStubs = {
     TCL_STUB_MAGIC,
-    NULL,
+    0,
 #ifdef __WIN32__ /* WIN */
     TkAlignImageData, /* 0 */
-    NULL, /* 1 */
+    0, /* 1 */
     TkGenerateActivateEvents, /* 2 */
     TkpGetMS, /* 3 */
     TkPointerDeadWindow, /* 4 */
@@ -371,8 +371,8 @@ static const TkIntPlatStubs tkIntPlatStubs = {
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     TkGenerateActivateEvents, /* 0 */
-    NULL, /* 1 */
-    NULL, /* 2 */
+    0, /* 1 */
+    0, /* 2 */
     TkPointerDeadWindow, /* 3 */
     TkpSetCapture, /* 4 */
     TkpSetCursor, /* 5 */
@@ -383,14 +383,14 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXDispatchMenuEvent, /* 10 */
     TkMacOSXInstallCursor, /* 11 */
     TkMacOSXHandleTearoffMenu, /* 12 */
-    NULL, /* 13 */
+    0, /* 13 */
     TkMacOSXDoHLEvent, /* 14 */
-    NULL, /* 15 */
+    0, /* 15 */
     TkMacOSXGetXWindow, /* 16 */
     TkMacOSXGrowToplevel, /* 17 */
     TkMacOSXHandleMenuSelect, /* 18 */
-    NULL, /* 19 */
-    NULL, /* 20 */
+    0, /* 19 */
+    0, /* 20 */
     TkMacOSXInvalidateWindow, /* 21 */
     TkMacOSXIsCharacterMissing, /* 22 */
     TkMacOSXMakeRealWindowExist, /* 23 */
@@ -418,17 +418,17 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXPreprocessMenu, /* 45 */
     TkpIsWindowFloating, /* 46 */
     TkMacOSXGetCapture, /* 47 */
-    NULL, /* 48 */
+    0, /* 48 */
     TkGetTransientMaster, /* 49 */
     TkGenerateButtonEvent, /* 50 */
     TkGenWMDestroyEvent, /* 51 */
-    NULL, /* 52 */
+    0, /* 52 */
     TkpGetMS, /* 53 */
 #endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     TkCreateXEventSource, /* 0 */
-    NULL, /* 1 */
-    NULL, /* 2 */
+    0, /* 1 */
+    0, /* 2 */
     TkpCmapStressed, /* 3 */
     TkpSync, /* 4 */
     TkUnixContainerId, /* 5 */
@@ -437,7 +437,7 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkpScanWindowId, /* 8 */
     TkWmCleanup, /* 9 */
     TkSendCleanup, /* 10 */
-    NULL, /* 11 */
+    0, /* 11 */
     TkpWmSetState, /* 12 */
     TkpTestsendCmd, /* 13 */
 #endif /* X11 */
@@ -445,7 +445,7 @@ static const TkIntPlatStubs tkIntPlatStubs = {
 
 static const TkIntXlibStubs tkIntXlibStubs = {
     TCL_STUB_MAGIC,
-    NULL,
+    0,
 #ifdef __WIN32__ /* WIN */
     XSetDashes, /* 0 */
     XGetModifierMapping, /* 1 */
@@ -528,7 +528,7 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     XFilterEvent, /* 78 */
     XmbLookupString, /* 79 */
     TkPutImage, /* 80 */
-    NULL, /* 81 */
+    0, /* 81 */
     XParseColor, /* 82 */
     XCreateGC, /* 83 */
     XFreeGC, /* 84 */
@@ -653,7 +653,7 @@ static const TkIntXlibStubs tkIntXlibStubs = {
 
 static const TkPlatStubs tkPlatStubs = {
     TCL_STUB_MAGIC,
-    NULL,
+    0,
 #ifdef __WIN32__ /* WIN */
     Tk_AttachHWND, /* 0 */
     Tk_GetHINSTANCE, /* 1 */
@@ -905,8 +905,8 @@ const TkStubs tkStubs = {
     Tk_InitConsoleChannels, /* 215 */
     Tk_CreateConsoleWindow, /* 216 */
     Tk_CreateSmoothMethod, /* 217 */
-    NULL, /* 218 */
-    NULL, /* 219 */
+    0, /* 218 */
+    0, /* 219 */
     Tk_GetDash, /* 220 */
     Tk_CreateOutline, /* 221 */
     Tk_DeleteOutline, /* 222 */