zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-12 07:34:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed infinite recursion when setting window style on OS X 10.6 or newer

Browse source
This commit is contained in:
alexey.lysiuk 2014-11-09 15:34:04 +02:00
parent fa1d62ffbf
commit a40eb3443b
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cocoa/i_backend_cocoa.mm
View file

@ -1000,7 +1000,11 @@ static ApplicationController* appCtrl;
- (void)setStyleMask:(NSUInteger)styleMask - (void)setStyleMask:(NSUInteger)styleMask
{ {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
[super setStyleMask:styleMask];
#else // 10.5 or earlier
[appCtrl setWindowStyleMask:styleMask]; [appCtrl setWindowStyleMask:styleMask];
#endif // 10.6 or higher
} }
@end @end
@ -1455,18 +1459,15 @@ static ApplicationController* appCtrl;
- (void)setWindowStyleMask:(NSUInteger)styleMask - (void)setWindowStyleMask:(NSUInteger)styleMask
{ {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
[m_window setStyleMask:styleMask];
#else // 10.5 or earlier
// Before 10.6 it's impossible to change window's style mask // Before 10.6 it's impossible to change window's style mask
// To workaround this new window should be created with required style mask // To workaround this new window should be created with required style mask
// This method should not be called when building for Snow Leopard or newer
FullscreenWindow* tempWindow = [self createWindow:styleMask]; FullscreenWindow* tempWindow = [self createWindow:styleMask];
[tempWindow setContentView:[m_window contentView]]; [tempWindow setContentView:[m_window contentView]];
[m_window close]; [m_window close];
m_window = tempWindow; m_window = tempWindow;
#endif // 10.6 or higher
} }