summaryrefslogtreecommitdiff
path: root/src/SFML/Window/OSX/SFViewController.mm
diff options
context:
space:
mode:
authorJames Cowgill <jcowgill@debian.org>2018-05-15 13:58:15 +0100
committerJames Cowgill <jcowgill@debian.org>2018-05-15 13:58:15 +0100
commitb175eed3ca950204c9b52fdcebc897f337b7bf19 (patch)
tree0f50d921750c957f11bda18abc83f9228d010902 /src/SFML/Window/OSX/SFViewController.mm
parent31394fcd65a10f2d2c51c3d27afff5367bded901 (diff)
New upstream version 2.5.0+dfsg
Diffstat (limited to 'src/SFML/Window/OSX/SFViewController.mm')
-rw-r--r--src/SFML/Window/OSX/SFViewController.mm11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/SFML/Window/OSX/SFViewController.mm b/src/SFML/Window/OSX/SFViewController.mm
index 03b161f..c92283b 100644
--- a/src/SFML/Window/OSX/SFViewController.mm
+++ b/src/SFML/Window/OSX/SFViewController.mm
@@ -1,7 +1,7 @@
////////////////////////////////////////////////////////////
//
// SFML - Simple and Fast Multimedia Library
-// Copyright (C) 2007-2017 Marco Antognini (antognini.marco@gmail.com),
+// Copyright (C) 2007-2018 Marco Antognini (antognini.marco@gmail.com),
// Laurent Gomila (laurent@sfml-dev.org)
//
// This software is provided 'as-is', without any express or implied warranty.
@@ -128,6 +128,13 @@
}
+////////////////////////////////////////////////////////
+-(void)setCursor:(NSCursor*)cursor
+{
+ return [m_oglView setCursor:cursor];
+}
+
+
////////////////////////////////////////////////////////////
-(NSPoint)position
{
@@ -247,7 +254,7 @@
if ([NSThread currentThread] != [NSThread mainThread])
{
/*
- * See http://lists.apple.com/archives/cocoa-dev/2011/Feb/msg00460.html
+ * See https://lists.apple.com/archives/cocoa-dev/2011/Feb/msg00460.html
* for more information.
*/
sf::err() << "Cannot fetch event from a worker thread. (OS X restriction)" << std::endl;