pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Quartz: Only use ShowMenuBar()/HideMenuBar() for legacy OS releases.

Browse source 
--HG--
branch : SDL-1.2
This commit is contained in:
Ryan C. Gordon 2011-10-13 14:50:47 -04:00
parent dff71d0141
commit a9c0600409
1 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/video/quartz/SDL_QuartzVideo.m
View file

@ -574,7 +574,17 @@ static void QZ_UnsetVideoMode (_THIS, BOOL to_desktop)
#endif #endif
} }
if (to_desktop) { if (to_desktop) {
/* !!! FIXME: keep an eye on this.
* This API is officially unavailable for 64-bit binaries.
* It happens to work, as of 10.7, but we're going to see if
* we can just simply do without it on newer OSes...
*/
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070) && !defined(__LP64__)
if ( !IS_LION_OR_LATER(this) ) {
ShowMenuBar (); ShowMenuBar ();
}
#endif
/* Restore original screen resolution/bpp */ /* Restore original screen resolution/bpp */
QZ_RestoreDisplayMode (this); QZ_RestoreDisplayMode (this);
CGReleaseAllDisplays (); CGReleaseAllDisplays ();
@ -869,8 +879,17 @@ static SDL_Surface* QZ_SetVideoFullScreen (_THIS, SDL_Surface *current, int widt
[ qz_window makeKeyAndOrderFront:nil ]; [ qz_window makeKeyAndOrderFront:nil ];
} }
/* !!! FIXME: keep an eye on this.
* This API is officially unavailable for 64-bit binaries.
* It happens to work, as of 10.7, but we're going to see if
* we can just simply do without it on newer OSes...
*/
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070) && !defined(__LP64__)
if ( !IS_LION_OR_LATER(this) ) {
/* If we don't hide menu bar, it will get events and interrupt the program */ /* If we don't hide menu bar, it will get events and interrupt the program */
HideMenuBar (); HideMenuBar ();
}
#endif
/* Fade in again (asynchronously) */ /* Fade in again (asynchronously) */
if ( fade_token != kCGDisplayFadeReservationInvalidToken ) { if ( fade_token != kCGDisplayFadeReservationInvalidToken ) {