mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-16 00:12:51 +00:00
(svn r25657) -Fix [FS#4744]: [OSX] The new 10.7 fullscreen code can now also be compiled with older SDK versions.
This commit is contained in:
parent
32d0a2322f
commit
75259f1659
@ -240,12 +240,12 @@ void WindowQuartzSubdriver::GetDeviceInfo()
|
||||
*/
|
||||
bool WindowQuartzSubdriver::ToggleFullscreen()
|
||||
{
|
||||
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
|
||||
[this->window toggleFullScreen:this->window];
|
||||
if ([ this->window respondsToSelector:@selector(toggleFullScreen:) ]) {
|
||||
[ this->window performSelector:@selector(toggleFullScreen:) withObject:this->window ];
|
||||
return true;
|
||||
#else
|
||||
}
|
||||
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
bool WindowQuartzSubdriver::SetVideoMode(int width, int height, int bpp)
|
||||
@ -280,15 +280,17 @@ bool WindowQuartzSubdriver::SetVideoMode(int width, int height, int bpp)
|
||||
return false;
|
||||
}
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
|
||||
/* Add built in full-screen support when available (OS X 10.7 and higher)
|
||||
* This code actually compiles for 10.5 and later, but only makes sense in conjunction
|
||||
* with the quartz fullscreen support as found only in 10.7 and later
|
||||
*/
|
||||
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
|
||||
if ([this->window respondsToSelector:@selector(toggleFullScreen:)]) {
|
||||
/* Constants needed to build on pre-10.7 systems. Source: NSWindow documentation. */
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
|
||||
/* Constants needed to build on pre-10.7 SDKs. Source: NSWindow documentation. */
|
||||
const int NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7;
|
||||
const int NSWindowFullScreenButton = 7;
|
||||
#endif
|
||||
|
||||
NSWindowCollectionBehavior behavior = [ this->window collectionBehavior ];
|
||||
behavior |= NSWindowCollectionBehaviorFullScreenPrimary;
|
||||
|
Loading…
Reference in New Issue
Block a user