Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation issues with 10.5

Browse Source
This commit is contained in:
Marco Antognini 2011-03-30 20:31:09 +02:00
parent 0e37997734
commit 816cc6f637
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/SFML/Window/OSX/SFWindowController.mm
View File

@ -37,6 +37,7 @@
#import <SFML/Window/OSX/SFApplication.h> #import <SFML/Window/OSX/SFApplication.h>
#import <SFML/Window/OSX/SFOpenGLView.h> #import <SFML/Window/OSX/SFOpenGLView.h>
#import <SFML/Window/OSX/SFWindow.h> #import <SFML/Window/OSX/SFWindow.h>
#import <OpenGL/OpenGL.h>
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// SFWindowController class : Privates Methods Declaration /// SFWindowController class : Privates Methods Declaration

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

@ -96,14 +96,14 @@ VideoMode ConvertCGModeToSFMode(CFDictionaryRef dictionary)
{ {
VideoMode sfmode; VideoMode sfmode;
CFNumberRef cfnumber = (CFNumberRef)CFDictionaryGetValue(CurrentMode, kCGDisplayWidth); CFNumberRef cfnumber = (CFNumberRef)CFDictionaryGetValue(dictionary, kCGDisplayWidth);
CFNumberGetValue(cfnumber, kCFNumberIntType, &(mode.Width)); CFNumberGetValue(cfnumber, kCFNumberIntType, &(sfmode.Width));
cfnumber = (CFNumberRef)CFDictionaryGetValue(CurrentMode, kCGDisplayHeight); cfnumber = (CFNumberRef)CFDictionaryGetValue(dictionary, kCGDisplayHeight);
CFNumberGetValue(cfnumber, kCFNumberIntType, &(mode.Height)); CFNumberGetValue(cfnumber, kCFNumberIntType, &(sfmode.Height));
cfnumber = (CFNumberRef)CFDictionaryGetValue(CurrentMode, kCGDisplayBitsPerPixel); cfnumber = (CFNumberRef)CFDictionaryGetValue(dictionary, kCGDisplayBitsPerPixel);
CFNumberGetValue(cfnumber, kCFNumberIntType, &(mode.BitsPerPixel)); CFNumberGetValue(cfnumber, kCFNumberIntType, &(sfmode.BitsPerPixel));
return sfmode; return sfmode;
} }
@ -129,7 +129,7 @@ CFDictionaryRef ConvertSFModeToCGMode(VideoMode sfmode)
return CGDisplayBestModeForParameters(CGMainDisplayID(), return CGDisplayBestModeForParameters(CGMainDisplayID(),
sfmode.BitsPerPixel, sfmode.BitsPerPixel,
sfmode.Width, sfmode.Width,
sfmode.Height sfmode.Height,
NULL); NULL);
} }