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

Removed duplicate width and height parameters already included in window struct.

Browse Source
This commit is contained in:
Camilla Berglund 2010-09-13 23:42:51 +02:00
parent c6bd6a7741
commit 819d0446b1
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal.h
View File

@ -255,7 +255,7 @@ double _glfwPlatformGetTime(void);
void _glfwPlatformSetTime(double time); void _glfwPlatformSetTime(double time);
// Window management // 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); int _glfwPlatformMakeWindowCurrent(_GLFWwindow* window);
void _glfwPlatformCloseWindow(_GLFWwindow* window); void _glfwPlatformCloseWindow(_GLFWwindow* window);
void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title); void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title);

2
src/window.c
View File

@ -499,7 +499,7 @@ GLFWAPI GLFWwindow glfwOpenWindow(int width, int height, int mode)
window->mode = mode; window->mode = mode;
// Platform specific window opening routine // Platform specific window opening routine
if (!_glfwPlatformOpenWindow(window, width, height, &wndconfig, &fbconfig)) if (!_glfwPlatformOpenWindow(window, &wndconfig, &fbconfig))
{ {
glfwCloseWindow(window); glfwCloseWindow(window);
return GL_FALSE; return GL_FALSE;

10
src/x11/x11_window.c
View File

@ -685,7 +685,6 @@ static void initGLXExtensions(_GLFWwindow* window)
//======================================================================== //========================================================================
static GLboolean createWindow(_GLFWwindow* window, static GLboolean createWindow(_GLFWwindow* window,
int width, int height,
const _GLFWwndconfig* wndconfig) const _GLFWwndconfig* wndconfig)
{ {
XEvent event; XEvent event;
@ -696,9 +695,9 @@ static GLboolean createWindow(_GLFWwindow* window,
// Create one based on the visual used by the current context // Create one based on the visual used by the current context
window->X11.colormap = XCreateColormap(_glfwLibrary.X11.display, window->X11.colormap = XCreateColormap(_glfwLibrary.X11.display,
_glfwLibrary.X11.root, _glfwLibrary.X11.root,
window->GLX.visual->visual, window->GLX.visual->visual,
AllocNone); AllocNone);
// Create the actual window // Create the actual window
{ {
@ -1370,7 +1369,6 @@ static void processSingleEvent(void)
//======================================================================== //========================================================================
int _glfwPlatformOpenWindow(_GLFWwindow* window, int _glfwPlatformOpenWindow(_GLFWwindow* window,
int width, int height,
const _GLFWwndconfig* wndconfig, const _GLFWwndconfig* wndconfig,
const _GLFWfbconfig* fbconfig) const _GLFWfbconfig* fbconfig)
{ {
@ -1405,7 +1403,7 @@ int _glfwPlatformOpenWindow(_GLFWwindow* window,
if (!createContext(window, wndconfig, (GLXFBConfigID) closest.platformID)) if (!createContext(window, wndconfig, (GLXFBConfigID) closest.platformID))
return GL_FALSE; return GL_FALSE;
if (!createWindow(window, width, height, wndconfig)) if (!createWindow(window, wndconfig))
return GL_FALSE; return GL_FALSE;
if (wndconfig->mode == GLFW_FULLSCREEN) if (wndconfig->mode == GLFW_FULLSCREEN)