From cea0839f450af4b90c7d2df8366754f0ac4001ca Mon Sep 17 00:00:00 2001
From: Marco Antognini <antognini.marco@gmail.com>
Date: Fri, 6 Apr 2012 15:40:29 +0200
Subject: [PATCH] Updated Mac OS X code according to commit
8c776f33c1a1b19c9753777b49cc9d8ab53cfdc1
---
src/SFML/Window/OSX/HIDJoystickManager.hpp | 10 +++++-----
src/SFML/Window/OSX/WindowImplCocoa.hpp | 18 ++++++++++--------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/SFML/Window/OSX/HIDJoystickManager.hpp b/src/SFML/Window/OSX/HIDJoystickManager.hpp
index ea1e3214..54de371b 100644
--- a/src/SFML/Window/OSX/HIDJoystickManager.hpp
+++ b/src/SFML/Window/OSX/HIDJoystickManager.hpp
@@ -45,7 +45,7 @@ namespace priv
////////////////////////////////////////////////////////////
class HIDJoystickManager : NonCopyable
{
-public:
+public :
////////////////////////////////////////////////////////////
/// \brief Get the unique instance of the class
@@ -57,7 +57,7 @@ public:
////////////////////////////////////////////////////////////
static HIDJoystickManager& getInstance();
-public:
+public :
////////////////////////////////////////////////////////////
/// \brief Get the number of currently connected joystick
@@ -73,7 +73,7 @@ public:
////////////////////////////////////////////////////////////
CFSetRef copyJoysticks();
-private:
+private :
////////////////////////////////////////////////////////////
/// \brief Default constructor
@@ -93,7 +93,7 @@ private:
////////////////////////////////////////////////////////////
void update();
-private:
+private :
////////////////////////////////////////////////////////////
/// \brief Private "plug-in" callback
@@ -111,7 +111,7 @@ private:
////////////////////////////////////////////////////////////
static void pluggedOut(void * context, IOReturn, void *, IOHIDDeviceRef);
-private:
+private :
////////////////////////////////////////////////////////////
// Member data
diff --git a/src/SFML/Window/OSX/WindowImplCocoa.hpp b/src/SFML/Window/OSX/WindowImplCocoa.hpp
index 68d4e7c8..40b18dc0 100644
--- a/src/SFML/Window/OSX/WindowImplCocoa.hpp
+++ b/src/SFML/Window/OSX/WindowImplCocoa.hpp
@@ -62,7 +62,7 @@ namespace priv
////////////////////////////////////////////////////////////
class WindowImplCocoa : public WindowImpl
{
-public:
+public :
////////////////////////////////////////////////////////////
/// \brief Construct the window implementation from an existing control
///
@@ -232,13 +232,7 @@ public:
////////////////////////////////////////////////////////////
static void setUpProcess(void);
-private:
-
- ////////////////////////////////////////////////////////////
- /// \brief Process incoming events from the operating system
- ///
- ////////////////////////////////////////////////////////////
- virtual void processEvents();
+public :
////////////////////////////////////////////////////////////
/// \brief Get the OS-specific handle of the window
@@ -322,6 +316,14 @@ private:
////////////////////////////////////////////////////////////
virtual void setKeyRepeatEnabled(bool enabled);
+protected :
+
+ ////////////////////////////////////////////////////////////
+ /// \brief Process incoming events from the operating system
+ ///
+ ////////////////////////////////////////////////////////////
+ virtual void processEvents();
+
private :
////////////////////////////////////////////////////////////