Review: Suggested to rename TkpGetCapture back to TkMacOSXGetCapture for MacOSX, and keep the same return type (also for TkpGetCapture).

4 files changed, 18 insertions, 14 deletions

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 0183bfc..62441e5 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -844,8 +844,8 @@ declare 45 win {
     int TkpTestsendCmd(ClientData clientData, Tcl_Interp *interp, int objc,
 	    Tcl_Obj *const objv[])
 }
-declare 46 win {
-    TkWindow *TkpGetCapture(void)
+declare 47 win {
+    Tk_Window TkpGetCapture(void)
 }
 
 ################################
@@ -1009,7 +1009,7 @@ declare 46 aqua {
     int TkpIsWindowFloating(void *window)
 }
 declare 47 aqua {
-    TkWindow *TkpGetCapture(void)
+    Tk_Window TkMacOSXGetCapture(void)
 }
 declare 49 aqua {
     Tk_Window TkGetTransientMaster(TkWindow *winPtr)
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 7c09d3d..f496e55 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -142,8 +142,9 @@ EXTERN void		TkSendCleanup(TkDisplay *dispPtr);
 EXTERN int		TkpTestsendCmd(ClientData clientData,
 				Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[]);
-/* 46 */
-EXTERN TkWindow *	TkpGetCapture(void);
+/* Slot 46 is reserved */
+/* 47 */
+EXTERN Tk_Window	TkpGetCapture(void);
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
 /* 0 */
@@ -242,7 +243,7 @@ EXTERN void		TkMacOSXPreprocessMenu(void);
 /* 46 */
 EXTERN int		TkpIsWindowFloating(void *window);
 /* 47 */
-EXTERN TkWindow *	TkpGetCapture(void);
+EXTERN Tk_Window	TkMacOSXGetCapture(void);
 /* Slot 48 is reserved */
 /* 49 */
 EXTERN Tk_Window	TkGetTransientMaster(TkWindow *winPtr);
@@ -343,7 +344,8 @@ typedef struct TkIntPlatStubs {
     void (*tkWmCleanup) (TkDisplay *dispPtr); /* 43 */
     void (*tkSendCleanup) (TkDisplay *dispPtr); /* 44 */
     int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 45 */
-    TkWindow * (*tkpGetCapture) (void); /* 46 */
+    void (*reserved46)(void);
+    Tk_Window (*tkpGetCapture) (void); /* 47 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 0 */
@@ -393,7 +395,7 @@ typedef struct TkIntPlatStubs {
     MacDrawable * (*tkMacOSXGetHostToplevel) (TkWindow *winPtr); /* 44 */
     void (*tkMacOSXPreprocessMenu) (void); /* 45 */
     int (*tkpIsWindowFloating) (void *window); /* 46 */
-    TkWindow * (*tkpGetCapture) (void); /* 47 */
+    Tk_Window (*tkMacOSXGetCapture) (void); /* 47 */
     void (*reserved48)(void);
     Tk_Window (*tkGetTransientMaster) (TkWindow *winPtr); /* 49 */
     int (*tkGenerateButtonEvent) (int x, int y, Window window, unsigned int state); /* 50 */
@@ -525,8 +527,9 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkSendCleanup) /* 44 */
 #define TkpTestsendCmd \
 	(tkIntPlatStubsPtr->tkpTestsendCmd) /* 45 */
+/* Slot 46 is reserved */
 #define TkpGetCapture \
-	(tkIntPlatStubsPtr->tkpGetCapture) /* 46 */
+	(tkIntPlatStubsPtr->tkpGetCapture) /* 47 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
 #define TkGenerateActivateEvents \
@@ -616,8 +619,8 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkMacOSXPreprocessMenu) /* 45 */
 #define TkpIsWindowFloating \
 	(tkIntPlatStubsPtr->tkpIsWindowFloating) /* 46 */
-#define TkpGetCapture \
-	(tkIntPlatStubsPtr->tkpGetCapture) /* 47 */
+#define TkMacOSXGetCapture \
+	(tkIntPlatStubsPtr->tkMacOSXGetCapture) /* 47 */
 /* Slot 48 is reserved */
 #define TkGetTransientMaster \
 	(tkIntPlatStubsPtr->tkGetTransientMaster) /* 49 */
diff --git a/generic/tkPointer.c b/generic/tkPointer.c
index 7f1d113..f764904 100644
--- a/generic/tkPointer.c
+++ b/generic/tkPointer.c
@@ -509,7 +509,7 @@ TkPointerDeadWindow(
          * window.
          */
 
-        if (winPtr == TkpGetCapture()) {
+        if (winPtr == (TkWindow *)TkpGetCapture()) {
 	    TkpSetCapture(NULL);
         }
     }
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 56b1052..b531933 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -506,7 +506,8 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkWmCleanup, /* 43 */
     TkSendCleanup, /* 44 */
     TkpTestsendCmd, /* 45 */
-    TkpGetCapture, /* 46 */
+    0, /* 46 */
+    TkpGetCapture, /* 47 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     TkGenerateActivateEvents, /* 0 */
@@ -556,7 +557,7 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXGetHostToplevel, /* 44 */
     TkMacOSXPreprocessMenu, /* 45 */
     TkpIsWindowFloating, /* 46 */
-    TkpGetCapture, /* 47 */
+    TkMacOSXGetCapture, /* 47 */
     0, /* 48 */
     TkGetTransientMaster, /* 49 */
     TkGenerateButtonEvent, /* 50 */