lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Private virtual functions are now protected, so that sub-classes can call them if necessary (and they appear in the API doc :)

Browse source
This commit is contained in:
Laurent Gomila 2012-04-04 22:33:53 +02:00
parent 1a8488bd7b
commit 8c776f33c1
10 changed files with 67 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/SFML/Window/Linux/WindowImplX11.hpp
View file

@ -81,8 +81,6 @@ public :
////////////////////////////////////////////////////////////
::Display* getDisplay() const;
private :
////////////////////////////////////////////////////////////
/// \brief Get the OS-specific handle of the window
///
@ -91,12 +89,6 @@ private :
////////////////////////////////////////////////////////////
virtual WindowHandle getSystemHandle() const;
////////////////////////////////////////////////////////////
/// \brief Process incoming events from the operating system
///
////////////////////////////////////////////////////////////
virtual void processEvents();
////////////////////////////////////////////////////////////
/// \brief Get the position of the window
///
@ -171,6 +163,14 @@ private :
////////////////////////////////////////////////////////////
virtual void setKeyRepeatEnabled(bool enabled);
protected :
////////////////////////////////////////////////////////////
/// \brief Process incoming events from the operating system
///
////////////////////////////////////////////////////////////
virtual void processEvents();
private :
////////////////////////////////////////////////////////////

16
src/SFML/Window/Win32/WindowImplWin32.hpp
View file

@ -70,8 +70,6 @@ public :
////////////////////////////////////////////////////////////
~WindowImplWin32();
private :
////////////////////////////////////////////////////////////
/// \brief Get the OS-specific handle of the window
///
@ -80,12 +78,6 @@ private :
////////////////////////////////////////////////////////////
virtual WindowHandle getSystemHandle() const;
////////////////////////////////////////////////////////////
/// \brief Process incoming events from the operating system
///
////////////////////////////////////////////////////////////
virtual void processEvents();
////////////////////////////////////////////////////////////
/// \brief Get the position of the window
///
@ -160,6 +152,14 @@ private :
////////////////////////////////////////////////////////////
virtual void setKeyRepeatEnabled(bool enabled);
protected:
////////////////////////////////////////////////////////////
/// \brief Process incoming events from the operating system
///
////////////////////////////////////////////////////////////
virtual void processEvents();
private :
////////////////////////////////////////////////////////////

12
src/SFML/Window/WindowImpl.hpp
View file

@ -211,6 +211,12 @@ protected :
////////////////////////////////////////////////////////////
void pushEvent(const Event& event);
////////////////////////////////////////////////////////////
/// \brief Process incoming events from the operating system
///
////////////////////////////////////////////////////////////
virtual void processEvents() = 0;
private :
////////////////////////////////////////////////////////////
@ -219,12 +225,6 @@ private :
////////////////////////////////////////////////////////////
void processJoystickEvents();
////////////////////////////////////////////////////////////
/// \brief Process incoming events from the operating system
///
////////////////////////////////////////////////////////////
virtual void processEvents() = 0;
////////////////////////////////////////////////////////////
// Member data
////////////////////////////////////////////////////////////