Removed support for Mac OS Classic platform [Patch 918139]

1 files changed, 4 insertions, 560 deletions

diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 6a452a7..ebed2ae 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.16 2003/10/13 03:41:37 hobbs Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.17 2004/03/17 18:15:43 das Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -226,283 +226,6 @@ EXTERN int		TkWinGetPlatformId _ANSI_ARGS_((void));
 EXTERN void		TkWinSetHINSTANCE _ANSI_ARGS_((HINSTANCE hInstance));
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkGenerateActivateEvents_TCL_DECLARED
-#define TkGenerateActivateEvents_TCL_DECLARED
-/* 0 */
-EXTERN void		TkGenerateActivateEvents _ANSI_ARGS_((
-				TkWindow * winPtr, int active));
-#endif
-/* Slot 1 is reserved */
-/* Slot 2 is reserved */
-#ifndef TkpGetMS_TCL_DECLARED
-#define TkpGetMS_TCL_DECLARED
-/* 3 */
-EXTERN unsigned long	TkpGetMS _ANSI_ARGS_((void));
-#endif
-/* Slot 4 is reserved */
-#ifndef TkPointerDeadWindow_TCL_DECLARED
-#define TkPointerDeadWindow_TCL_DECLARED
-/* 5 */
-EXTERN void		TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkpSetCapture_TCL_DECLARED
-#define TkpSetCapture_TCL_DECLARED
-/* 6 */
-EXTERN void		TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkpSetCursor_TCL_DECLARED
-#define TkpSetCursor_TCL_DECLARED
-/* 7 */
-EXTERN void		TkpSetCursor _ANSI_ARGS_((TkpCursor cursor));
-#endif
-#ifndef TkpWmSetState_TCL_DECLARED
-#define TkpWmSetState_TCL_DECLARED
-/* 8 */
-EXTERN void		TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, 
-				int state));
-#endif
-/* Slot 9 is reserved */
-#ifndef TkAboutDlg_TCL_DECLARED
-#define TkAboutDlg_TCL_DECLARED
-/* 10 */
-EXTERN void		TkAboutDlg _ANSI_ARGS_((void));
-#endif
-/* Slot 11 is reserved */
-/* Slot 12 is reserved */
-#ifndef TkGetTransientMaster_TCL_DECLARED
-#define TkGetTransientMaster_TCL_DECLARED
-/* 13 */
-EXTERN Window		TkGetTransientMaster _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkGenerateButtonEvent_TCL_DECLARED
-#define TkGenerateButtonEvent_TCL_DECLARED
-/* 14 */
-EXTERN int		TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, 
-				Window window, unsigned int state));
-#endif
-/* Slot 15 is reserved */
-#ifndef TkGenWMDestroyEvent_TCL_DECLARED
-#define TkGenWMDestroyEvent_TCL_DECLARED
-/* 16 */
-EXTERN void		TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin));
-#endif
-/* Slot 17 is reserved */
-#ifndef TkMacButtonKeyState_TCL_DECLARED
-#define TkMacButtonKeyState_TCL_DECLARED
-/* 18 */
-EXTERN unsigned int	TkMacButtonKeyState _ANSI_ARGS_((void));
-#endif
-#ifndef TkMacClearMenubarActive_TCL_DECLARED
-#define TkMacClearMenubarActive_TCL_DECLARED
-/* 19 */
-EXTERN void		TkMacClearMenubarActive _ANSI_ARGS_((void));
-#endif
-/* Slot 20 is reserved */
-#ifndef TkMacDispatchMenuEvent_TCL_DECLARED
-#define TkMacDispatchMenuEvent_TCL_DECLARED
-/* 21 */
-EXTERN int		TkMacDispatchMenuEvent _ANSI_ARGS_((int menuID, 
-				int index));
-#endif
-#ifndef TkMacInstallCursor_TCL_DECLARED
-#define TkMacInstallCursor_TCL_DECLARED
-/* 22 */
-EXTERN void		TkMacInstallCursor _ANSI_ARGS_((int resizeOverride));
-#endif
-/* Slot 23 is reserved */
-#ifndef TkMacHandleTearoffMenu_TCL_DECLARED
-#define TkMacHandleTearoffMenu_TCL_DECLARED
-/* 24 */
-EXTERN void		TkMacHandleTearoffMenu _ANSI_ARGS_((void));
-#endif
-/* Slot 25 is reserved */
-/* Slot 26 is reserved */
-#ifndef TkMacDoHLEvent_TCL_DECLARED
-#define TkMacDoHLEvent_TCL_DECLARED
-/* 27 */
-EXTERN void		TkMacDoHLEvent _ANSI_ARGS_((EventRecord * theEvent));
-#endif
-/* Slot 28 is reserved */
-#ifndef TkMacGenerateTime_TCL_DECLARED
-#define TkMacGenerateTime_TCL_DECLARED
-/* 29 */
-EXTERN Time		TkMacGenerateTime _ANSI_ARGS_((void));
-#endif
-/* Slot 30 is reserved */
-#ifndef TkMacGetScrollbarGrowWindow_TCL_DECLARED
-#define TkMacGetScrollbarGrowWindow_TCL_DECLARED
-/* 31 */
-EXTERN TkWindow *	TkMacGetScrollbarGrowWindow _ANSI_ARGS_((
-				TkWindow * winPtr));
-#endif
-#ifndef TkMacGetXWindow_TCL_DECLARED
-#define TkMacGetXWindow_TCL_DECLARED
-/* 32 */
-EXTERN Window		TkMacGetXWindow _ANSI_ARGS_((WindowRef macWinPtr));
-#endif
-#ifndef TkMacGrowToplevel_TCL_DECLARED
-#define TkMacGrowToplevel_TCL_DECLARED
-/* 33 */
-EXTERN int		TkMacGrowToplevel _ANSI_ARGS_((WindowRef whichWindow, 
-				Point start));
-#endif
-#ifndef TkMacHandleMenuSelect_TCL_DECLARED
-#define TkMacHandleMenuSelect_TCL_DECLARED
-/* 34 */
-EXTERN void		TkMacHandleMenuSelect _ANSI_ARGS_((long mResult, 
-				int optionKeyPressed));
-#endif
-/* Slot 35 is reserved */
-/* Slot 36 is reserved */
-/* Slot 37 is reserved */
-#ifndef TkMacInvalidateWindow_TCL_DECLARED
-#define TkMacInvalidateWindow_TCL_DECLARED
-/* 38 */
-EXTERN void		TkMacInvalidateWindow _ANSI_ARGS_((
-				MacDrawable * macWin, int flag));
-#endif
-#ifndef TkMacIsCharacterMissing_TCL_DECLARED
-#define TkMacIsCharacterMissing_TCL_DECLARED
-/* 39 */
-EXTERN int		TkMacIsCharacterMissing _ANSI_ARGS_((Tk_Font tkfont, 
-				unsigned int searchChar));
-#endif
-#ifndef TkMacMakeRealWindowExist_TCL_DECLARED
-#define TkMacMakeRealWindowExist_TCL_DECLARED
-/* 40 */
-EXTERN void		TkMacMakeRealWindowExist _ANSI_ARGS_((
-				TkWindow * winPtr));
-#endif
-#ifndef TkMacMakeStippleMap_TCL_DECLARED
-#define TkMacMakeStippleMap_TCL_DECLARED
-/* 41 */
-EXTERN BitMapPtr	TkMacMakeStippleMap _ANSI_ARGS_((Drawable d1, 
-				Drawable d2));
-#endif
-#ifndef TkMacMenuClick_TCL_DECLARED
-#define TkMacMenuClick_TCL_DECLARED
-/* 42 */
-EXTERN void		TkMacMenuClick _ANSI_ARGS_((void));
-#endif
-#ifndef TkMacRegisterOffScreenWindow_TCL_DECLARED
-#define TkMacRegisterOffScreenWindow_TCL_DECLARED
-/* 43 */
-EXTERN void		TkMacRegisterOffScreenWindow _ANSI_ARGS_((
-				Window window, GWorldPtr portPtr));
-#endif
-#ifndef TkMacResizable_TCL_DECLARED
-#define TkMacResizable_TCL_DECLARED
-/* 44 */
-EXTERN int		TkMacResizable _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-/* Slot 45 is reserved */
-#ifndef TkMacSetHelpMenuItemCount_TCL_DECLARED
-#define TkMacSetHelpMenuItemCount_TCL_DECLARED
-/* 46 */
-EXTERN void		TkMacSetHelpMenuItemCount _ANSI_ARGS_((void));
-#endif
-#ifndef TkMacSetScrollbarGrow_TCL_DECLARED
-#define TkMacSetScrollbarGrow_TCL_DECLARED
-/* 47 */
-EXTERN void		TkMacSetScrollbarGrow _ANSI_ARGS_((TkWindow * winPtr, 
-				int flag));
-#endif
-#ifndef TkMacSetUpClippingRgn_TCL_DECLARED
-#define TkMacSetUpClippingRgn_TCL_DECLARED
-/* 48 */
-EXTERN void		TkMacSetUpClippingRgn _ANSI_ARGS_((Drawable drawable));
-#endif
-#ifndef TkMacSetUpGraphicsPort_TCL_DECLARED
-#define TkMacSetUpGraphicsPort_TCL_DECLARED
-/* 49 */
-EXTERN void		TkMacSetUpGraphicsPort _ANSI_ARGS_((GC gc));
-#endif
-#ifndef TkMacUpdateClipRgn_TCL_DECLARED
-#define TkMacUpdateClipRgn_TCL_DECLARED
-/* 50 */
-EXTERN void		TkMacUpdateClipRgn _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkMacUnregisterMacWindow_TCL_DECLARED
-#define TkMacUnregisterMacWindow_TCL_DECLARED
-/* 51 */
-EXTERN void		TkMacUnregisterMacWindow _ANSI_ARGS_((
-				GWorldPtr portPtr));
-#endif
-#ifndef TkMacUseMenuID_TCL_DECLARED
-#define TkMacUseMenuID_TCL_DECLARED
-/* 52 */
-EXTERN int		TkMacUseMenuID _ANSI_ARGS_((short macID));
-#endif
-#ifndef TkMacVisableClipRgn_TCL_DECLARED
-#define TkMacVisableClipRgn_TCL_DECLARED
-/* 53 */
-EXTERN RgnHandle	TkMacVisableClipRgn _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkMacWinBounds_TCL_DECLARED
-#define TkMacWinBounds_TCL_DECLARED
-/* 54 */
-EXTERN void		TkMacWinBounds _ANSI_ARGS_((TkWindow * winPtr, 
-				Rect * geometry));
-#endif
-#ifndef TkMacWindowOffset_TCL_DECLARED
-#define TkMacWindowOffset_TCL_DECLARED
-/* 55 */
-EXTERN void		TkMacWindowOffset _ANSI_ARGS_((WindowRef wRef, 
-				int * xOffset, int * yOffset));
-#endif
-/* Slot 56 is reserved */
-#ifndef TkSetMacColor_TCL_DECLARED
-#define TkSetMacColor_TCL_DECLARED
-/* 57 */
-EXTERN int		TkSetMacColor _ANSI_ARGS_((unsigned long pixel, 
-				RGBColor * macColor));
-#endif
-#ifndef TkSetWMName_TCL_DECLARED
-#define TkSetWMName_TCL_DECLARED
-/* 58 */
-EXTERN void		TkSetWMName _ANSI_ARGS_((TkWindow * winPtr, 
-				Tk_Uid titleUid));
-#endif
-#ifndef TkSuspendClipboard_TCL_DECLARED
-#define TkSuspendClipboard_TCL_DECLARED
-/* 59 */
-EXTERN void		TkSuspendClipboard _ANSI_ARGS_((void));
-#endif
-/* Slot 60 is reserved */
-#ifndef TkMacZoomToplevel_TCL_DECLARED
-#define TkMacZoomToplevel_TCL_DECLARED
-/* 61 */
-EXTERN int		TkMacZoomToplevel _ANSI_ARGS_((WindowPtr whichWindow, 
-				Point where, short zoomPart));
-#endif
-#ifndef Tk_TopCoordsToWindow_TCL_DECLARED
-#define Tk_TopCoordsToWindow_TCL_DECLARED
-/* 62 */
-EXTERN Tk_Window	Tk_TopCoordsToWindow _ANSI_ARGS_((Tk_Window tkwin, 
-				int rootX, int rootY, int * newX, int * newY));
-#endif
-#ifndef TkMacContainerId_TCL_DECLARED
-#define TkMacContainerId_TCL_DECLARED
-/* 63 */
-EXTERN MacDrawable *	TkMacContainerId _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkMacGetHostToplevel_TCL_DECLARED
-#define TkMacGetHostToplevel_TCL_DECLARED
-/* 64 */
-EXTERN MacDrawable *	TkMacGetHostToplevel _ANSI_ARGS_((TkWindow * winPtr));
-#endif
-#ifndef TkMacPreprocessMenu_TCL_DECLARED
-#define TkMacPreprocessMenu_TCL_DECLARED
-/* 65 */
-EXTERN void		TkMacPreprocessMenu _ANSI_ARGS_((void));
-#endif
-#ifndef TkpIsWindowFloating_TCL_DECLARED
-#define TkpIsWindowFloating_TCL_DECLARED
-/* 66 */
-EXTERN int		TkpIsWindowFloating _ANSI_ARGS_((WindowRef window));
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkGenerateActivateEvents_TCL_DECLARED
 #define TkGenerateActivateEvents_TCL_DECLARED
@@ -769,7 +492,7 @@ EXTERN void		TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin));
 EXTERN unsigned long	TkpGetMS _ANSI_ARGS_((void));
 #endif
 #endif /* MAC_OSX_TK */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
 #ifndef TkCreateXEventSource_TCL_DECLARED
 #define TkCreateXEventSource_TCL_DECLARED
 /* 0 */
@@ -883,75 +606,6 @@ typedef struct TkIntPlatStubs {
     int (*tkWinGetPlatformId) _ANSI_ARGS_((void)); /* 33 */
     void (*tkWinSetHINSTANCE) _ANSI_ARGS_((HINSTANCE hInstance)); /* 34 */
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-    void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */
-    void *reserved1;
-    void *reserved2;
-    unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 3 */
-    void *reserved4;
-    void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 5 */
-    void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 6 */
-    void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 7 */
-    void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 8 */
-    void *reserved9;
-    void (*tkAboutDlg) _ANSI_ARGS_((void)); /* 10 */
-    void *reserved11;
-    void *reserved12;
-    Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow * winPtr)); /* 13 */
-    int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 14 */
-    void *reserved15;
-    void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 16 */
-    void *reserved17;
-    unsigned int (*tkMacButtonKeyState) _ANSI_ARGS_((void)); /* 18 */
-    void (*tkMacClearMenubarActive) _ANSI_ARGS_((void)); /* 19 */
-    void *reserved20;
-    int (*tkMacDispatchMenuEvent) _ANSI_ARGS_((int menuID, int index)); /* 21 */
-    void (*tkMacInstallCursor) _ANSI_ARGS_((int resizeOverride)); /* 22 */
-    void *reserved23;
-    void (*tkMacHandleTearoffMenu) _ANSI_ARGS_((void)); /* 24 */
-    void *reserved25;
-    void *reserved26;
-    void (*tkMacDoHLEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 27 */
-    void *reserved28;
-    Time (*tkMacGenerateTime) _ANSI_ARGS_((void)); /* 29 */
-    void *reserved30;
-    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 */
-    void *reserved35;
-    void *reserved36;
-    void *reserved37;
-    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 *reserved45;
-    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 *reserved56;
-    int (*tkSetMacColor) _ANSI_ARGS_((unsigned long pixel, RGBColor * macColor)); /* 57 */
-    void (*tkSetWMName) _ANSI_ARGS_((TkWindow * winPtr, Tk_Uid titleUid)); /* 58 */
-    void (*tkSuspendClipboard) _ANSI_ARGS_((void)); /* 59 */
-    void *reserved60;
-    int (*tkMacZoomToplevel) _ANSI_ARGS_((WindowPtr whichWindow, Point where, short zoomPart)); /* 61 */
-    Tk_Window (*tk_TopCoordsToWindow) _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int * newX, int * newY)); /* 62 */
-    MacDrawable * (*tkMacContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 63 */
-    MacDrawable * (*tkMacGetHostToplevel) _ANSI_ARGS_((TkWindow * winPtr)); /* 64 */
-    void (*tkMacPreprocessMenu) _ANSI_ARGS_((void)); /* 65 */
-    int (*tkpIsWindowFloating) _ANSI_ARGS_((WindowRef window)); /* 66 */
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
     void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */
     void *reserved1;
@@ -1008,7 +662,7 @@ typedef struct TkIntPlatStubs {
     void *reserved52;
     unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 53 */
 #endif /* MAC_OSX_TK */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
     void (*tkCreateXEventSource) _ANSI_ARGS_((void)); /* 0 */
     void (*tkFreeWindowId) _ANSI_ARGS_((TkDisplay * dispPtr, Window w)); /* 1 */
     void (*tkInitXId) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 2 */
@@ -1178,216 +832,6 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkWinSetHINSTANCE) /* 34 */
 #endif
 #endif /* __WIN32__ */
-#ifdef MAC_TCL
-#ifndef TkGenerateActivateEvents
-#define TkGenerateActivateEvents \
-	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */
-#endif
-/* Slot 1 is reserved */
-/* Slot 2 is reserved */
-#ifndef TkpGetMS
-#define TkpGetMS \
-	(tkIntPlatStubsPtr->tkpGetMS) /* 3 */
-#endif
-/* Slot 4 is reserved */
-#ifndef TkPointerDeadWindow
-#define TkPointerDeadWindow \
-	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 5 */
-#endif
-#ifndef TkpSetCapture
-#define TkpSetCapture \
-	(tkIntPlatStubsPtr->tkpSetCapture) /* 6 */
-#endif
-#ifndef TkpSetCursor
-#define TkpSetCursor \
-	(tkIntPlatStubsPtr->tkpSetCursor) /* 7 */
-#endif
-#ifndef TkpWmSetState
-#define TkpWmSetState \
-	(tkIntPlatStubsPtr->tkpWmSetState) /* 8 */
-#endif
-/* Slot 9 is reserved */
-#ifndef TkAboutDlg
-#define TkAboutDlg \
-	(tkIntPlatStubsPtr->tkAboutDlg) /* 10 */
-#endif
-/* Slot 11 is reserved */
-/* Slot 12 is reserved */
-#ifndef TkGetTransientMaster
-#define TkGetTransientMaster \
-	(tkIntPlatStubsPtr->tkGetTransientMaster) /* 13 */
-#endif
-#ifndef TkGenerateButtonEvent
-#define TkGenerateButtonEvent \
-	(tkIntPlatStubsPtr->tkGenerateButtonEvent) /* 14 */
-#endif
-/* Slot 15 is reserved */
-#ifndef TkGenWMDestroyEvent
-#define TkGenWMDestroyEvent \
-	(tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 16 */
-#endif
-/* Slot 17 is reserved */
-#ifndef TkMacButtonKeyState
-#define TkMacButtonKeyState \
-	(tkIntPlatStubsPtr->tkMacButtonKeyState) /* 18 */
-#endif
-#ifndef TkMacClearMenubarActive
-#define TkMacClearMenubarActive \
-	(tkIntPlatStubsPtr->tkMacClearMenubarActive) /* 19 */
-#endif
-/* Slot 20 is reserved */
-#ifndef TkMacDispatchMenuEvent
-#define TkMacDispatchMenuEvent \
-	(tkIntPlatStubsPtr->tkMacDispatchMenuEvent) /* 21 */
-#endif
-#ifndef TkMacInstallCursor
-#define TkMacInstallCursor \
-	(tkIntPlatStubsPtr->tkMacInstallCursor) /* 22 */
-#endif
-/* Slot 23 is reserved */
-#ifndef TkMacHandleTearoffMenu
-#define TkMacHandleTearoffMenu \
-	(tkIntPlatStubsPtr->tkMacHandleTearoffMenu) /* 24 */
-#endif
-/* Slot 25 is reserved */
-/* Slot 26 is reserved */
-#ifndef TkMacDoHLEvent
-#define TkMacDoHLEvent \
-	(tkIntPlatStubsPtr->tkMacDoHLEvent) /* 27 */
-#endif
-/* Slot 28 is reserved */
-#ifndef TkMacGenerateTime
-#define TkMacGenerateTime \
-	(tkIntPlatStubsPtr->tkMacGenerateTime) /* 29 */
-#endif
-/* Slot 30 is reserved */
-#ifndef TkMacGetScrollbarGrowWindow
-#define TkMacGetScrollbarGrowWindow \
-	(tkIntPlatStubsPtr->tkMacGetScrollbarGrowWindow) /* 31 */
-#endif
-#ifndef TkMacGetXWindow
-#define TkMacGetXWindow \
-	(tkIntPlatStubsPtr->tkMacGetXWindow) /* 32 */
-#endif
-#ifndef TkMacGrowToplevel
-#define TkMacGrowToplevel \
-	(tkIntPlatStubsPtr->tkMacGrowToplevel) /* 33 */
-#endif
-#ifndef TkMacHandleMenuSelect
-#define TkMacHandleMenuSelect \
-	(tkIntPlatStubsPtr->tkMacHandleMenuSelect) /* 34 */
-#endif
-/* Slot 35 is reserved */
-/* Slot 36 is reserved */
-/* Slot 37 is reserved */
-#ifndef TkMacInvalidateWindow
-#define TkMacInvalidateWindow \
-	(tkIntPlatStubsPtr->tkMacInvalidateWindow) /* 38 */
-#endif
-#ifndef TkMacIsCharacterMissing
-#define TkMacIsCharacterMissing \
-	(tkIntPlatStubsPtr->tkMacIsCharacterMissing) /* 39 */
-#endif
-#ifndef TkMacMakeRealWindowExist
-#define TkMacMakeRealWindowExist \
-	(tkIntPlatStubsPtr->tkMacMakeRealWindowExist) /* 40 */
-#endif
-#ifndef TkMacMakeStippleMap
-#define TkMacMakeStippleMap \
-	(tkIntPlatStubsPtr->tkMacMakeStippleMap) /* 41 */
-#endif
-#ifndef TkMacMenuClick
-#define TkMacMenuClick \
-	(tkIntPlatStubsPtr->tkMacMenuClick) /* 42 */
-#endif
-#ifndef TkMacRegisterOffScreenWindow
-#define TkMacRegisterOffScreenWindow \
-	(tkIntPlatStubsPtr->tkMacRegisterOffScreenWindow) /* 43 */
-#endif
-#ifndef TkMacResizable
-#define TkMacResizable \
-	(tkIntPlatStubsPtr->tkMacResizable) /* 44 */
-#endif
-/* Slot 45 is reserved */
-#ifndef TkMacSetHelpMenuItemCount
-#define TkMacSetHelpMenuItemCount \
-	(tkIntPlatStubsPtr->tkMacSetHelpMenuItemCount) /* 46 */
-#endif
-#ifndef TkMacSetScrollbarGrow
-#define TkMacSetScrollbarGrow \
-	(tkIntPlatStubsPtr->tkMacSetScrollbarGrow) /* 47 */
-#endif
-#ifndef TkMacSetUpClippingRgn
-#define TkMacSetUpClippingRgn \
-	(tkIntPlatStubsPtr->tkMacSetUpClippingRgn) /* 48 */
-#endif
-#ifndef TkMacSetUpGraphicsPort
-#define TkMacSetUpGraphicsPort \
-	(tkIntPlatStubsPtr->tkMacSetUpGraphicsPort) /* 49 */
-#endif
-#ifndef TkMacUpdateClipRgn
-#define TkMacUpdateClipRgn \
-	(tkIntPlatStubsPtr->tkMacUpdateClipRgn) /* 50 */
-#endif
-#ifndef TkMacUnregisterMacWindow
-#define TkMacUnregisterMacWindow \
-	(tkIntPlatStubsPtr->tkMacUnregisterMacWindow) /* 51 */
-#endif
-#ifndef TkMacUseMenuID
-#define TkMacUseMenuID \
-	(tkIntPlatStubsPtr->tkMacUseMenuID) /* 52 */
-#endif
-#ifndef TkMacVisableClipRgn
-#define TkMacVisableClipRgn \
-	(tkIntPlatStubsPtr->tkMacVisableClipRgn) /* 53 */
-#endif
-#ifndef TkMacWinBounds
-#define TkMacWinBounds \
-	(tkIntPlatStubsPtr->tkMacWinBounds) /* 54 */
-#endif
-#ifndef TkMacWindowOffset
-#define TkMacWindowOffset \
-	(tkIntPlatStubsPtr->tkMacWindowOffset) /* 55 */
-#endif
-/* Slot 56 is reserved */
-#ifndef TkSetMacColor
-#define TkSetMacColor \
-	(tkIntPlatStubsPtr->tkSetMacColor) /* 57 */
-#endif
-#ifndef TkSetWMName
-#define TkSetWMName \
-	(tkIntPlatStubsPtr->tkSetWMName) /* 58 */
-#endif
-#ifndef TkSuspendClipboard
-#define TkSuspendClipboard \
-	(tkIntPlatStubsPtr->tkSuspendClipboard) /* 59 */
-#endif
-/* Slot 60 is reserved */
-#ifndef TkMacZoomToplevel
-#define TkMacZoomToplevel \
-	(tkIntPlatStubsPtr->tkMacZoomToplevel) /* 61 */
-#endif
-#ifndef Tk_TopCoordsToWindow
-#define Tk_TopCoordsToWindow \
-	(tkIntPlatStubsPtr->tk_TopCoordsToWindow) /* 62 */
-#endif
-#ifndef TkMacContainerId
-#define TkMacContainerId \
-	(tkIntPlatStubsPtr->tkMacContainerId) /* 63 */
-#endif
-#ifndef TkMacGetHostToplevel
-#define TkMacGetHostToplevel \
-	(tkIntPlatStubsPtr->tkMacGetHostToplevel) /* 64 */
-#endif
-#ifndef TkMacPreprocessMenu
-#define TkMacPreprocessMenu \
-	(tkIntPlatStubsPtr->tkMacPreprocessMenu) /* 65 */
-#endif
-#ifndef TkpIsWindowFloating
-#define TkpIsWindowFloating \
-	(tkIntPlatStubsPtr->tkpIsWindowFloating) /* 66 */
-#endif
-#endif /* MAC_TCL */
 #ifdef MAC_OSX_TK
 #ifndef TkGenerateActivateEvents
 #define TkGenerateActivateEvents \
@@ -1582,7 +1026,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkpGetMS) /* 53 */
 #endif
 #endif /* MAC_OSX_TK */
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
 #ifndef TkCreateXEventSource
 #define TkCreateXEventSource \
 	(tkIntPlatStubsPtr->tkCreateXEventSource) /* 0 */