* generic/tkIntDecls.h: regen with new genStubs.tcl.

	* generic/tkIntPlatDecls.h:	[Tcl Bug 1834288]
	* generic/tkIntXlibDecls.h:
	* generic/tkPlatDecls.h:
	* generic/tkStubInit.c:

6 files changed, 295 insertions, 261 deletions

diff --git a/ChangeLog b/ChangeLog
index 1f96b59..7ed4998 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-12-10  Daniel Steffen  <das@users.sourceforge.net>
+
+	* generic/tk.decls:		use new genstubs 'export' command to
+	* generic/tkInt.decls:		mark exported symbols not in stubs
+					table [FR 1716117]; cleanup formatting.
+
+	* generic/tkIntDecls.h:		regen with new genStubs.tcl.
+	* generic/tkIntPlatDecls.h:	[Tcl Bug 1834288]
+	* generic/tkIntXlibDecls.h:
+	* generic/tkPlatDecls.h:
+	* generic/tkStubInit.c:
+
 2007-12-10  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
 
 	* tests/safe.test: Ensure list of hidden commands is correct. [Bug
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index c0f082b..c33e2f9 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.29 2006/12/18 16:42:46 dgp Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.30 2007/12/10 15:54:10 das Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -680,135 +680,135 @@ EXTERN Tcl_Obj *	TkpGetSystemDefault (Tk_Window tkwin,
 /* 112 */
 EXTERN void		TkpMenuThreadInit (void);
 #endif
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
 #ifndef TkClipBox_TCL_DECLARED
 #define TkClipBox_TCL_DECLARED
 /* 113 */
 EXTERN void		TkClipBox (TkRegion rgn, XRectangle * rect_return);
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkClipBox_TCL_DECLARED
 #define TkClipBox_TCL_DECLARED
 /* 113 */
 EXTERN void		TkClipBox (TkRegion rgn, XRectangle * rect_return);
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef __WIN32__
+#endif /* AQUA */
+#ifdef __WIN32__ /* WIN */
 #ifndef TkCreateRegion_TCL_DECLARED
 #define TkCreateRegion_TCL_DECLARED
 /* 114 */
 EXTERN TkRegion		TkCreateRegion (void);
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkCreateRegion_TCL_DECLARED
 #define TkCreateRegion_TCL_DECLARED
 /* 114 */
 EXTERN TkRegion		TkCreateRegion (void);
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef __WIN32__
+#endif /* AQUA */
+#ifdef __WIN32__ /* WIN */
 #ifndef TkDestroyRegion_TCL_DECLARED
 #define TkDestroyRegion_TCL_DECLARED
 /* 115 */
 EXTERN void		TkDestroyRegion (TkRegion rgn);
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkDestroyRegion_TCL_DECLARED
 #define TkDestroyRegion_TCL_DECLARED
 /* 115 */
 EXTERN void		TkDestroyRegion (TkRegion rgn);
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef __WIN32__
+#endif /* AQUA */
+#ifdef __WIN32__ /* WIN */
 #ifndef TkIntersectRegion_TCL_DECLARED
 #define TkIntersectRegion_TCL_DECLARED
 /* 116 */
 EXTERN void		TkIntersectRegion (TkRegion sra, TkRegion srcb, 
 				TkRegion dr_return);
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkIntersectRegion_TCL_DECLARED
 #define TkIntersectRegion_TCL_DECLARED
 /* 116 */
 EXTERN void		TkIntersectRegion (TkRegion sra, TkRegion srcb, 
 				TkRegion dr_return);
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef __WIN32__
+#endif /* AQUA */
+#ifdef __WIN32__ /* WIN */
 #ifndef TkRectInRegion_TCL_DECLARED
 #define TkRectInRegion_TCL_DECLARED
 /* 117 */
 EXTERN int		TkRectInRegion (TkRegion rgn, int x, int y, 
 				unsigned int width, unsigned int height);
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkRectInRegion_TCL_DECLARED
 #define TkRectInRegion_TCL_DECLARED
 /* 117 */
 EXTERN int		TkRectInRegion (TkRegion rgn, int x, int y, 
 				unsigned int width, unsigned int height);
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef __WIN32__
+#endif /* AQUA */
+#ifdef __WIN32__ /* WIN */
 #ifndef TkSetRegion_TCL_DECLARED
 #define TkSetRegion_TCL_DECLARED
 /* 118 */
 EXTERN void		TkSetRegion (Display * display, GC gc, TkRegion rgn);
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkSetRegion_TCL_DECLARED
 #define TkSetRegion_TCL_DECLARED
 /* 118 */
 EXTERN void		TkSetRegion (Display * display, GC gc, TkRegion rgn);
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef __WIN32__
+#endif /* AQUA */
+#ifdef __WIN32__ /* WIN */
 #ifndef TkUnionRectWithRegion_TCL_DECLARED
 #define TkUnionRectWithRegion_TCL_DECLARED
 /* 119 */
 EXTERN void		TkUnionRectWithRegion (XRectangle * rect, 
 				TkRegion src, TkRegion dr_return);
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkUnionRectWithRegion_TCL_DECLARED
 #define TkUnionRectWithRegion_TCL_DECLARED
 /* 119 */
 EXTERN void		TkUnionRectWithRegion (XRectangle * rect, 
 				TkRegion src, TkRegion dr_return);
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 /* Slot 120 is reserved */
-#ifdef MAC_OSX_TK
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkpCreateNativeBitmap_TCL_DECLARED
 #define TkpCreateNativeBitmap_TCL_DECLARED
 /* 121 */
 EXTERN Pixmap		TkpCreateNativeBitmap (Display * display, 
 				CONST char * source);
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef MAC_OSX_TK
+#endif /* AQUA */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkpDefineNativeBitmaps_TCL_DECLARED
 #define TkpDefineNativeBitmaps_TCL_DECLARED
 /* 122 */
 EXTERN void		TkpDefineNativeBitmaps (void);
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 /* Slot 123 is reserved */
-#ifdef MAC_OSX_TK
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkpGetNativeAppBitmap_TCL_DECLARED
 #define TkpGetNativeAppBitmap_TCL_DECLARED
 /* 124 */
 EXTERN Pixmap		TkpGetNativeAppBitmap (Display * display, 
 				CONST char * name, int * width, int * height);
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 /* Slot 125 is reserved */
 /* Slot 126 is reserved */
 /* Slot 127 is reserved */
@@ -872,22 +872,22 @@ EXTERN void		TkClipCleanup (TkDisplay * dispPtr);
 /* 144 */
 EXTERN void		TkGCCleanup (TkDisplay * dispPtr);
 #endif
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
 #ifndef TkSubtractRegion_TCL_DECLARED
 #define TkSubtractRegion_TCL_DECLARED
 /* 145 */
 EXTERN void		TkSubtractRegion (TkRegion sra, TkRegion srcb, 
 				TkRegion dr_return);
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkSubtractRegion_TCL_DECLARED
 #define TkSubtractRegion_TCL_DECLARED
 /* 145 */
 EXTERN void		TkSubtractRegion (TkRegion sra, TkRegion srcb, 
 				TkRegion dr_return);
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 #ifndef TkStylePkgInit_TCL_DECLARED
 #define TkStylePkgInit_TCL_DECLARED
 /* 146 */
@@ -1076,98 +1076,108 @@ typedef struct TkIntStubs {
     void (*tkpGetSubFonts) (Tcl_Interp * interp, Tk_Font tkfont); /* 110 */
     Tcl_Obj * (*tkpGetSystemDefault) (Tk_Window tkwin, CONST char * dbName, CONST char * className); /* 111 */
     void (*tkpMenuThreadInit) (void); /* 112 */
-#if !defined(__WIN32__) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void *reserved113;
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     void (*tkClipBox) (TkRegion rgn, XRectangle * rect_return); /* 113 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void *reserved113; /* Dummy entry for stubs table backwards compatibility */
     void (*tkClipBox) (TkRegion rgn, XRectangle * rect_return); /* 113 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void *reserved114;
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     TkRegion (*tkCreateRegion) (void); /* 114 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void *reserved114; /* Dummy entry for stubs table backwards compatibility */
     TkRegion (*tkCreateRegion) (void); /* 114 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void *reserved115;
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     void (*tkDestroyRegion) (TkRegion rgn); /* 115 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void *reserved115; /* Dummy entry for stubs table backwards compatibility */
     void (*tkDestroyRegion) (TkRegion rgn); /* 115 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void *reserved116;
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     void (*tkIntersectRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 116 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void *reserved116; /* Dummy entry for stubs table backwards compatibility */
     void (*tkIntersectRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 116 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void *reserved117;
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     int (*tkRectInRegion) (TkRegion rgn, int x, int y, unsigned int width, unsigned int height); /* 117 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void *reserved117; /* Dummy entry for stubs table backwards compatibility */
     int (*tkRectInRegion) (TkRegion rgn, int x, int y, unsigned int width, unsigned int height); /* 117 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void *reserved118;
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     void (*tkSetRegion) (Display * display, GC gc, TkRegion rgn); /* 118 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void *reserved118; /* Dummy entry for stubs table backwards compatibility */
     void (*tkSetRegion) (Display * display, GC gc, TkRegion rgn); /* 118 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void *reserved119;
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     void (*tkUnionRectWithRegion) (XRectangle * rect, TkRegion src, TkRegion dr_return); /* 119 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void *reserved119; /* Dummy entry for stubs table backwards compatibility */
     void (*tkUnionRectWithRegion) (XRectangle * rect, TkRegion src, TkRegion dr_return); /* 119 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
     void *reserved120;
-#if !defined(__WIN32__) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void *reserved121;
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     void *reserved121;
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void *reserved121; /* Dummy entry for stubs table backwards compatibility */
     Pixmap (*tkpCreateNativeBitmap) (Display * display, CONST char * source); /* 121 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void *reserved122;
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     void *reserved122;
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void *reserved122; /* Dummy entry for stubs table backwards compatibility */
     void (*tkpDefineNativeBitmaps) (void); /* 122 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
     void *reserved123;
-#if !defined(__WIN32__) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void *reserved124;
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     void *reserved124;
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void *reserved124; /* Dummy entry for stubs table backwards compatibility */
     Pixmap (*tkpGetNativeAppBitmap) (Display * display, CONST char * name, int * width, int * height); /* 124 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
     void *reserved125;
     void *reserved126;
     void *reserved127;
@@ -1188,15 +1198,16 @@ typedef struct TkIntStubs {
     void (*tkFocusFree) (TkMainInfo * mainPtr); /* 142 */
     void (*tkClipCleanup) (TkDisplay * dispPtr); /* 143 */
     void (*tkGCCleanup) (TkDisplay * dispPtr); /* 144 */
-#if !defined(__WIN32__) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void *reserved145;
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     void (*tkSubtractRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 145 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void *reserved145; /* Dummy entry for stubs table backwards compatibility */
     void (*tkSubtractRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 145 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
     void (*tkStylePkgInit) (TkMainInfo * mainPtr); /* 146 */
     void (*tkStylePkgFree) (TkMainInfo * mainPtr); /* 147 */
     Tk_Window (*tkToplevelWindowForCommand) (Tcl_Interp * interp, CONST char * cmdName); /* 148 */
@@ -1674,110 +1685,110 @@ extern TkIntStubs *tkIntStubsPtr;
 #define TkpMenuThreadInit \
 	(tkIntStubsPtr->tkpMenuThreadInit) /* 112 */
 #endif
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
 #ifndef TkClipBox
 #define TkClipBox \
 	(tkIntStubsPtr->tkClipBox) /* 113 */
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkClipBox
 #define TkClipBox \
 	(tkIntStubsPtr->tkClipBox) /* 113 */
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef __WIN32__
+#endif /* AQUA */
+#ifdef __WIN32__ /* WIN */
 #ifndef TkCreateRegion
 #define TkCreateRegion \
 	(tkIntStubsPtr->tkCreateRegion) /* 114 */
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkCreateRegion
 #define TkCreateRegion \
 	(tkIntStubsPtr->tkCreateRegion) /* 114 */
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef __WIN32__
+#endif /* AQUA */
+#ifdef __WIN32__ /* WIN */
 #ifndef TkDestroyRegion
 #define TkDestroyRegion \
 	(tkIntStubsPtr->tkDestroyRegion) /* 115 */
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkDestroyRegion
 #define TkDestroyRegion \
 	(tkIntStubsPtr->tkDestroyRegion) /* 115 */
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef __WIN32__
+#endif /* AQUA */
+#ifdef __WIN32__ /* WIN */
 #ifndef TkIntersectRegion
 #define TkIntersectRegion \
 	(tkIntStubsPtr->tkIntersectRegion) /* 116 */
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkIntersectRegion
 #define TkIntersectRegion \
 	(tkIntStubsPtr->tkIntersectRegion) /* 116 */
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef __WIN32__
+#endif /* AQUA */
+#ifdef __WIN32__ /* WIN */
 #ifndef TkRectInRegion
 #define TkRectInRegion \
 	(tkIntStubsPtr->tkRectInRegion) /* 117 */
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkRectInRegion
 #define TkRectInRegion \
 	(tkIntStubsPtr->tkRectInRegion) /* 117 */
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef __WIN32__
+#endif /* AQUA */
+#ifdef __WIN32__ /* WIN */
 #ifndef TkSetRegion
 #define TkSetRegion \
 	(tkIntStubsPtr->tkSetRegion) /* 118 */
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkSetRegion
 #define TkSetRegion \
 	(tkIntStubsPtr->tkSetRegion) /* 118 */
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef __WIN32__
+#endif /* AQUA */
+#ifdef __WIN32__ /* WIN */
 #ifndef TkUnionRectWithRegion
 #define TkUnionRectWithRegion \
 	(tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkUnionRectWithRegion
 #define TkUnionRectWithRegion \
 	(tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 /* Slot 120 is reserved */
-#ifdef MAC_OSX_TK
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkpCreateNativeBitmap
 #define TkpCreateNativeBitmap \
 	(tkIntStubsPtr->tkpCreateNativeBitmap) /* 121 */
 #endif
-#endif /* MAC_OSX_TK */
-#ifdef MAC_OSX_TK
+#endif /* AQUA */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkpDefineNativeBitmaps
 #define TkpDefineNativeBitmaps \
 	(tkIntStubsPtr->tkpDefineNativeBitmaps) /* 122 */
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 /* Slot 123 is reserved */
-#ifdef MAC_OSX_TK
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkpGetNativeAppBitmap
 #define TkpGetNativeAppBitmap \
 	(tkIntStubsPtr->tkpGetNativeAppBitmap) /* 124 */
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 /* Slot 125 is reserved */
 /* Slot 126 is reserved */
 /* Slot 127 is reserved */
@@ -1828,18 +1839,18 @@ extern TkIntStubs *tkIntStubsPtr;
 #define TkGCCleanup \
 	(tkIntStubsPtr->tkGCCleanup) /* 144 */
 #endif
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
 #ifndef TkSubtractRegion
 #define TkSubtractRegion \
 	(tkIntStubsPtr->tkSubtractRegion) /* 145 */
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkSubtractRegion
 #define TkSubtractRegion \
 	(tkIntStubsPtr->tkSubtractRegion) /* 145 */
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 #ifndef TkStylePkgInit
 #define TkStylePkgInit \
 	(tkIntStubsPtr->tkStylePkgInit) /* 146 */
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index f95c3aa..3db82d9 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.27 2006/12/18 16:42:46 dgp Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.28 2007/12/10 15:54:13 das Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -32,7 +32,7 @@
  * Exported function declarations:
  */
 
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
 #ifndef TkAlignImageData_TCL_DECLARED
 #define TkAlignImageData_TCL_DECLARED
 /* 0 */
@@ -224,8 +224,8 @@ EXTERN void		TkWinSetHINSTANCE (HINSTANCE hInstance);
 /* 35 */
 EXTERN int		TkWinGetPlatformTheme (void);
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkGenerateActivateEvents_TCL_DECLARED
 #define TkGenerateActivateEvents_TCL_DECLARED
 /* 0 */
@@ -477,7 +477,7 @@ EXTERN void		TkGenWMDestroyEvent (Tk_Window tkwin);
 /* 53 */
 EXTERN unsigned long	TkpGetMS (void);
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
 #ifndef TkCreateXEventSource_TCL_DECLARED
 #define TkCreateXEventSource_TCL_DECLARED
@@ -558,7 +558,7 @@ typedef struct TkIntPlatStubs {
     int magic;
     struct TkIntPlatStubHooks *hooks;
 
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
     char * (*tkAlignImageData) (XImage * image, int alignment, int bitOrder); /* 0 */
     void *reserved1;
     void (*tkGenerateActivateEvents) (TkWindow * winPtr, int active); /* 2 */
@@ -595,8 +595,8 @@ typedef struct TkIntPlatStubs {
     int (*tkWinGetPlatformId) (void); /* 33 */
     void (*tkWinSetHINSTANCE) (HINSTANCE hInstance); /* 34 */
     int (*tkWinGetPlatformTheme) (void); /* 35 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
     void (*tkGenerateActivateEvents) (TkWindow * winPtr, int active); /* 0 */
     void *reserved1;
     void *reserved2;
@@ -651,7 +651,7 @@ typedef struct TkIntPlatStubs {
     void (*tkGenWMDestroyEvent) (Tk_Window tkwin); /* 51 */
     void *reserved52;
     unsigned long (*tkpGetMS) (void); /* 53 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void (*tkCreateXEventSource) (void); /* 0 */
     void (*tkFreeWindowId) (TkDisplay * dispPtr, Window w); /* 1 */
@@ -684,7 +684,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
  * Inline function declarations:
  */
 
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
 #ifndef TkAlignImageData
 #define TkAlignImageData \
 	(tkIntPlatStubsPtr->tkAlignImageData) /* 0 */
@@ -826,8 +826,8 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkWinGetPlatformTheme \
 	(tkIntPlatStubsPtr->tkWinGetPlatformTheme) /* 35 */
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef TkGenerateActivateEvents
 #define TkGenerateActivateEvents \
 	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */
@@ -1020,7 +1020,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkpGetMS \
 	(tkIntPlatStubsPtr->tkpGetMS) /* 53 */
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
 #ifndef TkCreateXEventSource
 #define TkCreateXEventSource \
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index fadf72c..d551577 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.21 2006/12/18 16:42:46 dgp Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.22 2007/12/10 15:54:13 das Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -34,7 +34,7 @@
  * Exported function declarations:
  */
 
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
 #ifndef XSetDashes_TCL_DECLARED
 #define XSetDashes_TCL_DECLARED
 /* 0 */
@@ -659,8 +659,8 @@ EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc,
 				int x, int y, unsigned int width, 
 				unsigned int height);
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef XSetDashes_TCL_DECLARED
 #define XSetDashes_TCL_DECLARED
 /* 0 */
@@ -1208,13 +1208,13 @@ EXTERN Status		XQueryTree (Display * d, Window w1, Window * w2,
 /* 91 */
 EXTERN int		XSync (Display * display, Bool flag);
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 
 typedef struct TkIntXlibStubs {
     int magic;
     struct TkIntXlibStubHooks *hooks;
 
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
     void (*xSetDashes) (Display * display, GC gc, int dash_offset, _Xconst char * dash_list, int n); /* 0 */
     XModifierKeymap * (*xGetModifierMapping) (Display * d); /* 1 */
     XImage * (*xCreateImage) (Display * d, Visual * v, unsigned int ui1, int i1, int i2, char * cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */
@@ -1322,8 +1322,8 @@ typedef struct TkIntXlibStubs {
     void (*xDrawLine) (Display * d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 104 */
     void (*xWarpPointer) (Display * d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy); /* 105 */
     void (*xFillRectangle) (Display * display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 106 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
     void (*xSetDashes) (Display * display, GC gc, int dash_offset, _Xconst char * dash_list, int n); /* 0 */
     XModifierKeymap * (*xGetModifierMapping) (Display * d); /* 1 */
     XImage * (*xCreateImage) (Display * d, Visual * v, unsigned int ui1, int i1, int i2, char * cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */
@@ -1416,7 +1416,7 @@ typedef struct TkIntXlibStubs {
     void (*xQueryColors) (Display * display, Colormap colormap, XColor * defs_in_out, int ncolors); /* 89 */
     Status (*xQueryTree) (Display * d, Window w1, Window * w2, Window * w3, Window ** w4, unsigned int * ui); /* 90 */
     int (*xSync) (Display * display, Bool flag); /* 91 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 } TkIntXlibStubs;
 
 #ifdef __cplusplus
@@ -1433,7 +1433,7 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
  * Inline function declarations:
  */
 
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
 #ifndef XSetDashes
 #define XSetDashes \
 	(tkIntXlibStubsPtr->xSetDashes) /* 0 */
@@ -1859,8 +1859,8 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 #define XFillRectangle \
 	(tkIntXlibStubsPtr->xFillRectangle) /* 106 */
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef XSetDashes
 #define XSetDashes \
 	(tkIntXlibStubsPtr->xSetDashes) /* 0 */
@@ -2229,7 +2229,7 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 #define XSync \
 	(tkIntXlibStubsPtr->xSync) /* 91 */
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index b47ca79..d1bcab3 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.13 2006/12/18 16:42:46 dgp Exp $
+ * RCS: @(#) $Id: tkPlatDecls.h,v 1.14 2007/12/10 15:54:14 das Exp $
  */
 
 #ifndef _TKPLATDECLS
@@ -31,7 +31,7 @@
  * Exported function declarations:
  */
 
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
 #ifndef Tk_AttachHWND_TCL_DECLARED
 #define Tk_AttachHWND_TCL_DECLARED
 /* 0 */
@@ -64,8 +64,8 @@ EXTERN int		Tk_TranslateWinEvent (HWND hwnd, UINT message,
 				WPARAM wParam, LPARAM lParam, 
 				LRESULT * result);
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef Tk_MacOSXSetEmbedHandler_TCL_DECLARED
 #define Tk_MacOSXSetEmbedHandler_TCL_DECLARED
 /* 0 */
@@ -127,21 +127,21 @@ EXTERN void		Tk_MacOSXSetupTkNotifier (void);
 /* 10 */
 EXTERN int		Tk_MacOSXIsAppInFront (void);
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 
 typedef struct TkPlatStubs {
     int magic;
     struct TkPlatStubHooks *hooks;
 
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
     Window (*tk_AttachHWND) (Tk_Window tkwin, HWND hwnd); /* 0 */
     HINSTANCE (*tk_GetHINSTANCE) (void); /* 1 */
     HWND (*tk_GetHWND) (Window window); /* 2 */
     Tk_Window (*tk_HWNDToWindow) (HWND hwnd); /* 3 */
     void (*tk_PointerEvent) (HWND hwnd, int x, int y); /* 4 */
     int (*tk_TranslateWinEvent) (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT * result); /* 5 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
     void (*tk_MacOSXSetEmbedHandler) (Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr, Tk_MacOSXEmbedGetClipProc * getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc * getOffsetProc); /* 0 */
     void (*tk_MacOSXTurnOffMenus) (void); /* 1 */
     void (*tk_MacOSXTkOwnsCursor) (int tkOwnsIt); /* 2 */
@@ -153,7 +153,7 @@ typedef struct TkPlatStubs {
     ControlRef (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
     void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 } TkPlatStubs;
 
 #ifdef __cplusplus
@@ -170,7 +170,7 @@ extern TkPlatStubs *tkPlatStubsPtr;
  * Inline function declarations:
  */
 
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
 #ifndef Tk_AttachHWND
 #define Tk_AttachHWND \
 	(tkPlatStubsPtr->tk_AttachHWND) /* 0 */
@@ -195,8 +195,8 @@ extern TkPlatStubs *tkPlatStubsPtr;
 #define Tk_TranslateWinEvent \
 	(tkPlatStubsPtr->tk_TranslateWinEvent) /* 5 */
 #endif
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
 #ifndef Tk_MacOSXSetEmbedHandler
 #define Tk_MacOSXSetEmbedHandler \
 	(tkPlatStubsPtr->tk_MacOSXSetEmbedHandler) /* 0 */
@@ -241,7 +241,7 @@ extern TkPlatStubs *tkPlatStubsPtr;
 #define Tk_MacOSXIsAppInFront \
 	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
 #endif
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 5d0b6db..c422a39 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.58 2007/09/07 00:34:53 dgp Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.59 2007/12/10 15:54:14 das Exp $
  */
 
 #include "tkInt.h"
@@ -171,98 +171,108 @@ TkIntStubs tkIntStubs = {
     TkpGetSubFonts, /* 110 */
     TkpGetSystemDefault, /* 111 */
     TkpMenuThreadInit, /* 112 */
-#if !defined(__WIN32__) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 113 */
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     TkClipBox, /* 113 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 113 */ /* Dummy entry for stubs table backwards compatibility */
     TkClipBox, /* 113 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 114 */
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     TkCreateRegion, /* 114 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 114 */ /* Dummy entry for stubs table backwards compatibility */
     TkCreateRegion, /* 114 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 115 */
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     TkDestroyRegion, /* 115 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 115 */ /* Dummy entry for stubs table backwards compatibility */
     TkDestroyRegion, /* 115 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 116 */
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     TkIntersectRegion, /* 116 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 116 */ /* Dummy entry for stubs table backwards compatibility */
     TkIntersectRegion, /* 116 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 117 */
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     TkRectInRegion, /* 117 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 117 */ /* Dummy entry for stubs table backwards compatibility */
     TkRectInRegion, /* 117 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 118 */
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     TkSetRegion, /* 118 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 118 */ /* Dummy entry for stubs table backwards compatibility */
     TkSetRegion, /* 118 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 119 */
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     TkUnionRectWithRegion, /* 119 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 119 */ /* Dummy entry for stubs table backwards compatibility */
     TkUnionRectWithRegion, /* 119 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
     NULL, /* 120 */
-#if !defined(__WIN32__) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 121 */
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     NULL, /* 121 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 121 */ /* Dummy entry for stubs table backwards compatibility */
     TkpCreateNativeBitmap, /* 121 */
-#endif /* MAC_OSX_TK */
-#if !defined(__WIN32__) /* UNIX */
+#endif /* AQUA */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 122 */
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     NULL, /* 122 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 122 */ /* Dummy entry for stubs table backwards compatibility */
     TkpDefineNativeBitmaps, /* 122 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
     NULL, /* 123 */
-#if !defined(__WIN32__) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 124 */
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     NULL, /* 124 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 124 */ /* Dummy entry for stubs table backwards compatibility */
     TkpGetNativeAppBitmap, /* 124 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
     NULL, /* 125 */
     NULL, /* 126 */
     NULL, /* 127 */
@@ -283,15 +293,16 @@ TkIntStubs tkIntStubs = {
     TkFocusFree, /* 142 */
     TkClipCleanup, /* 143 */
     TkGCCleanup, /* 144 */
-#if !defined(__WIN32__) /* UNIX */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     NULL, /* 145 */
-#endif /* UNIX */
-#ifdef __WIN32__
+#endif /* X11 */
+#ifdef __WIN32__ /* WIN */
     TkSubtractRegion, /* 145 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    NULL, /* 145 */ /* Dummy entry for stubs table backwards compatibility */
     TkSubtractRegion, /* 145 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
     TkStylePkgInit, /* 146 */
     TkStylePkgFree, /* 147 */
     TkToplevelWindowForCommand, /* 148 */
@@ -309,7 +320,7 @@ TkIntStubs tkIntStubs = {
 TkIntPlatStubs tkIntPlatStubs = {
     TCL_STUB_MAGIC,
     NULL,
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
     TkAlignImageData, /* 0 */
     NULL, /* 1 */
     TkGenerateActivateEvents, /* 2 */
@@ -346,8 +357,8 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkWinGetPlatformId, /* 33 */
     TkWinSetHINSTANCE, /* 34 */
     TkWinGetPlatformTheme, /* 35 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
     TkGenerateActivateEvents, /* 0 */
     NULL, /* 1 */
     NULL, /* 2 */
@@ -402,7 +413,7 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkGenWMDestroyEvent, /* 51 */
     NULL, /* 52 */
     TkpGetMS, /* 53 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     TkCreateXEventSource, /* 0 */
     TkFreeWindowId, /* 1 */
@@ -424,7 +435,7 @@ TkIntPlatStubs tkIntPlatStubs = {
 TkIntXlibStubs tkIntXlibStubs = {
     TCL_STUB_MAGIC,
     NULL,
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
     XSetDashes, /* 0 */
     XGetModifierMapping, /* 1 */
     XCreateImage, /* 2 */
@@ -532,8 +543,8 @@ TkIntXlibStubs tkIntXlibStubs = {
     XDrawLine, /* 104 */
     XWarpPointer, /* 105 */
     XFillRectangle, /* 106 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
     XSetDashes, /* 0 */
     XGetModifierMapping, /* 1 */
     XCreateImage, /* 2 */
@@ -626,21 +637,21 @@ TkIntXlibStubs tkIntXlibStubs = {
     XQueryColors, /* 89 */
     XQueryTree, /* 90 */
     XSync, /* 91 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 };
 
 TkPlatStubs tkPlatStubs = {
     TCL_STUB_MAGIC,
     NULL,
-#ifdef __WIN32__
+#ifdef __WIN32__ /* WIN */
     Tk_AttachHWND, /* 0 */
     Tk_GetHINSTANCE, /* 1 */
     Tk_GetHWND, /* 2 */
     Tk_HWNDToWindow, /* 3 */
     Tk_PointerEvent, /* 4 */
     Tk_TranslateWinEvent, /* 5 */
-#endif /* __WIN32__ */
-#ifdef MAC_OSX_TK
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
     Tk_MacOSXSetEmbedHandler, /* 0 */
     Tk_MacOSXTurnOffMenus, /* 1 */
     Tk_MacOSXTkOwnsCursor, /* 2 */
@@ -652,7 +663,7 @@ TkPlatStubs tkPlatStubs = {
     TkMacOSXGetRootControl, /* 8 */
     Tk_MacOSXSetupTkNotifier, /* 9 */
     Tk_MacOSXIsAppInFront, /* 10 */
-#endif /* MAC_OSX_TK */
+#endif /* AQUA */
 };
 
 static TkStubHooks tkStubHooks = {