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

Use NS* window levels rather than kCG*

Browse Source 
The NS* names are available since OS X 10.0.
This commit is contained in:
Lauri Nurmi
2017-02-10 21:54:22 +02:00
parent 246fa6aa98
commit 2e2881f4de
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -671,7 +671,7 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
[m_macWindow setAcceptsMouseMovedEvents:YES]; [m_macWindow setAcceptsMouseMovedEvents:YES];
CGWindowLevel level = kCGNormalWindowLevel; NSInteger level = NSNormalWindowLevel;
if ( style & wxFRAME_TOOL_WINDOW ) if ( style & wxFRAME_TOOL_WINDOW )
{ {
@@ -679,7 +679,7 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
} }
else if ( ( style & wxPOPUP_WINDOW ) ) else if ( ( style & wxPOPUP_WINDOW ) )
{ {
level = kCGPopUpMenuWindowLevel; level = NSPopUpMenuWindowLevel;
} }
else if ( ( style & wxFRAME_DRAWER ) ) else if ( ( style & wxFRAME_DRAWER ) )
{ {
@@ -890,7 +890,7 @@ void wxNonOwnedWindowCocoaImpl::SetWindowStyleFlag( long style )
// don't mess with native wrapped windows, they might throw an exception when their level is changed // don't mess with native wrapped windows, they might throw an exception when their level is changed
if (!m_wxPeer->IsNativeWindowWrapper() && m_macWindow) if (!m_wxPeer->IsNativeWindowWrapper() && m_macWindow)
{ {
CGWindowLevel level = kCGNormalWindowLevel; NSInteger level = NSNormalWindowLevel;
if (style & wxSTAY_ON_TOP) if (style & wxSTAY_ON_TOP)
level = NSModalPanelWindowLevel; level = NSModalPanelWindowLevel;