diff --git a/examples/cocoa/CocoaAppDelegate.h b/examples/cocoa/CocoaAppDelegate.h index aa32d6ecb..f259a8cc5 100644 --- a/examples/cocoa/CocoaAppDelegate.h +++ b/examples/cocoa/CocoaAppDelegate.h @@ -36,7 +36,11 @@ struct SFMLmainWindow; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 @interface CocoaAppDelegate : NSObject { +#else +@interface CocoaAppDelegate : NSObject { +#endif @private NSWindow *m_window; NSView *m_sfmlView; diff --git a/src/SFML/Window/OSX/cg_sf_conversion.cpp b/src/SFML/Window/OSX/cg_sf_conversion.cpp index 1012a84af..8d44b3428 100644 --- a/src/SFML/Window/OSX/cg_sf_conversion.cpp +++ b/src/SFML/Window/OSX/cg_sf_conversion.cpp @@ -103,7 +103,7 @@ VideoMode convertCGModeToSFMode(CFDictionaryRef dictionary) CFNumberGetValue(cfnumber, kCFNumberIntType, &(sfmode.height)); cfnumber = (CFNumberRef)CFDictionaryGetValue(dictionary, kCGDisplayBitsPerPixel); - CFNumberGetValue(cfnumber, kCFNumberIntType, &(sfmode.BitsPerPixel)); + CFNumberGetValue(cfnumber, kCFNumberIntType, &(sfmode.bitsPerPixel)); return sfmode; } @@ -127,7 +127,7 @@ CFDictionaryRef convertSFModeToCGMode(VideoMode sfmode) // If sfmode is in VideoMode::GetFullscreenModes // then this should be an exact match (see NULL parameter doc). return CGDisplayBestModeForParameters(CGMainDisplayID(), - sfmode.BitsPerPixel, + sfmode.bitsPerPixel, sfmode.width, sfmode.height, NULL);