mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-12-01 15:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

-update old USE_OS_X_VERSION_10_* macros

Browse Source 
-fix setCursorPositionToX:Y:



git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1752 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
mantognini 2010-12-10 14:50:29 +00:00
parent 9b25dc5641
commit a1eade38f4
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SFML/Window/OSX/SFWindowController.h
View File

@ -51,9 +51,9 @@ namespace sf {
/// as handle to WindowImpl. /// as handle to WindowImpl.
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#ifdef USE_OS_X_VERSION_10_4 #if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 // NSWindowDelegate is only define since 10.6
@interface SFWindowController : NSResponder <WindowImplDelegateProtocol> { @interface SFWindowController : NSResponder <WindowImplDelegateProtocol> {
#else /* USE_OS_X_VERSION_10_6 */ #else
@interface SFWindowController : NSResponder <WindowImplDelegateProtocol, NSWindowDelegate> { @interface SFWindowController : NSResponder <WindowImplDelegateProtocol, NSWindowDelegate> {
#endif #endif
NSWindow* myWindow; NSWindow* myWindow;

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

@ -109,7 +109,7 @@
backing:NSBackingStoreBuffered backing:NSBackingStoreBuffered
defer:NO]; defer:NO];
/* /*
"YES" make some "invalid drawable". "YES" produces some "invalid drawable".
See http://www.cocoabuilder.com/archive/cocoa/152482-nsviews-and-nsopenglcontext-invalid-drawable-error.html See http://www.cocoabuilder.com/archive/cocoa/152482-nsviews-and-nsopenglcontext-invalid-drawable-error.html
[...] [...]
@ -226,6 +226,11 @@
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
-(void)setCursorPositionToX:(unsigned int)x Y:(unsigned int)y -(void)setCursorPositionToX:(unsigned int)x Y:(unsigned int)y
{ {
// Create a SFML event.
if (myRequester == 0) return;
myRequester->MouseMovedAt(x, y);
// Flip for SFML window coordinate system // Flip for SFML window coordinate system
y = NSHeight([myWindow frame]) - y; y = NSHeight([myWindow frame]) - y;
@ -243,6 +248,12 @@
// Place the cursor. // Place the cursor.
CGDisplayMoveCursorToPoint(screenNumber, CGPointMake(screenCoord.x, screenCoord.y)); CGDisplayMoveCursorToPoint(screenNumber, CGPointMake(screenCoord.x, screenCoord.y));
/*
CGDisplayMoveCursorToPoint -- Discussion :
No events are generated as a result of this move.
Points that lie outside the desktop are clipped to the desktop.
*/
} }