commit 2b0f8c2f1ecdb4b31c07d77a246eb43dea58007a
author Camilla Berglund <elmindreda@elmindreda.org> Tue Aug 14 15:15:51 2012 +0200
committer Camilla Berglund <elmindreda@elmindreda.org> Tue Aug 14 15:15:51 2012 +0200
tree 4bd0c72e7eadf53ba21490ee0b60ced6aa80c2f3
parent 39c171a61daff1f14da65635126cd610ffb4e562

Removed 'device' from monitor callback.

include/GL/glfw3.h

diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index c3f2a2c..00f832f 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -497,7 +497,7 @@
 typedef void (* GLFWscrollfun)(GLFWwindow,double,double);
 typedef void (* GLFWkeyfun)(GLFWwindow,int,int);
 typedef void (* GLFWcharfun)(GLFWwindow,int);
-typedef void (* GLFWmonitordevicefun)(GLFWmonitor,int);
+typedef void (* GLFWmonitorfun)(GLFWmonitor,int);
 
 /* The video mode structure used by glfwGetVideoModes */
 typedef struct
@@ -534,7 +534,7 @@
 GLFWAPI void glfwSetErrorCallback(GLFWerrorfun cbfun);
 
 /* Monitor callback registration */
-GLFWAPI void glfwSetMonitorDeviceCallback(GLFWmonitordevicefun cbfun);
+GLFWAPI void glfwSetMonitorCallback(GLFWmonitorfun cbfun);
 
 /* Monitor attributes */
 GLFWAPI void glfwSetMonitorUserPointer(GLFWmonitor monitor, void* pointer);

src/internal.h

diff --git a/src/internal.h b/src/internal.h
index 74a9130..266892e 100755
--- a/src/internal.h
+++ b/src/internal.h
@@ -256,7 +256,7 @@
     GLFWscrollfun        scrollCallback;
     GLFWkeyfun           keyCallback;
     GLFWcharfun          charCallback;
-    GLFWmonitordevicefun monitorCallback;
+    GLFWmonitorfun       monitorCallback;
 
     GLFWgammaramp currentRamp;
     GLFWgammaramp originalRamp;

src/monitor.c

diff --git a/src/monitor.c b/src/monitor.c
index d30b7c3..3ce80f4 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -137,7 +137,7 @@
 // Set a callback function for monitor events
 //========================================================================
 
-GLFWAPI void glfwSetMonitorDeviceCallback(GLFWmonitordevicefun cbfun)
+GLFWAPI void glfwSetMonitorCallback(GLFWmonitorfun cbfun)
 {
     if (!_glfwInitialized)
     {

tests/events.c

diff --git a/tests/events.c b/tests/events.c
index c7a4649..0bed007 100644
--- a/tests/events.c
+++ b/tests/events.c
@@ -394,7 +394,7 @@
     glfwSetScrollCallback(scroll_callback);
     glfwSetKeyCallback(key_callback);
     glfwSetCharCallback(char_callback);
-    glfwSetMonitorDeviceCallback(monitor_callback);
+    glfwSetMonitorCallback(monitor_callback);
 
     window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "Event Linter", NULL);
     if (!window)