From 08393593e1615cfe587012625a284d5909ca88a2 Mon Sep 17 00:00:00 2001
From: LaurentGom <LaurentGom@4e206d99-4929-0410-ac5d-dfc041789085>
Date: Thu, 11 Nov 2010 08:46:13 +0000
Subject: [PATCH] Fixed minor error in sf::Window::Window documentation, and
removed a useless member
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1632 4e206d99-4929-0410-ac5d-dfc041789085
---
include/SFML/Window/Window.hpp | 9 +++------
src/SFML/Window/Window.cpp | 3 ---
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/include/SFML/Window/Window.hpp b/include/SFML/Window/Window.hpp
index c234dcae..7a92f444 100644
--- a/include/SFML/Window/Window.hpp
+++ b/include/SFML/Window/Window.hpp
@@ -76,8 +76,7 @@ public :
///
/// The fourth parameter is an optional structure specifying
/// advanced OpenGL context settings such as antialiasing,
- /// depth-buffer bits, etc. You shouldn't care about these
- /// parameters for a regular usage of the graphics module.
+ /// depth-buffer bits, etc.
///
/// \param mode Video mode to use (defines the width, height and depth of the rendering area of the window)
/// \param title Title of the window
@@ -93,10 +92,9 @@ public :
/// Use this constructor if you want to create an OpenGL
/// rendering area into an already existing control.
///
- /// The fourth parameter is an optional structure specifying
+ /// The second parameter is an optional structure specifying
/// advanced OpenGL context settings such as antialiasing,
- /// depth-buffer bits, etc. You shouldn't care about these
- /// parameters for a regular usage of the graphics module.
+ /// depth-buffer bits, etc.
///
/// \param handle Platform-specific handle of the control
/// \param settings Additional settings for the underlying OpenGL context
@@ -496,7 +494,6 @@ private :
Input myInput; ///< Input manager connected to window
Clock myClock; ///< Clock for measuring the elapsed time between frames
float myLastFrameTime; ///< Time elapsed since last frame
- bool myIsExternal; ///< Tell whether the window is internal or external (i.e. created by SFML or not)
unsigned int myFramerateLimit; ///< Current framerate limit
int mySetCursorPosX; ///< X coordinate passed to the last call to SetCursorPosition
int mySetCursorPosY; ///< Y coordinate passed to the last call to SetCursorPosition
diff --git a/src/SFML/Window/Window.cpp b/src/SFML/Window/Window.cpp
index ba3ea9ad..b1859aa5 100644
--- a/src/SFML/Window/Window.cpp
+++ b/src/SFML/Window/Window.cpp
@@ -48,7 +48,6 @@ Window::Window() :
myWindow (NULL),
myContext (NULL),
myLastFrameTime (0.f),
-myIsExternal (false),
myFramerateLimit(0),
mySetCursorPosX (0xFFFF),
mySetCursorPosY (0xFFFF)
@@ -62,7 +61,6 @@ Window::Window(VideoMode mode, const std::string& title, unsigned long style, co
myWindow (NULL),
myContext (NULL),
myLastFrameTime (0.f),
-myIsExternal (false),
myFramerateLimit(0),
mySetCursorPosX (0xFFFF),
mySetCursorPosY (0xFFFF)
@@ -76,7 +74,6 @@ Window::Window(WindowHandle handle, const ContextSettings& settings) :
myWindow (NULL),
myContext (NULL),
myLastFrameTime (0.f),
-myIsExternal (true),
myFramerateLimit(0),
mySetCursorPosX (0xFFFF),
mySetCursorPosY (0xFFFF)