mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 04:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed 'device' from monitor callback.

Browse Source
This commit is contained in:
Camilla Berglund 2012-08-14 15:15:51 +02:00
parent 39c171a61d
commit 2b0f8c2f1e
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/GL/glfw3.h
View File

@ -497,7 +497,7 @@ typedef void (* GLFWcursorenterfun)(GLFWwindow,int);
typedef void (* GLFWscrollfun)(GLFWwindow,double,double); typedef void (* GLFWscrollfun)(GLFWwindow,double,double);
typedef void (* GLFWkeyfun)(GLFWwindow,int,int); typedef void (* GLFWkeyfun)(GLFWwindow,int,int);
typedef void (* GLFWcharfun)(GLFWwindow,int); typedef void (* GLFWcharfun)(GLFWwindow,int);
typedef void (* GLFWmonitordevicefun)(GLFWmonitor,int); typedef void (* GLFWmonitorfun)(GLFWmonitor,int);
/* The video mode structure used by glfwGetVideoModes */ /* The video mode structure used by glfwGetVideoModes */
typedef struct typedef struct
@ -534,7 +534,7 @@ GLFWAPI const char* glfwErrorString(int error);
GLFWAPI void glfwSetErrorCallback(GLFWerrorfun cbfun); GLFWAPI void glfwSetErrorCallback(GLFWerrorfun cbfun);
/* Monitor callback registration */ /* Monitor callback registration */
GLFWAPI void glfwSetMonitorDeviceCallback(GLFWmonitordevicefun cbfun); GLFWAPI void glfwSetMonitorCallback(GLFWmonitorfun cbfun);
/* Monitor attributes */ /* Monitor attributes */
GLFWAPI void glfwSetMonitorUserPointer(GLFWmonitor monitor, void* pointer); GLFWAPI void glfwSetMonitorUserPointer(GLFWmonitor monitor, void* pointer);

2
src/internal.h
View File

@ -256,7 +256,7 @@ struct _GLFWlibrary
GLFWscrollfun scrollCallback; GLFWscrollfun scrollCallback;
GLFWkeyfun keyCallback; GLFWkeyfun keyCallback;
GLFWcharfun charCallback; GLFWcharfun charCallback;
GLFWmonitordevicefun monitorCallback; GLFWmonitorfun monitorCallback;
GLFWgammaramp currentRamp; GLFWgammaramp currentRamp;
GLFWgammaramp originalRamp; GLFWgammaramp originalRamp;

2
src/monitor.c
View File

@ -137,7 +137,7 @@ GLFWAPI const char* glfwGetMonitorString(GLFWmonitor handle, int param)
// Set a callback function for monitor events // Set a callback function for monitor events
//======================================================================== //========================================================================
GLFWAPI void glfwSetMonitorDeviceCallback(GLFWmonitordevicefun cbfun) GLFWAPI void glfwSetMonitorCallback(GLFWmonitorfun cbfun)
{ {
if (!_glfwInitialized) if (!_glfwInitialized)
{ {

2
tests/events.c
View File

@ -394,7 +394,7 @@ int main(void)
glfwSetScrollCallback(scroll_callback); glfwSetScrollCallback(scroll_callback);
glfwSetKeyCallback(key_callback); glfwSetKeyCallback(key_callback);
glfwSetCharCallback(char_callback); glfwSetCharCallback(char_callback);
glfwSetMonitorDeviceCallback(monitor_callback); glfwSetMonitorCallback(monitor_callback);
window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "Event Linter", NULL); window = glfwCreateWindow(0, 0, GLFW_WINDOWED, "Event Linter", NULL);
if (!window) if (!window)