Add more (dummy) stub entries. Make TkGenerateActivateEvents() available for more platforms than only MacOS and win32.

8 files changed, 340 insertions, 90 deletions

diff --git a/generic/tk.decls b/generic/tk.decls
index 9ceb3af..ee1d97b 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1139,6 +1139,30 @@ declare 9 aqua {
 declare 10 aqua {
     int Tk_MacOSXIsAppInFront(void)
 }
+declare 11 aqua {
+    void Tk_MacOSXSetEmbedHandler_(
+	    Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr,
+	    Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr,
+	    Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr,
+	    Tk_MacOSXEmbedGetClipProc *getClipProc,
+	    Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc)
+}
+declare 12 aqua {
+    void Tk_MacOSXTurnOffMenus_(void)
+}
+declare 13 aqua {
+    void Tk_MacOSXTkOwnsCursor_(int tkOwnsIt)
+}
+declare 14 aqua {
+    void TkMacOSXInitMenus_(Tcl_Interp *interp)
+}
+declare 15 aqua {
+    void TkMacOSXInitAppleEvents_(Tcl_Interp *interp)
+}
+declare 16 aqua {
+    void TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y, int width,
+	    int height, int flags)
+}
 
 ##############################################################################
 
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index 3643a9f..0beb8b6 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -1630,6 +1630,47 @@ TkQueueEventForAllChildren(
 /*
  *----------------------------------------------------------------------
  *
+ * TkGenerateActivateEvents --
+ *
+ *	This function is called by the Mac and Windows window manager routines
+ *	when a toplevel window is activated or deactivated.
+ *	Activate/Deactivate events will be sent to every subwindow of the
+ *	toplevel followed by a FocusIn/FocusOut message.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Generates X events.
+ *
+ *----------------------------------------------------------------------
+ */
+
+void
+TkGenerateActivateEvents(
+    TkWindow *winPtr,		/* Toplevel to activate. */
+    int active)			/* Non-zero if the window is being activated,
+				 * else 0.*/
+{
+    XEvent event;
+
+    /*
+     * Generate Activate and Deactivate events. This event is sent to every
+     * subwindow in a toplevel window.
+     */
+
+    event.xany.serial = NextRequest(winPtr->display);
+    event.xany.send_event = False;
+    event.xany.display = winPtr->display;
+    event.xany.window = winPtr->window;
+
+    event.xany.type = active ? ActivateNotify : DeactivateNotify;
+    TkQueueEventForAllChildren(winPtr, &event);
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * WindowEventProc --
  *
  *	This function is called by Tcl_DoOneEvent when a window event reaches
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index a037cd4..bb2057b 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -648,10 +648,9 @@ interface tkIntPlat
 declare 0 x11 {
     void TkCreateXEventSource(void)
 }
-#
-# Slot 1 unused (WAS: TkFreeWindowId)
-# Slot 2 unused (WAS: TkInitXId)
-#
+declare 2 x11 {
+    void TkGenerateActivateEvents(TkWindow *winPtr, int active)
+}
 declare 3 x11 {
     int TkpCmapStressed(Tk_Window tkwin, Colormap colormap)
 }
@@ -676,9 +675,6 @@ declare 9 x11 {
 declare 10 x11 {
     void TkSendCleanup(TkDisplay *dispPtr)
 }
-#
-# Slot 11 unused (WAS: TkFreeXId)
-#
 declare 12 x11 {
     int TkpWmSetState(TkWindow *winPtr, int state)
 }
@@ -687,6 +683,32 @@ declare 13 x11 {
     int TkpTestsendCmd(ClientData clientData, Tcl_Interp *interp, int objc,
 	    Tcl_Obj *const objv[])
 }
+declare 38 x11 {
+    int TkpCmapStressed_(Tk_Window tkwin, Colormap colormap)
+}
+declare 39 x11 {
+    void TkpSync_(Display *display)
+}
+declare 40 x11 {
+    Window TkUnixContainerId_(TkWindow *winPtr)
+}
+declare 41 x11 {
+    int TkUnixDoOneXEvent_(Tcl_Time *timePtr)
+}
+declare 42 x11 {
+    void TkUnixSetMenubar_(Tk_Window tkwin, Tk_Window menubar)
+}
+declare 43 x11 {
+    void TkWmCleanup_(TkDisplay *dispPtr)
+}
+declare 44 x11 {
+    void TkSendCleanup_(TkDisplay *dispPtr)
+}
+# only needed by tktest:
+declare 45 x11 {
+    int TkpTestsendCmd_(ClientData clientData, Tcl_Interp *interp, int objc,
+	    Tcl_Obj *const objv[])
+}
 
 ################################
 # Windows specific functions
@@ -854,16 +876,9 @@ declare 47 win {
 declare 0 aqua {
     void TkGenerateActivateEvents(TkWindow *winPtr, int active)
 }
-
-# removed duplicates from tkInt table
-#declare 1 aqua {
-#    Pixmap TkpCreateNativeBitmap(Display *display, const void *source)
-#}
-#
-#declare 2 aqua {
-#    void TkpDefineNativeBitmaps(void)
-#}
-
+declare 2 aqua {
+    void TkGenerateActivateEvents_(TkWindow *winPtr, int active)
+}
 declare 3 aqua {
     void TkPointerDeadWindow(TkWindow *winPtr)
 }
@@ -894,21 +909,9 @@ declare 11 aqua {
 declare 12 aqua {
     void TkMacOSXHandleTearoffMenu(void)
 }
-
-# removed duplicate from tkPlat table(tk.decls)
-#declare 13 aqua {
-#    void TkMacOSXInvalClipRgns(TkWindow *winPtr)
-#}
-
 declare 14 aqua {
     int TkMacOSXDoHLEvent(void *theEvent)
 }
-
-# removed duplicate from tkPlat table(tk.decls)
-#declare 15 aqua {
-#    void *TkMacOSXGetDrawablePort(Drawable drawable)
-#}
-
 declare 16 aqua {
     Window TkMacOSXGetXWindow(void *macWinPtr)
 }
@@ -986,9 +989,6 @@ declare 38 aqua {
 declare 39 aqua {
     void TkSetWMName(TkWindow *winPtr, Tk_Uid titleUid)
 }
-#
-# Slot 40 unused (WAS: TkSuspendClipboard)
-#
 declare 41 aqua {
     int TkMacOSXZoomToplevel(void *whichWindow, short zoomPart)
 }
@@ -1023,17 +1023,9 @@ declare 51 aqua {
 declare 52 aqua {
     void TkMacOSXSetDrawingEnabled(TkWindow *winPtr, int flag)
 }
-
-# removed duplicate from tkPlat table (tk.decls)
-#declare 52 aqua {
-#    void TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y,
-# 	    int width, int height, int flags)
-#}
-
 declare 53 aqua {
     unsigned long TkpGetMS(void)
 }
-
 # For Canvas3d, requested by Sean Woods
 declare 54 aqua {
     void *TkMacOSXDrawable(Drawable drawable)
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index eb32c00..fa1833e 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -1160,6 +1160,14 @@ extern const TkIntStubs *tkIntStubsPtr;
 #undef TkSetRegion
 #undef TkSubtractRegion
 #undef TkUnionRectWithRegion
+#undef TkpCmapStressed_
+#undef TkpSync_
+#undef TkUnixContainerId_
+#undef TkUnixDoOneXEvent_
+#undef TkUnixSetMenubar_
+#undef TkWmCleanup_
+#undef TkSendCleanup_
+#undef TkpTestsendCmd_
 
 #define TkClipBox(rgn, rect) XClipBox((Region) rgn, rect)
 #define TkCreateRegion() (TkRegion) XCreateRegion()
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index f496e55..8221d7a 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -151,7 +151,9 @@ EXTERN Tk_Window	TkpGetCapture(void);
 EXTERN void		TkGenerateActivateEvents(TkWindow *winPtr,
 				int active);
 /* Slot 1 is reserved */
-/* Slot 2 is reserved */
+/* 2 */
+EXTERN void		TkGenerateActivateEvents_(TkWindow *winPtr,
+				int active);
 /* 3 */
 EXTERN void		TkPointerDeadWindow(TkWindow *winPtr);
 /* 4 */
@@ -266,7 +268,9 @@ EXTERN int		TkpScanWindowId(Tcl_Interp *interp,
 /* 0 */
 EXTERN void		TkCreateXEventSource(void);
 /* Slot 1 is reserved */
-/* Slot 2 is reserved */
+/* 2 */
+EXTERN void		TkGenerateActivateEvents(TkWindow *winPtr,
+				int active);
 /* 3 */
 EXTERN int		TkpCmapStressed(Tk_Window tkwin, Colormap colormap);
 /* 4 */
@@ -291,6 +295,48 @@ EXTERN int		TkpWmSetState(TkWindow *winPtr, int state);
 EXTERN int		TkpTestsendCmd(ClientData clientData,
 				Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[]);
+/* Slot 14 is reserved */
+/* Slot 15 is reserved */
+/* Slot 16 is reserved */
+/* Slot 17 is reserved */
+/* Slot 18 is reserved */
+/* Slot 19 is reserved */
+/* Slot 20 is reserved */
+/* Slot 21 is reserved */
+/* Slot 22 is reserved */
+/* Slot 23 is reserved */
+/* Slot 24 is reserved */
+/* Slot 25 is reserved */
+/* Slot 26 is reserved */
+/* Slot 27 is reserved */
+/* Slot 28 is reserved */
+/* Slot 29 is reserved */
+/* Slot 30 is reserved */
+/* Slot 31 is reserved */
+/* Slot 32 is reserved */
+/* Slot 33 is reserved */
+/* Slot 34 is reserved */
+/* Slot 35 is reserved */
+/* Slot 36 is reserved */
+/* Slot 37 is reserved */
+/* 38 */
+EXTERN int		TkpCmapStressed_(Tk_Window tkwin, Colormap colormap);
+/* 39 */
+EXTERN void		TkpSync_(Display *display);
+/* 40 */
+EXTERN Window		TkUnixContainerId_(TkWindow *winPtr);
+/* 41 */
+EXTERN int		TkUnixDoOneXEvent_(Tcl_Time *timePtr);
+/* 42 */
+EXTERN void		TkUnixSetMenubar_(Tk_Window tkwin, Tk_Window menubar);
+/* 43 */
+EXTERN void		TkWmCleanup_(TkDisplay *dispPtr);
+/* 44 */
+EXTERN void		TkSendCleanup_(TkDisplay *dispPtr);
+/* 45 */
+EXTERN int		TkpTestsendCmd_(ClientData clientData,
+				Tcl_Interp *interp, int objc,
+				Tcl_Obj *const objv[]);
 #endif /* X11 */
 
 typedef struct TkIntPlatStubs {
@@ -350,7 +396,7 @@ typedef struct TkIntPlatStubs {
 #ifdef MAC_OSX_TK /* AQUA */
     void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 0 */
     void (*reserved1)(void);
-    void (*reserved2)(void);
+    void (*tkGenerateActivateEvents_) (TkWindow *winPtr, int active); /* 2 */
     void (*tkPointerDeadWindow) (TkWindow *winPtr); /* 3 */
     void (*tkpSetCapture) (TkWindow *winPtr); /* 4 */
     void (*tkpSetCursor) (TkpCursor cursor); /* 5 */
@@ -408,7 +454,7 @@ typedef struct TkIntPlatStubs {
 #if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
     void (*tkCreateXEventSource) (void); /* 0 */
     void (*reserved1)(void);
-    void (*reserved2)(void);
+    void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 2 */
     int (*tkpCmapStressed) (Tk_Window tkwin, Colormap colormap); /* 3 */
     void (*tkpSync) (Display *display); /* 4 */
     Window (*tkUnixContainerId) (TkWindow *winPtr); /* 5 */
@@ -420,6 +466,38 @@ typedef struct TkIntPlatStubs {
     void (*reserved11)(void);
     int (*tkpWmSetState) (TkWindow *winPtr, int state); /* 12 */
     int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 13 */
+    void (*reserved14)(void);
+    void (*reserved15)(void);
+    void (*reserved16)(void);
+    void (*reserved17)(void);
+    void (*reserved18)(void);
+    void (*reserved19)(void);
+    void (*reserved20)(void);
+    void (*reserved21)(void);
+    void (*reserved22)(void);
+    void (*reserved23)(void);
+    void (*reserved24)(void);
+    void (*reserved25)(void);
+    void (*reserved26)(void);
+    void (*reserved27)(void);
+    void (*reserved28)(void);
+    void (*reserved29)(void);
+    void (*reserved30)(void);
+    void (*reserved31)(void);
+    void (*reserved32)(void);
+    void (*reserved33)(void);
+    void (*reserved34)(void);
+    void (*reserved35)(void);
+    void (*reserved36)(void);
+    void (*reserved37)(void);
+    int (*tkpCmapStressed_) (Tk_Window tkwin, Colormap colormap); /* 38 */
+    void (*tkpSync_) (Display *display); /* 39 */
+    Window (*tkUnixContainerId_) (TkWindow *winPtr); /* 40 */
+    int (*tkUnixDoOneXEvent_) (Tcl_Time *timePtr); /* 41 */
+    void (*tkUnixSetMenubar_) (Tk_Window tkwin, Tk_Window menubar); /* 42 */
+    void (*tkWmCleanup_) (TkDisplay *dispPtr); /* 43 */
+    void (*tkSendCleanup_) (TkDisplay *dispPtr); /* 44 */
+    int (*tkpTestsendCmd_) (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 45 */
 #endif /* X11 */
 } TkIntPlatStubs;
 
@@ -535,7 +613,8 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkGenerateActivateEvents \
 	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */
 /* Slot 1 is reserved */
-/* Slot 2 is reserved */
+#define TkGenerateActivateEvents_ \
+	(tkIntPlatStubsPtr->tkGenerateActivateEvents_) /* 2 */
 #define TkPointerDeadWindow \
 	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 3 */
 #define TkpSetCapture \
@@ -641,7 +720,8 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 #define TkCreateXEventSource \
 	(tkIntPlatStubsPtr->tkCreateXEventSource) /* 0 */
 /* Slot 1 is reserved */
-/* Slot 2 is reserved */
+#define TkGenerateActivateEvents \
+	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 2 */
 #define TkpCmapStressed \
 	(tkIntPlatStubsPtr->tkpCmapStressed) /* 3 */
 #define TkpSync \
@@ -663,12 +743,62 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkpWmSetState) /* 12 */
 #define TkpTestsendCmd \
 	(tkIntPlatStubsPtr->tkpTestsendCmd) /* 13 */
+/* Slot 14 is reserved */
+/* Slot 15 is reserved */
+/* Slot 16 is reserved */
+/* Slot 17 is reserved */
+/* Slot 18 is reserved */
+/* Slot 19 is reserved */
+/* Slot 20 is reserved */
+/* Slot 21 is reserved */
+/* Slot 22 is reserved */
+/* Slot 23 is reserved */
+/* Slot 24 is reserved */
+/* Slot 25 is reserved */
+/* Slot 26 is reserved */
+/* Slot 27 is reserved */
+/* Slot 28 is reserved */
+/* Slot 29 is reserved */
+/* Slot 30 is reserved */
+/* Slot 31 is reserved */
+/* Slot 32 is reserved */
+/* Slot 33 is reserved */
+/* Slot 34 is reserved */
+/* Slot 35 is reserved */
+/* Slot 36 is reserved */
+/* Slot 37 is reserved */
+#define TkpCmapStressed_ \
+	(tkIntPlatStubsPtr->tkpCmapStressed_) /* 38 */
+#define TkpSync_ \
+	(tkIntPlatStubsPtr->tkpSync_) /* 39 */
+#define TkUnixContainerId_ \
+	(tkIntPlatStubsPtr->tkUnixContainerId_) /* 40 */
+#define TkUnixDoOneXEvent_ \
+	(tkIntPlatStubsPtr->tkUnixDoOneXEvent_) /* 41 */
+#define TkUnixSetMenubar_ \
+	(tkIntPlatStubsPtr->tkUnixSetMenubar_) /* 42 */
+#define TkWmCleanup_ \
+	(tkIntPlatStubsPtr->tkWmCleanup_) /* 43 */
+#define TkSendCleanup_ \
+	(tkIntPlatStubsPtr->tkSendCleanup_) /* 44 */
+#define TkpTestsendCmd_ \
+	(tkIntPlatStubsPtr->tkpTestsendCmd_) /* 45 */
 #endif /* X11 */
 
 #endif /* defined(USE_TK_STUBS) */
 
 /* !END!: Do not edit above this line. */
 
+#undef TkpCmapStressed_
+#undef TkpSync_
+#undef TkUnixContainerId_
+#undef TkUnixDoOneXEvent_
+#undef TkUnixSetMenubar_
+#undef TkWmCleanup_
+#undef TkSendCleanup_
+#undef TkpTestsendCmd_
+#undef TkGenerateActivateEvents_
+
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 1e69c88..db9141c 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -82,6 +82,24 @@ EXTERN void *		TkMacOSXGetRootControl(Drawable drawable);
 EXTERN void		Tk_MacOSXSetupTkNotifier(void);
 /* 10 */
 EXTERN int		Tk_MacOSXIsAppInFront(void);
+/* 11 */
+EXTERN void		Tk_MacOSXSetEmbedHandler_(
+				Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr,
+				Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr,
+				Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr,
+				Tk_MacOSXEmbedGetClipProc *getClipProc,
+				Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc);
+/* 12 */
+EXTERN void		Tk_MacOSXTurnOffMenus_(void);
+/* 13 */
+EXTERN void		Tk_MacOSXTkOwnsCursor_(int tkOwnsIt);
+/* 14 */
+EXTERN void		TkMacOSXInitMenus_(Tcl_Interp *interp);
+/* 15 */
+EXTERN void		TkMacOSXInitAppleEvents_(Tcl_Interp *interp);
+/* 16 */
+EXTERN void		TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y,
+				int width, int height, int flags);
 #endif /* AQUA */
 
 typedef struct TkPlatStubs {
@@ -108,6 +126,12 @@ typedef struct TkPlatStubs {
     void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
     void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
+    void (*tk_MacOSXSetEmbedHandler_) (Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); /* 11 */
+    void (*tk_MacOSXTurnOffMenus_) (void); /* 12 */
+    void (*tk_MacOSXTkOwnsCursor_) (int tkOwnsIt); /* 13 */
+    void (*tkMacOSXInitMenus_) (Tcl_Interp *interp); /* 14 */
+    void (*tkMacOSXInitAppleEvents_) (Tcl_Interp *interp); /* 15 */
+    void (*tkGenWMConfigureEvent_) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 16 */
 #endif /* AQUA */
 } TkPlatStubs;
 
@@ -160,12 +184,31 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 9 */
 #define Tk_MacOSXIsAppInFront \
 	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
+#define Tk_MacOSXSetEmbedHandler_ \
+	(tkPlatStubsPtr->tk_MacOSXSetEmbedHandler_) /* 11 */
+#define Tk_MacOSXTurnOffMenus_ \
+	(tkPlatStubsPtr->tk_MacOSXTurnOffMenus_) /* 12 */
+#define Tk_MacOSXTkOwnsCursor_ \
+	(tkPlatStubsPtr->tk_MacOSXTkOwnsCursor_) /* 13 */
+#define TkMacOSXInitMenus_ \
+	(tkPlatStubsPtr->tkMacOSXInitMenus_) /* 14 */
+#define TkMacOSXInitAppleEvents_ \
+	(tkPlatStubsPtr->tkMacOSXInitAppleEvents_) /* 15 */
+#define TkGenWMConfigureEvent_ \
+	(tkPlatStubsPtr->tkGenWMConfigureEvent_) /* 16 */
 #endif /* AQUA */
 
 #endif /* defined(USE_TK_STUBS) */
 
 /* !END!: Do not edit above this line. */
 
+#undef Tk_MacOSXSetEmbedHandler_
+#undef Tk_MacOSXTurnOffMenus_
+#undef Tk_MacOSXTkOwnsCursor_
+#undef TkMacOSXInitMenus_
+#undef TkMacOSXInitAppleEvents_
+#undef TkGenWMConfigureEvent_
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/generic/tkPointer.c b/generic/tkPointer.c
index f764904..06359a9 100644
--- a/generic/tkPointer.c
+++ b/generic/tkPointer.c
@@ -594,47 +594,6 @@ XDefineCursor(
 }
 
 /*
- *----------------------------------------------------------------------
- *
- * TkGenerateActivateEvents --
- *
- *	This function is called by the Mac and Windows window manager routines
- *	when a toplevel window is activated or deactivated.
- *	Activate/Deactivate events will be sent to every subwindow of the
- *	toplevel followed by a FocusIn/FocusOut message.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Generates X events.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TkGenerateActivateEvents(
-    TkWindow *winPtr,		/* Toplevel to activate. */
-    int active)			/* Non-zero if the window is being activated,
-				 * else 0.*/
-{
-    XEvent event;
-
-    /*
-     * Generate Activate and Deactivate events. This event is sent to every
-     * subwindow in a toplevel window.
-     */
-
-    event.xany.serial = winPtr->display->request++;
-    event.xany.send_event = False;
-    event.xany.display = winPtr->display;
-    event.xany.window = winPtr->window;
-
-    event.xany.type = active ? ActivateNotify : DeactivateNotify;
-    TkQueueEventForAllChildren(winPtr, &event);
-}
-
-/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 8152dfe..61c698a 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -47,6 +47,22 @@ MODULE_SCOPE const TkStubs tkStubs;
 #undef XFlush
 #define TkUnusedStubEntry 0
 
+#define TkpCmapStressed_ TkpCmapStressed
+#define TkpSync_ TkpSync
+#define TkUnixContainerId_ TkUnixContainerId
+#define TkUnixDoOneXEvent_ TkUnixDoOneXEvent
+#define TkUnixSetMenubar_ TkUnixSetMenubar
+#define TkWmCleanup_ TkWmCleanup
+#define TkSendCleanup_ TkSendCleanup
+#define TkpTestsendCmd_ TkpTestsendCmd
+#define Tk_MacOSXSetEmbedHandler_ Tk_MacOSXSetEmbedHandler
+#define Tk_MacOSXTurnOffMenus_ Tk_MacOSXTurnOffMenus
+#define Tk_MacOSXTkOwnsCursor_ Tk_MacOSXTkOwnsCursor
+#define TkMacOSXInitMenus_ TkMacOSXInitMenus
+#define TkMacOSXInitAppleEvents_ TkMacOSXInitAppleEvents
+#define TkGenWMConfigureEvent_ TkGenWMConfigureEvent
+#define TkGenerateActivateEvents_ TkGenerateActivateEvents
+
 #ifdef _WIN32
 
 int
@@ -184,7 +200,6 @@ int TkSubtractRegion (TkRegion a, TkRegion b, TkRegion c)
 #	define Tk_PointerEvent 0
 #	define Tk_TranslateWinEvent 0
 #	define TkAlignImageData 0
-#	define TkGenerateActivateEvents 0
 #	define TkpGetMS 0
 #	define TkpGetCapture 0
 #	define TkPointerDeadWindow 0
@@ -528,7 +543,7 @@ static const TkIntPlatStubs tkIntPlatStubs = {
 #ifdef MAC_OSX_TK /* AQUA */
     TkGenerateActivateEvents, /* 0 */
     0, /* 1 */
-    0, /* 2 */
+    TkGenerateActivateEvents_, /* 2 */
     TkPointerDeadWindow, /* 3 */
     TkpSetCapture, /* 4 */
     TkpSetCursor, /* 5 */
@@ -586,7 +601,7 @@ static const TkIntPlatStubs tkIntPlatStubs = {
 #if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
     TkCreateXEventSource, /* 0 */
     0, /* 1 */
-    0, /* 2 */
+    TkGenerateActivateEvents, /* 2 */
     TkpCmapStressed, /* 3 */
     TkpSync, /* 4 */
     TkUnixContainerId, /* 5 */
@@ -598,6 +613,38 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     0, /* 11 */
     TkpWmSetState, /* 12 */
     TkpTestsendCmd, /* 13 */
+    0, /* 14 */
+    0, /* 15 */
+    0, /* 16 */
+    0, /* 17 */
+    0, /* 18 */
+    0, /* 19 */
+    0, /* 20 */
+    0, /* 21 */
+    0, /* 22 */
+    0, /* 23 */
+    0, /* 24 */
+    0, /* 25 */
+    0, /* 26 */
+    0, /* 27 */
+    0, /* 28 */
+    0, /* 29 */
+    0, /* 30 */
+    0, /* 31 */
+    0, /* 32 */
+    0, /* 33 */
+    0, /* 34 */
+    0, /* 35 */
+    0, /* 36 */
+    0, /* 37 */
+    TkpCmapStressed_, /* 38 */
+    TkpSync_, /* 39 */
+    TkUnixContainerId_, /* 40 */
+    TkUnixDoOneXEvent_, /* 41 */
+    TkUnixSetMenubar_, /* 42 */
+    TkWmCleanup_, /* 43 */
+    TkSendCleanup_, /* 44 */
+    TkpTestsendCmd_, /* 45 */
 #endif /* X11 */
 };
 
@@ -951,6 +998,12 @@ static const TkPlatStubs tkPlatStubs = {
     TkMacOSXGetRootControl, /* 8 */
     Tk_MacOSXSetupTkNotifier, /* 9 */
     Tk_MacOSXIsAppInFront, /* 10 */
+    Tk_MacOSXSetEmbedHandler_, /* 11 */
+    Tk_MacOSXTurnOffMenus_, /* 12 */
+    Tk_MacOSXTkOwnsCursor_, /* 13 */
+    TkMacOSXInitMenus_, /* 14 */
+    TkMacOSXInitAppleEvents_, /* 15 */
+    TkGenWMConfigureEvent_, /* 16 */
 #endif /* AQUA */
 };