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

Merge branch 'master' of github.com:LaurentGomila/SFML

Browse Source
This commit is contained in:
Laurent Gomila 2012-04-06 19:07:33 +02:00
commit e02262d425
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,13 +232,7 @@ public:
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
static void setUpProcess(void); static void setUpProcess(void);
private: public :
////////////////////////////////////////////////////////////
/// \brief Process incoming events from the operating system
///
////////////////////////////////////////////////////////////
virtual void processEvents();
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Get the OS-specific handle of the window /// \brief Get the OS-specific handle of the window
@ -322,6 +316,14 @@ private:
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
virtual void setKeyRepeatEnabled(bool enabled); virtual void setKeyRepeatEnabled(bool enabled);
protected :
////////////////////////////////////////////////////////////
/// \brief Process incoming events from the operating system
///
////////////////////////////////////////////////////////////
virtual void processEvents();
private : private :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////