From 03db3ed6e9c6fb4d25e1978216dd50724aad5ee6 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 30 May 2016 21:19:00 +0200 Subject: [PATCH] Cleanup --- src/win32_init.c | 8 ++++---- src/win32_platform.h | 2 +- src/win32_window.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/win32_init.c b/src/win32_init.c index 0bfe34c7..a6da1dbc 100644 --- a/src/win32_init.c +++ b/src/win32_init.c @@ -415,8 +415,8 @@ int _glfwPlatformInit(void) if (!_glfwRegisterWindowClassWin32()) return GLFW_FALSE; - _glfw.win32.helperWindow = createHelperWindow(); - if (!_glfw.win32.helperWindow) + _glfw.win32.helperWindowHandle = createHelperWindow(); + if (!_glfw.win32.helperWindowHandle) return GLFW_FALSE; _glfwPlatformPollEvents(); @@ -433,8 +433,8 @@ int _glfwPlatformInit(void) void _glfwPlatformTerminate(void) { - if (_glfw.win32.helperWindow) - DestroyWindow(_glfw.win32.helperWindow); + if (_glfw.win32.helperWindowHandle) + DestroyWindow(_glfw.win32.helperWindowHandle); _glfwUnregisterWindowClassWin32(); diff --git a/src/win32_platform.h b/src/win32_platform.h index 30549dfb..ed7a5a7c 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -246,7 +246,7 @@ typedef struct _GLFWwindowWin32 // typedef struct _GLFWlibraryWin32 { - HWND helperWindow; + HWND helperWindowHandle; DWORD foregroundLockTimeout; char* clipboardString; char keyName[64]; diff --git a/src/win32_window.c b/src/win32_window.c index dbe374c1..ed22ef01 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -1605,7 +1605,7 @@ void _glfwPlatformSetClipboardString(_GLFWwindow* window, const char* string) memcpy(GlobalLock(stringHandle), wideString, wideSize); GlobalUnlock(stringHandle); - if (!OpenClipboard(_glfw.win32.helperWindow)) + if (!OpenClipboard(_glfw.win32.helperWindowHandle)) { GlobalFree(stringHandle); free(wideString); @@ -1625,7 +1625,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window) { HANDLE stringHandle; - if (!OpenClipboard(_glfw.win32.helperWindow)) + if (!OpenClipboard(_glfw.win32.helperWindowHandle)) { _glfwInputError(GLFW_PLATFORM_ERROR, "Win32: Failed to open clipboard"); return NULL;