From 7be62631aebfb9dae515e95b9c92b3979e65988c Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 25 Jul 2016 19:36:25 +0200 Subject: [PATCH] Cleanup --- src/cocoa_window.m | 6 +++--- src/win32_window.c | 5 +++-- src/x11_window.c | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 09d2ca22..fab6f0a1 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -944,8 +944,8 @@ static GLFWbool initializeAppKit(void) // Create the Cocoa window // -static GLFWbool createWindow(_GLFWwindow* window, - const _GLFWwndconfig* wndconfig) +static GLFWbool createNativeWindow(_GLFWwindow* window, + const _GLFWwndconfig* wndconfig) { window->ns.delegate = [[GLFWWindowDelegate alloc] initWithGlfwWindow:window]; if (window->ns.delegate == nil) @@ -1027,7 +1027,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window, if (!initializeAppKit()) return GLFW_FALSE; - if (!createWindow(window, wndconfig)) + if (!createNativeWindow(window, wndconfig)) return GLFW_FALSE; if (ctxconfig->client != GLFW_NO_API) diff --git a/src/win32_window.c b/src/win32_window.c index edf759ce..6731b247 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -852,7 +852,8 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg, // Creates the GLFW window // -static int createWindow(_GLFWwindow* window, const _GLFWwndconfig* wndconfig) +static int createNativeWindow(_GLFWwindow* window, + const _GLFWwndconfig* wndconfig) { int xpos, ypos, fullWidth, fullHeight; WCHAR* wideTitle; @@ -986,7 +987,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window, const _GLFWctxconfig* ctxconfig, const _GLFWfbconfig* fbconfig) { - if (!createWindow(window, wndconfig)) + if (!createNativeWindow(window, wndconfig)) return GLFW_FALSE; if (ctxconfig->client != GLFW_NO_API) diff --git a/src/x11_window.c b/src/x11_window.c index c4f19aca..918473c8 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -428,9 +428,9 @@ static void updateCursorImage(_GLFWwindow* window) // Create the X11 window (and its colormap) // -static GLFWbool createWindow(_GLFWwindow* window, - const _GLFWwndconfig* wndconfig, - Visual* visual, int depth) +static GLFWbool createNativeWindow(_GLFWwindow* window, + const _GLFWwndconfig* wndconfig, + Visual* visual, int depth) { // Create a colormap based on the visual used by the current context window->x11.colormap = XCreateColormap(_glfw.x11.display, @@ -1531,7 +1531,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window, } } - if (!createWindow(window, wndconfig, visual, depth)) + if (!createNativeWindow(window, wndconfig, visual, depth)) return GLFW_FALSE; if (ctxconfig->client != GLFW_NO_API)