Added the context version to ContextSettings

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1261 4e206d99-4929-0410-ac5d-dfc041789085

include/SFML/Window/ContextSettings.hpp

@@ -31,6 +31,7 @@ namespace sf
 ////////////////////////////////////////////////////////////
 /// \brief Structure defining the settings of the OpenGL
 ///        context attached to a window
+///
 ////////////////////////////////////////////////////////////
 struct ContextSettings
 {
@@ -40,12 +41,16 @@ struct ContextSettings
     /// \param depth        Depth buffer bits
     /// \param stencil      Stencil buffer bits
     /// \param antialiasing Antialiasing level
+    /// \param major        Major number of the context version
+    /// \param minor        Minor number of the context version
     ///
     ////////////////////////////////////////////////////////////
-    explicit ContextSettings(unsigned int depth = 24, unsigned int stencil = 8, unsigned int antialiasing = 0) :
+    explicit ContextSettings(unsigned int depth = 24, unsigned int stencil = 8, unsigned int antialiasing = 0, unsigned int major = 2, unsigned int minor = 0) :
     DepthBits        (depth),
     StencilBits      (stencil),
-    AntialiasingLevel(antialiasing)
+    AntialiasingLevel(antialiasing),
+    MajorVersion     (major),
+    MinorVersion     (minor)
     {
     }
 
@@ -55,9 +60,44 @@ struct ContextSettings
     unsigned int DepthBits;         ///< Bits of the depth buffer
     unsigned int StencilBits;       ///< Bits of the stencil buffer
     unsigned int AntialiasingLevel; ///< Level of antialiasing
+    unsigned int MajorVersion;      ///< Major number of the context version to create
+    unsigned int MinorVersion;      ///< Minor number of the context version to create
 };
 
 } // namespace sf
 
 
 #endif // SFML_CONTEXTSETTINGS_HPP
+
+
+////////////////////////////////////////////////////////////
+/// \class sf::ContextSettings
+///
+/// ContextSettings allows to define several advanced settings
+/// of the OpenGL context attached to a window. All these
+/// settings have no impact on the regular SFML rendering
+/// (graphics module), so you may need to use this structure
+/// only if you're using SFML as a windowing system for
+/// custom OpenGL rendering.
+///
+/// The DepthBits and StencilBits members define the number
+/// of bits per pixel requested for the (respectively) depth
+/// and stencil buffers.
+///
+/// AntialiasingLevel represents the requested number of
+/// multisampling levels for anti-aliasing.
+///
+/// MajorVersion and MinorVersion define the version of the
+/// OpenGL context that you want. Only versions greater or
+/// equal to 3.0 are relevant; versions lesser than 3.0 are
+/// all handled the same way (i.e. you can use any version
+/// < 3.0 if you don't want an OpenGL 3 context).
+///
+/// Please note that these values are only a hint.
+/// No failure will be reported if one or more of these values
+/// are not supported by the system; instead, SFML will try to
+/// find the closest valid match. You can then retrieve the
+/// settings that the window actually used to create its context,
+/// with Window::GetSettings().
+///
+////////////////////////////////////////////////////////////