From d6574111c20d130a40c09ce0762ceb0a5461ada0 Mon Sep 17 00:00:00 2001 From: Ken Thomases Date: Mon, 9 Nov 2015 20:31:21 -0600 Subject: [PATCH] winemac: Check the window's display link after adding it as a child of another window, which may order it on screen. This fixes a problem where child windows ("owned" windows in Windows parlance) would never display their contents on OS X 10.8 or earlier. Beginning with 10.9, Cocoa calls -windowDidChangeOcclusionState: when the window becomes visible, which is why they display on that version and later. Reported by Huw Davies. Signed-off-by: Ken Thomases Signed-off-by: Alexandre Julliard --- dlls/winemac.drv/cocoa_window.m | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 666a9531c4f..49afd18e080 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1041,6 +1041,7 @@ - (BOOL) addChildWineWindow:(WineWindow*)child assumeVisible:(BOOL)assumeVisible if ([self level] > [child level]) [child setLevel:[self level]]; [self addChildWindow:child ordered:NSWindowAbove]; + [child checkWineDisplayLink]; [latentChildWindows removeObjectIdenticalTo:child]; child.latentParentWindow = nil; reordered = TRUE;