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

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

View File

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