Fix [08eb057dea]: Aqua: cleanup Carbon-era cursor variables.

Do more cleanup: No browser still supports NSAPI, so functions like Tk_MacOSXSetEmbedHandler() don't make any sense any more

5 files changed, 41 insertions, 72 deletions

diff --git a/generic/tk.decls b/generic/tk.decls
index a77720f..502fda1 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1139,26 +1139,6 @@ 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/tkInt.decls b/generic/tkInt.decls
index 95d3802..03dfd91 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -918,9 +918,10 @@ declare 9 aqua {
 declare 10 aqua {
     int TkMacOSXDispatchMenuEvent(int menuID, int index)
 }
-declare 11 aqua {
-    void TkMacOSXInstallCursor(int resizeOverride)
-}
+# Now a static function
+# declare 11 aqua {
+#     void TkMacOSXInstallCursor(int resizeOverride)
+# }
 declare 12 aqua {
     void TkMacOSXHandleTearoffMenu(void)
 }
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index aecc222..0c577dc 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -170,8 +170,7 @@ EXTERN unsigned int	TkMacOSXButtonKeyState(void);
 EXTERN void		TkMacOSXClearMenubarActive(void);
 /* 10 */
 EXTERN int		TkMacOSXDispatchMenuEvent(int menuID, int index);
-/* 11 */
-EXTERN void		TkMacOSXInstallCursor(int resizeOverride);
+/* Slot 11 is reserved */
 /* 12 */
 EXTERN void		TkMacOSXHandleTearoffMenu(void);
 /* Slot 13 is reserved */
@@ -405,7 +404,7 @@ typedef struct TkIntPlatStubs {
     unsigned int (*tkMacOSXButtonKeyState) (void); /* 8 */
     void (*tkMacOSXClearMenubarActive) (void); /* 9 */
     int (*tkMacOSXDispatchMenuEvent) (int menuID, int index); /* 10 */
-    void (*tkMacOSXInstallCursor) (int resizeOverride); /* 11 */
+    void (*reserved11)(void);
     void (*tkMacOSXHandleTearoffMenu) (void); /* 12 */
     void (*reserved13)(void);
     int (*tkMacOSXDoHLEvent) (void *theEvent); /* 14 */
@@ -631,8 +630,7 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkMacOSXClearMenubarActive) /* 9 */
 #define TkMacOSXDispatchMenuEvent \
 	(tkIntPlatStubsPtr->tkMacOSXDispatchMenuEvent) /* 10 */
-#define TkMacOSXInstallCursor \
-	(tkIntPlatStubsPtr->tkMacOSXInstallCursor) /* 11 */
+/* Slot 11 is reserved */
 #define TkMacOSXHandleTearoffMenu \
 	(tkIntPlatStubsPtr->tkMacOSXHandleTearoffMenu) /* 12 */
 /* Slot 13 is reserved */
@@ -798,6 +796,9 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 #undef TkSendCleanup_
 #undef TkpTestsendCmd_
 #undef TkGenerateActivateEvents_
+#undef TkMacOSXSetUpClippingRgn
+#undef Tk_MacOSXTkOwnsCursor
+#undef Tk_MacOSXTurnOffMenus
 
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index db9141c..fd48e87 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -82,21 +82,11 @@ 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);
+/* Slot 11 is reserved */
+/* Slot 12 is reserved */
+/* Slot 13 is reserved */
+/* Slot 14 is reserved */
+/* Slot 15 is reserved */
 /* 16 */
 EXTERN void		TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y,
 				int width, int height, int flags);
@@ -126,11 +116,11 @@ 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 (*reserved11)(void);
+    void (*reserved12)(void);
+    void (*reserved13)(void);
+    void (*reserved14)(void);
+    void (*reserved15)(void);
     void (*tkGenWMConfigureEvent_) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 16 */
 #endif /* AQUA */
 } TkPlatStubs;
@@ -184,16 +174,11 @@ 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 */
+/* Slot 11 is reserved */
+/* Slot 12 is reserved */
+/* Slot 13 is reserved */
+/* Slot 14 is reserved */
+/* Slot 15 is reserved */
 #define TkGenWMConfigureEvent_ \
 	(tkPlatStubsPtr->tkGenWMConfigureEvent_) /* 16 */
 #endif /* AQUA */
@@ -202,12 +187,11 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
-#undef Tk_MacOSXSetEmbedHandler_
 #undef Tk_MacOSXTurnOffMenus_
-#undef Tk_MacOSXTkOwnsCursor_
 #undef TkMacOSXInitMenus_
-#undef TkMacOSXInitAppleEvents_
 #undef TkGenWMConfigureEvent_
+#undef Tk_MacOSXSetEmbedHandler
+#undef Tk_MacOSXTurnOffMenus
 
 #ifdef __cplusplus
 }
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 8ebcb18..40ee8bb 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -44,6 +44,14 @@ MODULE_SCOPE const TkStubs tkStubs;
 #undef TkPutImage
 #undef XPutImage
 #define TkMacOSXSetUpClippingRgn (void (*)(Drawable))(void *)doNothing
+#define Tk_MacOSXTkOwnsCursor (void (*)(int))(void *)doNothing
+#define Tk_MacOSXTurnOffMenus (void (*)(void))(void *)doNothing
+#define TkMacOSXInitMenus (void (*)(Tcl_Interp *))(void *)doNothing
+#define Tk_MacOSXSetEmbedHandler (void (*)(Tk_MacOSXEmbedRegisterWinProc *, \
+	Tk_MacOSXEmbedGetGrafPortProc *, \
+	Tk_MacOSXEmbedMakeContainerExistProc *, \
+	Tk_MacOSXEmbedGetClipProc *, \
+	Tk_MacOSXEmbedGetOffsetInParentProc *))(void *)doNothing
 
 #if defined(_WIN32) && !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 #   define Tk_TranslateWinEvent TkTranslateWinEvent
@@ -102,11 +110,6 @@ static Tk_Style Tk_GetStyleFromObj(Tcl_Obj *obj)
 #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
 #define Tk_CanvasTagsParseProc \
@@ -591,7 +594,7 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXButtonKeyState, /* 8 */
     TkMacOSXClearMenubarActive, /* 9 */
     TkMacOSXDispatchMenuEvent, /* 10 */
-    TkMacOSXInstallCursor, /* 11 */
+    0, /* 11 */
     TkMacOSXHandleTearoffMenu, /* 12 */
     0, /* 13 */
     TkMacOSXDoHLEvent, /* 14 */
@@ -1037,11 +1040,11 @@ 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 */
+    0, /* 11 */
+    0, /* 12 */
+    0, /* 13 */
+    0, /* 14 */
+    0, /* 15 */
     TkGenWMConfigureEvent_, /* 16 */
 #endif /* AQUA */
 };