From 819d0446b1cf943b81424694a6d8efa91f545892 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 13 Sep 2010 23:42:51 +0200 Subject: [PATCH] Removed duplicate width and height parameters already included in window struct. --- src/internal.h | 2 +- src/window.c | 2 +- src/x11/x11_window.c | 10 ++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/internal.h b/src/internal.h index 2c60e507..72012b9e 100644 --- a/src/internal.h +++ b/src/internal.h @@ -255,7 +255,7 @@ double _glfwPlatformGetTime(void); void _glfwPlatformSetTime(double time); // Window management -int _glfwPlatformOpenWindow(_GLFWwindow* window, int width, int height, const _GLFWwndconfig* wndconfig, const _GLFWfbconfig* fbconfig); +int _glfwPlatformOpenWindow(_GLFWwindow* window, const _GLFWwndconfig* wndconfig, const _GLFWfbconfig* fbconfig); int _glfwPlatformMakeWindowCurrent(_GLFWwindow* window); void _glfwPlatformCloseWindow(_GLFWwindow* window); void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title); diff --git a/src/window.c b/src/window.c index 73244eac..c984f636 100644 --- a/src/window.c +++ b/src/window.c @@ -499,7 +499,7 @@ GLFWAPI GLFWwindow glfwOpenWindow(int width, int height, int mode) window->mode = mode; // Platform specific window opening routine - if (!_glfwPlatformOpenWindow(window, width, height, &wndconfig, &fbconfig)) + if (!_glfwPlatformOpenWindow(window, &wndconfig, &fbconfig)) { glfwCloseWindow(window); return GL_FALSE; diff --git a/src/x11/x11_window.c b/src/x11/x11_window.c index 3b47af5f..f816b2a0 100644 --- a/src/x11/x11_window.c +++ b/src/x11/x11_window.c @@ -685,7 +685,6 @@ static void initGLXExtensions(_GLFWwindow* window) //======================================================================== static GLboolean createWindow(_GLFWwindow* window, - int width, int height, const _GLFWwndconfig* wndconfig) { XEvent event; @@ -696,9 +695,9 @@ static GLboolean createWindow(_GLFWwindow* window, // Create one based on the visual used by the current context window->X11.colormap = XCreateColormap(_glfwLibrary.X11.display, - _glfwLibrary.X11.root, - window->GLX.visual->visual, - AllocNone); + _glfwLibrary.X11.root, + window->GLX.visual->visual, + AllocNone); // Create the actual window { @@ -1370,7 +1369,6 @@ static void processSingleEvent(void) //======================================================================== int _glfwPlatformOpenWindow(_GLFWwindow* window, - int width, int height, const _GLFWwndconfig* wndconfig, const _GLFWfbconfig* fbconfig) { @@ -1405,7 +1403,7 @@ int _glfwPlatformOpenWindow(_GLFWwindow* window, if (!createContext(window, wndconfig, (GLXFBConfigID) closest.platformID)) return GL_FALSE; - if (!createWindow(window, width, height, wndconfig)) + if (!createWindow(window, wndconfig)) return GL_FALSE; if (wndconfig->mode == GLFW_FULLSCREEN)