Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support for native tlw parents, see #14252

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2012-06-12 18:44:31 +00:00
parent 9651e41c1c
commit d52ded25c1
1 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/osx/cocoa/nonownedwnd.mm
View File

@@ -517,6 +517,12 @@ wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
if ( !m_wxPeer->IsNativeWindowWrapper() )
{
[m_macWindow setDelegate:nil];
// make sure we remove this first, otherwise the ref count will not lead to the
// native window's destruction
if ([m_macWindow parentWindow] != 0)
[[m_macWindow parentWindow] removeChildWindow: m_macWindow];
[m_macWindow release];
}
}
@@ -679,14 +685,34 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
if ( show )
{
wxNonOwnedWindow* wxpeer = GetWXPeer();
if (wxpeer && !(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW))
[m_macWindow makeKeyAndOrderFront:nil];
else
[m_macWindow orderFront:nil];
if ( wxpeer )
{
// add to parent window before showing
if ( wxpeer->GetParent() )
{
NSView * parentView = wxpeer->GetParent()->GetPeer()->GetWXWidget();
if ( parentView )
{
NSWindow* parentNSWindow = [parentView window];
if ( parentNSWindow )
[parentNSWindow addChildWindow:m_macWindow ordered:NSWindowAbove];
}
}
if (!(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW))
[m_macWindow makeKeyAndOrderFront:nil];
else
[m_macWindow orderFront:nil];
}
[[m_macWindow contentView] setNeedsDisplay: YES];
}
else
{
// avoid propagation of orderOut to parent
if ([m_macWindow parentWindow] != 0)
[[m_macWindow parentWindow] removeChildWindow: m_macWindow];
[m_macWindow orderOut:nil];
}
return true;
}