Zengtudor
/
glfw
mirror of https://github.com/glfw/glfw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Formatting.

This commit is contained in:
Camilla Berglund 2012-08-29 20:39:05 +02:00
parent 560b6b5a11
commit e0ce920191
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/GL/glfw3.h
View File

@ -469,12 +469,12 @@ extern "C" {
* Typedefs * Typedefs
*************************************************************************/ *************************************************************************/
/* Monitor handle type */
typedef void* GLFWmonitor;
/* OpenGL function pointer type */ /* OpenGL function pointer type */
typedef void (*GLFWglproc)(void); typedef void (*GLFWglproc)(void);
/* Monitor handle type */
typedef void* GLFWmonitor;
/* Window handle type */ /* Window handle type */
typedef void* GLFWwindow; typedef void* GLFWwindow;
@ -527,14 +527,12 @@ GLFWAPI int glfwGetError(void);
GLFWAPI const char* glfwErrorString(int error); GLFWAPI const char* glfwErrorString(int error);
GLFWAPI void glfwSetErrorCallback(GLFWerrorfun cbfun); GLFWAPI void glfwSetErrorCallback(GLFWerrorfun cbfun);
/* Monitor callback registration */ /* Monitor functions */
GLFWAPI void glfwSetMonitorCallback(GLFWmonitorfun cbfun); GLFWAPI int glfwGetMonitorParam(GLFWmonitor monitor, int param);
GLFWAPI const char* glfwGetMonitorString(GLFWmonitor monitor, int param);
/* Monitor attributes */
GLFWAPI void glfwSetMonitorUserPointer(GLFWmonitor monitor, void* pointer); GLFWAPI void glfwSetMonitorUserPointer(GLFWmonitor monitor, void* pointer);
GLFWAPI void* glfwGetMonitorUserPointer(GLFWmonitor monitor); GLFWAPI void* glfwGetMonitorUserPointer(GLFWmonitor monitor);
GLFWAPI int glfwGetMonitorParam(GLFWmonitor monitor, int param); GLFWAPI void glfwSetMonitorCallback(GLFWmonitorfun cbfun);
GLFWAPI const char* glfwGetMonitorString(GLFWmonitor monitor, int param);
/* Monitor discovery */ /* Monitor discovery */
GLFWAPI GLFWmonitor glfwGetNextMonitor(GLFWmonitor iterator); GLFWAPI GLFWmonitor glfwGetNextMonitor(GLFWmonitor iterator);