Permalink
Browse files

Updated Mac OS X code according to commit 8c776f3

  • Loading branch information...
1 parent e92a312 commit cea0839f450af4b90c7d2df8366754f0ac4001ca @mantognini mantognini committed Apr 6, 2012
Showing with 15 additions and 13 deletions.
  1. +5 −5 src/SFML/Window/OSX/HIDJoystickManager.hpp
  2. +10 −8 src/SFML/Window/OSX/WindowImplCocoa.hpp
@@ -45,7 +45,7 @@ namespace priv
////////////////////////////////////////////////////////////
class HIDJoystickManager : NonCopyable
{
-public:
+public :
////////////////////////////////////////////////////////////
/// \brief Get the unique instance of the class
@@ -57,7 +57,7 @@ class HIDJoystickManager : NonCopyable
////////////////////////////////////////////////////////////
static HIDJoystickManager& getInstance();
-public:
+public :
////////////////////////////////////////////////////////////
/// \brief Get the number of currently connected joystick
@@ -73,7 +73,7 @@ class HIDJoystickManager : NonCopyable
////////////////////////////////////////////////////////////
CFSetRef copyJoysticks();
-private:
+private :
////////////////////////////////////////////////////////////
/// \brief Default constructor
@@ -93,7 +93,7 @@ class HIDJoystickManager : NonCopyable
////////////////////////////////////////////////////////////
void update();
-private:
+private :
////////////////////////////////////////////////////////////
/// \brief Private "plug-in" callback
@@ -111,7 +111,7 @@ class HIDJoystickManager : NonCopyable
////////////////////////////////////////////////////////////
static void pluggedOut(void * context, IOReturn, void *, IOHIDDeviceRef);
-private:
+private :
////////////////////////////////////////////////////////////
// Member data
@@ -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 @@ class WindowImplCocoa : public WindowImpl
////////////////////////////////////////////////////////////
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 @@ class WindowImplCocoa : public WindowImpl
////////////////////////////////////////////////////////////
virtual void setKeyRepeatEnabled(bool enabled);
+protected :
+
+ ////////////////////////////////////////////////////////////
+ /// \brief Process incoming events from the operating system
+ ///
+ ////////////////////////////////////////////////////////////
+ virtual void processEvents();
+
private :
////////////////////////////////////////////////////////////

0 comments on commit cea0839

Please sign in to comment.