From 4305c7604978188a18bff75e5ece9067a0c33bf2 Mon Sep 17 00:00:00 2001
From: Camilla Berglund
Date: Wed, 2 Jan 2013 00:41:37 +0100
Subject: [PATCH] Removed monitor user pointer.
---
include/GL/glfw3.h | 17 -----------------
readme.html | 1 -
src/internal.h | 2 --
3 files changed, 20 deletions(-)
diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index 2002a9b1..d8494fa4 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -1024,23 +1024,6 @@ GLFWAPI int glfwGetMonitorParam(GLFWmonitor monitor, int param);
*/
GLFWAPI const char* glfwGetMonitorName(GLFWmonitor monitor);
-/*! @brief Sets the user pointer of the specified monitor.
- * @param[in] monitor The monitor whose pointer to set.
- * @param[in] pointer The new value.
- * @ingroup monitor
- *
- * @see glfwGetMonitorUserPointer
- */
-GLFWAPI void glfwSetMonitorUserPointer(GLFWmonitor monitor, void* pointer);
-
-/*! @brief Returns the user pointer of the specified monitor.
- * @param[in] monitor The monitor whose pointer to return.
- * @ingroup monitor
- *
- * @sa glfwSetMonitorUserPointer
- */
-GLFWAPI void* glfwGetMonitorUserPointer(GLFWmonitor monitor);
-
/*! @brief Sets the monitor configuration callback.
* @param[in] cbfun The new callback, or @c NULL to remove the currently set.
* @ingroup monitor
diff --git a/readme.html b/readme.html
index 6505b9b6..1dc8fb86 100644
--- a/readme.html
+++ b/readme.html
@@ -270,7 +270,6 @@ version of GLFW.
Added GLFWmonitor
monitor handle type and updated monitor-related functions to take a monitor handle
Added glfwGetMonitors
and glfwGetPrimaryMonitor
for enumerating available monitors
Added glfwGetMonitorParam
and glfwGetMonitorName
for retrieving monitor properties
- Added glfwSetMonitorUserPointer
and glfwGetMonitorUserPointer
for per-monitor user pointers
Added glfwSetMonitorCallback
and GLFWmonitorfun
for notification of changes in the set of available monitors
Added GLFWwindow
window handle type and updated window-related functions and callbacks to take a window handle
Added glfwDefaultWindowHints
function for resetting all window hints to their default values
diff --git a/src/internal.h b/src/internal.h
index 4c9fe86f..14393e49 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -227,8 +227,6 @@ struct _GLFWwindow
//------------------------------------------------------------------------
struct _GLFWmonitor
{
- void* userPointer;
-
char* name;
GLboolean primary;