From 78910b555e13d0798751c321f6b3ac447d3cf347 Mon Sep 17 00:00:00 2001
From: Laurent Gomila <laurent.gom@gmail.com>
Date: Wed, 21 Dec 2011 22:27:19 +0100
Subject: [PATCH] Removed unused Context::GetCurrentContextId()

---
 include/SFML/Window/Context.hpp | 14 --------------
 src/SFML/Window/Context.cpp     |  7 -------
 src/SFML/Window/GlContext.cpp   |  7 -------
 src/SFML/Window/GlContext.hpp   | 10 ----------
 4 files changed, 38 deletions(-)

diff --git a/include/SFML/Window/Context.hpp b/include/SFML/Window/Context.hpp
index 48b21491..def5acf9 100644
--- a/include/SFML/Window/Context.hpp
+++ b/include/SFML/Window/Context.hpp
@@ -41,8 +41,6 @@ namespace priv
     class GlContext;
 }
 
-typedef void* ContextId;
-
 ////////////////////////////////////////////////////////////
 /// \brief Class holding a valid drawing context
 ///
@@ -77,18 +75,6 @@ public :
     ////////////////////////////////////////////////////////////
     bool SetActive(bool active);
 
-    ////////////////////////////////////////////////////////////
-    /// \brief Return the identifier of the current active context
-    ///
-    /// The returned id has no special meaning, it should only be
-    /// used as a key to map external stuff to internal contexts.
-    /// This function returns 0 if no context is active.
-    ///
-    /// \return Identifier of the current context
-    ///
-    ////////////////////////////////////////////////////////////
-    static ContextId GetCurrentContextId();
-
 public :
 
     ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Window/Context.cpp b/src/SFML/Window/Context.cpp
index 354b4cdc..961c2508 100644
--- a/src/SFML/Window/Context.cpp
+++ b/src/SFML/Window/Context.cpp
@@ -53,13 +53,6 @@ bool Context::SetActive(bool active)
 }
 
 
-////////////////////////////////////////////////////////////
-ContextId Context::GetCurrentContextId()
-{
-    return priv::GlContext::GetCurrentContext();
-}
-
-
 ////////////////////////////////////////////////////////////
 Context::Context(const ContextSettings& settings, unsigned int width, unsigned int height)
 {
diff --git a/src/SFML/Window/GlContext.cpp b/src/SFML/Window/GlContext.cpp
index 51f808ae..196ed9c8 100644
--- a/src/SFML/Window/GlContext.cpp
+++ b/src/SFML/Window/GlContext.cpp
@@ -177,13 +177,6 @@ GlContext* GlContext::New(const ContextSettings& settings, unsigned int width, u
 }
 
 
-////////////////////////////////////////////////////////////
-GlContext* GlContext::GetCurrentContext()
-{
-    return currentContext;
-}
-
-
 ////////////////////////////////////////////////////////////
 GlContext::~GlContext()
 {
diff --git a/src/SFML/Window/GlContext.hpp b/src/SFML/Window/GlContext.hpp
index 015ef72a..f6eb193a 100644
--- a/src/SFML/Window/GlContext.hpp
+++ b/src/SFML/Window/GlContext.hpp
@@ -118,16 +118,6 @@ public :
     ////////////////////////////////////////////////////////////
     static GlContext* New(const ContextSettings& settings, unsigned int width, unsigned int height);
 
-    ////////////////////////////////////////////////////////////
-    /// \brief Return the current active context
-    ///
-    /// This function returns 0 if no context is active.
-    ///
-    /// \return Context currently active in this thread
-    ///
-    ////////////////////////////////////////////////////////////
-    static GlContext* GetCurrentContext();
-
 public :
 
     ////////////////////////////////////////////////////////////