summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXWm.c
diff options
context:
space:
mode:
authorculler <culler>2021-04-28 05:26:46 (GMT)
committerculler <culler>2021-04-28 05:26:46 (GMT)
commit2ce4830f8b177a13e360b787bba7b2b73adb8183 (patch)
treea734886cbd761ecf745bbe45cc63ae447737c80a /macosx/tkMacOSXWm.c
parent3518f5614a393f2761dc58f4baa386115cbda33d (diff)
parent0512da3facc4560d40d97a359c4a1ecefbee4da5 (diff)
downloadtk-2ce4830f8b177a13e360b787bba7b2b73adb8183.zip
tk-2ce4830f8b177a13e360b787bba7b2b73adb8183.tar.gz
tk-2ce4830f8b177a13e360b787bba7b2b73adb8183.tar.bz2
CALayer backing for 8.7
Diffstat (limited to 'macosx/tkMacOSXWm.c')
-rw-r--r--macosx/tkMacOSXWm.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index aea25e4..7a40135 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -5516,12 +5516,15 @@ Tk_MacOSXGetTkWindow(
void *w)
{
Window window = None;
- TkDisplay *dispPtr = TkGetDisplayList();
if ([(NSWindow *)w respondsToSelector: @selector (tkWindow)]) {
window = [(TKWindow *)w tkWindow];
}
- return (window != None ?
- Tk_IdToWindow(dispPtr->display, window) : NULL);
+ if (window) {
+ TkDisplay *dispPtr = TkGetDisplayList();
+ return Tk_IdToWindow(dispPtr->display, window);
+ } else {
+ return NULL;
+ }
}
/*