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

Updated Mac OS X code according to commit 8c776f33c1

Browse Source
This commit is contained in:
Marco Antognini 2012-04-06 15:40:29 +02:00
parent e92a3120c7
commit cea0839f45
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/SFML/Window/OSX/HIDJoystickManager.hpp
View File

@ -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

18
src/SFML/Window/OSX/WindowImplCocoa.hpp
View File

@ -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 :
////////////////////////////////////////////////////////////