mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation issue on 10.5

Browse Source
This commit is contained in:
Marco Antognini 2012-12-28 22:52:23 +01:00
parent b0333dfc16
commit e11ed81f72
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/cocoa/CocoaAppDelegate.h
View File

@ -36,7 +36,11 @@
struct SFMLmainWindow; struct SFMLmainWindow;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
@interface CocoaAppDelegate : NSObject <NSApplicationDelegate> { @interface CocoaAppDelegate : NSObject <NSApplicationDelegate> {
#else
@interface CocoaAppDelegate : NSObject {
#endif
@private @private
NSWindow *m_window; NSWindow *m_window;
NSView *m_sfmlView; NSView *m_sfmlView;

4
src/SFML/Window/OSX/cg_sf_conversion.cpp
View File

@ -103,7 +103,7 @@ VideoMode convertCGModeToSFMode(CFDictionaryRef dictionary)
CFNumberGetValue(cfnumber, kCFNumberIntType, &(sfmode.height)); CFNumberGetValue(cfnumber, kCFNumberIntType, &(sfmode.height));
cfnumber = (CFNumberRef)CFDictionaryGetValue(dictionary, kCGDisplayBitsPerPixel); cfnumber = (CFNumberRef)CFDictionaryGetValue(dictionary, kCGDisplayBitsPerPixel);
CFNumberGetValue(cfnumber, kCFNumberIntType, &(sfmode.BitsPerPixel)); CFNumberGetValue(cfnumber, kCFNumberIntType, &(sfmode.bitsPerPixel));
return sfmode; return sfmode;
} }
@ -127,7 +127,7 @@ CFDictionaryRef convertSFModeToCGMode(VideoMode sfmode)
// If sfmode is in VideoMode::GetFullscreenModes // If sfmode is in VideoMode::GetFullscreenModes
// then this should be an exact match (see NULL parameter doc). // then this should be an exact match (see NULL parameter doc).
return CGDisplayBestModeForParameters(CGMainDisplayID(), return CGDisplayBestModeForParameters(CGMainDisplayID(),
sfmode.BitsPerPixel, sfmode.bitsPerPixel,
sfmode.width, sfmode.width,
sfmode.height, sfmode.height,
NULL); NULL);