* generic/tkInt.h: move TkGetOptionSpec to stubs intDecls

        * generic/tkIntDecls.h:
        * generic/tkInt.decls:
        * generic/tkStubInit.c:
        * tkDecls.h:            updated with latest genstubs
        * tkIntPlatDecls.h:
        * tkIntXlibDecls.h:
        * tkPlatDecls.h:

1 files changed, 421 insertions, 1 deletions

diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 6719448..6a452a7 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.15 2002/12/08 00:46:51 hobbs Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.16 2003/10/13 03:41:37 hobbs Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -33,393 +33,813 @@
  */
 
 #ifdef __WIN32__
+#ifndef TkAlignImageData_TCL_DECLARED
+#define TkAlignImageData_TCL_DECLARED
 /* 0 */
 EXTERN char *		TkAlignImageData _ANSI_ARGS_((XImage * image, 
 				int alignment, int bitOrder));
+#endif
 /* Slot 1 is reserved */
+#ifndef TkGenerateActivateEvents_TCL_DECLARED
+#define TkGenerateActivateEvents_TCL_DECLARED
 /* 2 */
 EXTERN void		TkGenerateActivateEvents _ANSI_ARGS_((
 				TkWindow * winPtr, int active));
+#endif
+#ifndef TkpGetMS_TCL_DECLARED
+#define TkpGetMS_TCL_DECLARED
 /* 3 */
 EXTERN unsigned long	TkpGetMS _ANSI_ARGS_((void));
+#endif
+#ifndef TkPointerDeadWindow_TCL_DECLARED
+#define TkPointerDeadWindow_TCL_DECLARED
 /* 4 */
 EXTERN void		TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr));
+#endif
+#ifndef TkpPrintWindowId_TCL_DECLARED
+#define TkpPrintWindowId_TCL_DECLARED
 /* 5 */
 EXTERN void		TkpPrintWindowId _ANSI_ARGS_((char * buf, 
 				Window window));
+#endif
+#ifndef TkpScanWindowId_TCL_DECLARED
+#define TkpScanWindowId_TCL_DECLARED
 /* 6 */
 EXTERN int		TkpScanWindowId _ANSI_ARGS_((Tcl_Interp * interp, 
 				CONST char * string, Window * idPtr));
+#endif
+#ifndef TkpSetCapture_TCL_DECLARED
+#define TkpSetCapture_TCL_DECLARED
 /* 7 */
 EXTERN void		TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr));
+#endif
+#ifndef TkpSetCursor_TCL_DECLARED
+#define TkpSetCursor_TCL_DECLARED
 /* 8 */
 EXTERN void		TkpSetCursor _ANSI_ARGS_((TkpCursor cursor));
+#endif
+#ifndef TkpWmSetState_TCL_DECLARED
+#define TkpWmSetState_TCL_DECLARED
 /* 9 */
 EXTERN void		TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, 
 				int state));
+#endif
+#ifndef TkSetPixmapColormap_TCL_DECLARED
+#define TkSetPixmapColormap_TCL_DECLARED
 /* 10 */
 EXTERN void		TkSetPixmapColormap _ANSI_ARGS_((Pixmap pixmap, 
 				Colormap colormap));
+#endif
+#ifndef TkWinCancelMouseTimer_TCL_DECLARED
+#define TkWinCancelMouseTimer_TCL_DECLARED
 /* 11 */
 EXTERN void		TkWinCancelMouseTimer _ANSI_ARGS_((void));
+#endif
+#ifndef TkWinClipboardRender_TCL_DECLARED
+#define TkWinClipboardRender_TCL_DECLARED
 /* 12 */
 EXTERN void		TkWinClipboardRender _ANSI_ARGS_((
 				TkDisplay * dispPtr, UINT format));
+#endif
+#ifndef TkWinEmbeddedEventProc_TCL_DECLARED
+#define TkWinEmbeddedEventProc_TCL_DECLARED
 /* 13 */
 EXTERN LRESULT		TkWinEmbeddedEventProc _ANSI_ARGS_((HWND hwnd, 
 				UINT message, WPARAM wParam, LPARAM lParam));
+#endif
+#ifndef TkWinFillRect_TCL_DECLARED
+#define TkWinFillRect_TCL_DECLARED
 /* 14 */
 EXTERN void		TkWinFillRect _ANSI_ARGS_((HDC dc, int x, int y, 
 				int width, int height, int pixel));
+#endif
+#ifndef TkWinGetBorderPixels_TCL_DECLARED
+#define TkWinGetBorderPixels_TCL_DECLARED
 /* 15 */
 EXTERN COLORREF		TkWinGetBorderPixels _ANSI_ARGS_((Tk_Window tkwin, 
 				Tk_3DBorder border, int which));
+#endif
+#ifndef TkWinGetDrawableDC_TCL_DECLARED
+#define TkWinGetDrawableDC_TCL_DECLARED
 /* 16 */
 EXTERN HDC		TkWinGetDrawableDC _ANSI_ARGS_((Display * display, 
 				Drawable d, TkWinDCState* state));
+#endif
+#ifndef TkWinGetModifierState_TCL_DECLARED
+#define TkWinGetModifierState_TCL_DECLARED
 /* 17 */
 EXTERN int		TkWinGetModifierState _ANSI_ARGS_((void));
+#endif
+#ifndef TkWinGetSystemPalette_TCL_DECLARED
+#define TkWinGetSystemPalette_TCL_DECLARED
 /* 18 */
 EXTERN HPALETTE		TkWinGetSystemPalette _ANSI_ARGS_((void));
+#endif
+#ifndef TkWinGetWrapperWindow_TCL_DECLARED
+#define TkWinGetWrapperWindow_TCL_DECLARED
 /* 19 */
 EXTERN HWND		TkWinGetWrapperWindow _ANSI_ARGS_((Tk_Window tkwin));
+#endif
+#ifndef TkWinHandleMenuEvent_TCL_DECLARED
+#define TkWinHandleMenuEvent_TCL_DECLARED
 /* 20 */
 EXTERN int		TkWinHandleMenuEvent _ANSI_ARGS_((HWND * phwnd, 
 				UINT * pMessage, WPARAM * pwParam, 
 				LPARAM * plParam, LRESULT * plResult));
+#endif
+#ifndef TkWinIndexOfColor_TCL_DECLARED
+#define TkWinIndexOfColor_TCL_DECLARED
 /* 21 */
 EXTERN int		TkWinIndexOfColor _ANSI_ARGS_((XColor * colorPtr));
+#endif
+#ifndef TkWinReleaseDrawableDC_TCL_DECLARED
+#define TkWinReleaseDrawableDC_TCL_DECLARED
 /* 22 */
 EXTERN void		TkWinReleaseDrawableDC _ANSI_ARGS_((Drawable d, 
 				HDC hdc, TkWinDCState* state));
+#endif
+#ifndef TkWinResendEvent_TCL_DECLARED
+#define TkWinResendEvent_TCL_DECLARED
 /* 23 */
 EXTERN LRESULT		TkWinResendEvent _ANSI_ARGS_((WNDPROC wndproc, 
 				HWND hwnd, XEvent * eventPtr));
+#endif
+#ifndef TkWinSelectPalette_TCL_DECLARED
+#define TkWinSelectPalette_TCL_DECLARED
 /* 24 */
 EXTERN HPALETTE		TkWinSelectPalette _ANSI_ARGS_((HDC dc, 
 				Colormap colormap));
+#endif
+#ifndef TkWinSetMenu_TCL_DECLARED
+#define TkWinSetMenu_TCL_DECLARED
 /* 25 */
 EXTERN void		TkWinSetMenu _ANSI_ARGS_((Tk_Window tkwin, 
 				HMENU hMenu));
+#endif
+#ifndef TkWinSetWindowPos_TCL_DECLARED
+#define TkWinSetWindowPos_TCL_DECLARED
 /* 26 */
 EXTERN void		TkWinSetWindowPos _ANSI_ARGS_((HWND hwnd, 
 				HWND siblingHwnd, int pos));
+#endif
+#ifndef TkWinWmCleanup_TCL_DECLARED
+#define TkWinWmCleanup_TCL_DECLARED
 /* 27 */
 EXTERN void		TkWinWmCleanup _ANSI_ARGS_((HINSTANCE hInstance));
+#endif
+#ifndef TkWinXCleanup_TCL_DECLARED
+#define TkWinXCleanup_TCL_DECLARED
 /* 28 */
 EXTERN void		TkWinXCleanup _ANSI_ARGS_((HINSTANCE hInstance));
+#endif
+#ifndef TkWinXInit_TCL_DECLARED
+#define TkWinXInit_TCL_DECLARED
 /* 29 */
 EXTERN void		TkWinXInit _ANSI_ARGS_((HINSTANCE hInstance));
+#endif
+#ifndef TkWinSetForegroundWindow_TCL_DECLARED
+#define TkWinSetForegroundWindow_TCL_DECLARED
 /* 30 */
 EXTERN void		TkWinSetForegroundWindow _ANSI_ARGS_((
 				TkWindow * winPtr));
+#endif
+#ifndef TkWinDialogDebug_TCL_DECLARED
+#define TkWinDialogDebug_TCL_DECLARED
 /* 31 */
 EXTERN void		TkWinDialogDebug _ANSI_ARGS_((int debug));
+#endif
+#ifndef TkWinGetMenuSystemDefault_TCL_DECLARED
+#define TkWinGetMenuSystemDefault_TCL_DECLARED
 /* 32 */
 EXTERN Tcl_Obj *	TkWinGetMenuSystemDefault _ANSI_ARGS_((
 				Tk_Window tkwin, CONST char * dbName, 
 				CONST char * className));
+#endif
+#ifndef TkWinGetPlatformId_TCL_DECLARED
+#define TkWinGetPlatformId_TCL_DECLARED
 /* 33 */
 EXTERN int		TkWinGetPlatformId _ANSI_ARGS_((void));
+#endif
+#ifndef TkWinSetHINSTANCE_TCL_DECLARED
+#define TkWinSetHINSTANCE_TCL_DECLARED
 /* 34 */
 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
 /* 0 */
 EXTERN void		TkGenerateActivateEvents _ANSI_ARGS_((
 				TkWindow * winPtr, int active));
+#endif
 /* Slot 1 is reserved */
 /* Slot 2 is reserved */
+#ifndef TkPointerDeadWindow_TCL_DECLARED
+#define TkPointerDeadWindow_TCL_DECLARED
 /* 3 */
 EXTERN void		TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr));
+#endif
+#ifndef TkpSetCapture_TCL_DECLARED
+#define TkpSetCapture_TCL_DECLARED
 /* 4 */
 EXTERN void		TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr));
+#endif
+#ifndef TkpSetCursor_TCL_DECLARED
+#define TkpSetCursor_TCL_DECLARED
 /* 5 */
 EXTERN void		TkpSetCursor _ANSI_ARGS_((TkpCursor cursor));
+#endif
+#ifndef TkpWmSetState_TCL_DECLARED
+#define TkpWmSetState_TCL_DECLARED
 /* 6 */
 EXTERN void		TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, 
 				int state));
+#endif
+#ifndef TkAboutDlg_TCL_DECLARED
+#define TkAboutDlg_TCL_DECLARED
 /* 7 */
 EXTERN void		TkAboutDlg _ANSI_ARGS_((void));
+#endif
+#ifndef TkMacOSXButtonKeyState_TCL_DECLARED
+#define TkMacOSXButtonKeyState_TCL_DECLARED
 /* 8 */
 EXTERN unsigned int	TkMacOSXButtonKeyState _ANSI_ARGS_((void));
+#endif
+#ifndef TkMacOSXClearMenubarActive_TCL_DECLARED
+#define TkMacOSXClearMenubarActive_TCL_DECLARED
 /* 9 */
 EXTERN void		TkMacOSXClearMenubarActive _ANSI_ARGS_((void));
+#endif
+#ifndef TkMacOSXDispatchMenuEvent_TCL_DECLARED
+#define TkMacOSXDispatchMenuEvent_TCL_DECLARED
 /* 10 */
 EXTERN int		TkMacOSXDispatchMenuEvent _ANSI_ARGS_((int menuID, 
 				int index));
+#endif
+#ifndef TkMacOSXInstallCursor_TCL_DECLARED
+#define TkMacOSXInstallCursor_TCL_DECLARED
 /* 11 */
 EXTERN void		TkMacOSXInstallCursor _ANSI_ARGS_((
 				int resizeOverride));
+#endif
+#ifndef TkMacOSXHandleTearoffMenu_TCL_DECLARED
+#define TkMacOSXHandleTearoffMenu_TCL_DECLARED
 /* 12 */
 EXTERN void		TkMacOSXHandleTearoffMenu _ANSI_ARGS_((void));
+#endif
 /* Slot 13 is reserved */
+#ifndef TkMacOSXDoHLEvent_TCL_DECLARED
+#define TkMacOSXDoHLEvent_TCL_DECLARED
 /* 14 */
 EXTERN int		TkMacOSXDoHLEvent _ANSI_ARGS_((
 				EventRecord * theEvent));
+#endif
 /* Slot 15 is reserved */
+#ifndef TkMacOSXGetXWindow_TCL_DECLARED
+#define TkMacOSXGetXWindow_TCL_DECLARED
 /* 16 */
 EXTERN Window		TkMacOSXGetXWindow _ANSI_ARGS_((WindowRef macWinPtr));
+#endif
+#ifndef TkMacOSXGrowToplevel_TCL_DECLARED
+#define TkMacOSXGrowToplevel_TCL_DECLARED
 /* 17 */
 EXTERN int		TkMacOSXGrowToplevel _ANSI_ARGS_((
 				WindowRef whichWindow, Point start));
+#endif
+#ifndef TkMacOSXHandleMenuSelect_TCL_DECLARED
+#define TkMacOSXHandleMenuSelect_TCL_DECLARED
 /* 18 */
 EXTERN void		TkMacOSXHandleMenuSelect _ANSI_ARGS_((long mResult, 
 				int optionKeyPressed));
+#endif
 /* Slot 19 is reserved */
 /* Slot 20 is reserved */
+#ifndef TkMacOSXInvalidateWindow_TCL_DECLARED
+#define TkMacOSXInvalidateWindow_TCL_DECLARED
 /* 21 */
 EXTERN void		TkMacOSXInvalidateWindow _ANSI_ARGS_((
 				MacDrawable * macWin, int flag));
+#endif
+#ifndef TkMacOSXIsCharacterMissing_TCL_DECLARED
+#define TkMacOSXIsCharacterMissing_TCL_DECLARED
 /* 22 */
 EXTERN int		TkMacOSXIsCharacterMissing _ANSI_ARGS_((
 				Tk_Font tkfont, unsigned int searchChar));
+#endif
+#ifndef TkMacOSXMakeRealWindowExist_TCL_DECLARED
+#define TkMacOSXMakeRealWindowExist_TCL_DECLARED
 /* 23 */
 EXTERN void		TkMacOSXMakeRealWindowExist _ANSI_ARGS_((
 				TkWindow * winPtr));
+#endif
+#ifndef TkMacOSXMakeStippleMap_TCL_DECLARED
+#define TkMacOSXMakeStippleMap_TCL_DECLARED
 /* 24 */
 EXTERN BitMapPtr	TkMacOSXMakeStippleMap _ANSI_ARGS_((Drawable d1, 
 				Drawable d2));
+#endif
+#ifndef TkMacOSXMenuClick_TCL_DECLARED
+#define TkMacOSXMenuClick_TCL_DECLARED
 /* 25 */
 EXTERN void		TkMacOSXMenuClick _ANSI_ARGS_((void));
+#endif
+#ifndef TkMacOSXRegisterOffScreenWindow_TCL_DECLARED
+#define TkMacOSXRegisterOffScreenWindow_TCL_DECLARED
 /* 26 */
 EXTERN void		TkMacOSXRegisterOffScreenWindow _ANSI_ARGS_((
 				Window window, GWorldPtr portPtr));
+#endif
+#ifndef TkMacOSXResizable_TCL_DECLARED
+#define TkMacOSXResizable_TCL_DECLARED
 /* 27 */
 EXTERN int		TkMacOSXResizable _ANSI_ARGS_((TkWindow * winPtr));
+#endif
+#ifndef TkMacOSXSetHelpMenuItemCount_TCL_DECLARED
+#define TkMacOSXSetHelpMenuItemCount_TCL_DECLARED
 /* 28 */
 EXTERN void		TkMacOSXSetHelpMenuItemCount _ANSI_ARGS_((void));
+#endif
+#ifndef TkMacOSXSetScrollbarGrow_TCL_DECLARED
+#define TkMacOSXSetScrollbarGrow_TCL_DECLARED
 /* 29 */
 EXTERN void		TkMacOSXSetScrollbarGrow _ANSI_ARGS_((
 				TkWindow * winPtr, int flag));
+#endif
+#ifndef TkMacOSXSetUpClippingRgn_TCL_DECLARED
+#define TkMacOSXSetUpClippingRgn_TCL_DECLARED
 /* 30 */
 EXTERN void		TkMacOSXSetUpClippingRgn _ANSI_ARGS_((
 				Drawable drawable));
+#endif
+#ifndef TkMacOSXSetUpGraphicsPort_TCL_DECLARED
+#define TkMacOSXSetUpGraphicsPort_TCL_DECLARED
 /* 31 */
 EXTERN void		TkMacOSXSetUpGraphicsPort _ANSI_ARGS_((GC gc, 
 				GWorldPtr destPort));
+#endif
+#ifndef TkMacOSXUpdateClipRgn_TCL_DECLARED
+#define TkMacOSXUpdateClipRgn_TCL_DECLARED
 /* 32 */
 EXTERN void		TkMacOSXUpdateClipRgn _ANSI_ARGS_((TkWindow * winPtr));
+#endif
+#ifndef TkMacOSXUnregisterMacWindow_TCL_DECLARED
+#define TkMacOSXUnregisterMacWindow_TCL_DECLARED
 /* 33 */
 EXTERN void		TkMacOSXUnregisterMacWindow _ANSI_ARGS_((
 				WindowRef portPtr));
+#endif
+#ifndef TkMacOSXUseMenuID_TCL_DECLARED
+#define TkMacOSXUseMenuID_TCL_DECLARED
 /* 34 */
 EXTERN int		TkMacOSXUseMenuID _ANSI_ARGS_((short macID));
+#endif
+#ifndef TkMacOSXVisableClipRgn_TCL_DECLARED
+#define TkMacOSXVisableClipRgn_TCL_DECLARED
 /* 35 */
 EXTERN RgnHandle	TkMacOSXVisableClipRgn _ANSI_ARGS_((
 				TkWindow * winPtr));
+#endif
+#ifndef TkMacOSXWinBounds_TCL_DECLARED
+#define TkMacOSXWinBounds_TCL_DECLARED
 /* 36 */
 EXTERN void		TkMacOSXWinBounds _ANSI_ARGS_((TkWindow * winPtr, 
 				Rect * geometry));
+#endif
+#ifndef TkMacOSXWindowOffset_TCL_DECLARED
+#define TkMacOSXWindowOffset_TCL_DECLARED
 /* 37 */
 EXTERN void		TkMacOSXWindowOffset _ANSI_ARGS_((WindowRef wRef, 
 				int * xOffset, int * yOffset));
+#endif
+#ifndef TkSetMacColor_TCL_DECLARED
+#define TkSetMacColor_TCL_DECLARED
 /* 38 */
 EXTERN int		TkSetMacColor _ANSI_ARGS_((unsigned long pixel, 
 				RGBColor * macColor));
+#endif
+#ifndef TkSetWMName_TCL_DECLARED
+#define TkSetWMName_TCL_DECLARED
 /* 39 */
 EXTERN void		TkSetWMName _ANSI_ARGS_((TkWindow * winPtr, 
 				Tk_Uid titleUid));
+#endif
+#ifndef TkSuspendClipboard_TCL_DECLARED
+#define TkSuspendClipboard_TCL_DECLARED
 /* 40 */
 EXTERN void		TkSuspendClipboard _ANSI_ARGS_((void));
+#endif
+#ifndef TkMacOSXZoomToplevel_TCL_DECLARED
+#define TkMacOSXZoomToplevel_TCL_DECLARED
 /* 41 */
 EXTERN int		TkMacOSXZoomToplevel _ANSI_ARGS_((
 				WindowPtr whichWindow, Point where, 
 				short zoomPart));
+#endif
+#ifndef Tk_TopCoordsToWindow_TCL_DECLARED
+#define Tk_TopCoordsToWindow_TCL_DECLARED
 /* 42 */
 EXTERN Tk_Window	Tk_TopCoordsToWindow _ANSI_ARGS_((Tk_Window tkwin, 
 				int rootX, int rootY, int * newX, int * newY));
+#endif
+#ifndef TkMacOSXContainerId_TCL_DECLARED
+#define TkMacOSXContainerId_TCL_DECLARED
 /* 43 */
 EXTERN MacDrawable *	TkMacOSXContainerId _ANSI_ARGS_((TkWindow * winPtr));
+#endif
+#ifndef TkMacOSXGetHostToplevel_TCL_DECLARED
+#define TkMacOSXGetHostToplevel_TCL_DECLARED
 /* 44 */
 EXTERN MacDrawable *	TkMacOSXGetHostToplevel _ANSI_ARGS_((
 				TkWindow * winPtr));
+#endif
+#ifndef TkMacOSXPreprocessMenu_TCL_DECLARED
+#define TkMacOSXPreprocessMenu_TCL_DECLARED
 /* 45 */
 EXTERN void		TkMacOSXPreprocessMenu _ANSI_ARGS_((void));
+#endif
+#ifndef TkpIsWindowFloating_TCL_DECLARED
+#define TkpIsWindowFloating_TCL_DECLARED
 /* 46 */
 EXTERN int		TkpIsWindowFloating _ANSI_ARGS_((WindowRef window));
+#endif
+#ifndef TkMacOSXGetCapture_TCL_DECLARED
+#define TkMacOSXGetCapture_TCL_DECLARED
 /* 47 */
 EXTERN Tk_Window	TkMacOSXGetCapture _ANSI_ARGS_((void));
+#endif
 /* Slot 48 is reserved */
+#ifndef TkGetTransientMaster_TCL_DECLARED
+#define TkGetTransientMaster_TCL_DECLARED
 /* 49 */
 EXTERN Window		TkGetTransientMaster _ANSI_ARGS_((TkWindow * winPtr));
+#endif
+#ifndef TkGenerateButtonEvent_TCL_DECLARED
+#define TkGenerateButtonEvent_TCL_DECLARED
 /* 50 */
 EXTERN int		TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, 
 				Window window, unsigned int state));
+#endif
+#ifndef TkGenWMDestroyEvent_TCL_DECLARED
+#define TkGenWMDestroyEvent_TCL_DECLARED
 /* 51 */
 EXTERN void		TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin));
+#endif
 /* Slot 52 is reserved */
+#ifndef TkpGetMS_TCL_DECLARED
+#define TkpGetMS_TCL_DECLARED
 /* 53 */
 EXTERN unsigned long	TkpGetMS _ANSI_ARGS_((void));
+#endif
 #endif /* MAC_OSX_TK */
 #if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */
+#ifndef TkCreateXEventSource_TCL_DECLARED
+#define TkCreateXEventSource_TCL_DECLARED
 /* 0 */
 EXTERN void		TkCreateXEventSource _ANSI_ARGS_((void));
+#endif
+#ifndef TkFreeWindowId_TCL_DECLARED
+#define TkFreeWindowId_TCL_DECLARED
 /* 1 */
 EXTERN void		TkFreeWindowId _ANSI_ARGS_((TkDisplay * dispPtr, 
 				Window w));
+#endif
+#ifndef TkInitXId_TCL_DECLARED
+#define TkInitXId_TCL_DECLARED
 /* 2 */
 EXTERN void		TkInitXId _ANSI_ARGS_((TkDisplay * dispPtr));
+#endif
+#ifndef TkpCmapStressed_TCL_DECLARED
+#define TkpCmapStressed_TCL_DECLARED
 /* 3 */
 EXTERN int		TkpCmapStressed _ANSI_ARGS_((Tk_Window tkwin, 
 				Colormap colormap));
+#endif
+#ifndef TkpSync_TCL_DECLARED
+#define TkpSync_TCL_DECLARED
 /* 4 */
 EXTERN void		TkpSync _ANSI_ARGS_((Display * display));
+#endif
+#ifndef TkUnixContainerId_TCL_DECLARED
+#define TkUnixContainerId_TCL_DECLARED
 /* 5 */
 EXTERN Window		TkUnixContainerId _ANSI_ARGS_((TkWindow * winPtr));
+#endif
+#ifndef TkUnixDoOneXEvent_TCL_DECLARED
+#define TkUnixDoOneXEvent_TCL_DECLARED
 /* 6 */
 EXTERN int		TkUnixDoOneXEvent _ANSI_ARGS_((Tcl_Time * timePtr));
+#endif
+#ifndef TkUnixSetMenubar_TCL_DECLARED
+#define TkUnixSetMenubar_TCL_DECLARED
 /* 7 */
 EXTERN void		TkUnixSetMenubar _ANSI_ARGS_((Tk_Window tkwin, 
 				Tk_Window menubar));
+#endif
+#ifndef TkpScanWindowId_TCL_DECLARED
+#define TkpScanWindowId_TCL_DECLARED
 /* 8 */
 EXTERN int		TkpScanWindowId _ANSI_ARGS_((Tcl_Interp * interp, 
 				CONST char * string, Window * idPtr));
+#endif
+#ifndef TkWmCleanup_TCL_DECLARED
+#define TkWmCleanup_TCL_DECLARED
 /* 9 */
 EXTERN void		TkWmCleanup _ANSI_ARGS_((TkDisplay * dispPtr));
+#endif
+#ifndef TkSendCleanup_TCL_DECLARED
+#define TkSendCleanup_TCL_DECLARED
 /* 10 */
 EXTERN void		TkSendCleanup _ANSI_ARGS_((TkDisplay * dispPtr));
+#endif
+#ifndef TkFreeXId_TCL_DECLARED
+#define TkFreeXId_TCL_DECLARED
 /* 11 */
 EXTERN void		TkFreeXId _ANSI_ARGS_((TkDisplay * dispPtr));
+#endif
+#ifndef TkpWmSetState_TCL_DECLARED
+#define TkpWmSetState_TCL_DECLARED
 /* 12 */
 EXTERN int		TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, 
 				int state));
+#endif
 #endif /* X11 */
 
 typedef struct TkIntPlatStubs {