From a56a753b41381943366da4d0bfbe307b14ad3eb6 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Tue, 8 Sep 2020 16:24:30 +0000
Subject: Fix TkMacOSXGetXWindow so it returns a Window, not a Tk_Window cast
 as a Window.

---
 macosx/tkMacOSXWm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index d66c594..3b843b9 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -5401,8 +5401,11 @@ Window
 TkMacOSXGetXWindow(
     void *macWinPtr)
 {
+    Window window = None;
     TKWindow *w = (TKWindow *)macWinPtr;
-    Window window = (Window) TkMacOSXGetTkWindow(w);
+    if ([w respondsToSelector: @selector (tkWindow)]) {
+	window = [w tkWindow];
+    }
     return window ? window : None;
 }
 
@@ -5436,7 +5439,6 @@ Tk_MacOSXGetTkWindow(
     }
     return (window != None ?
 	    Tk_IdToWindow(dispPtr->display, window) : NULL);
-
 }
 
 /*
-- 
cgit v0.12