Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-26 03:52:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Camilla Berglund 2016-05-30 21:19:00 +02:00
parent 20bce151c1
commit 03db3ed6e9
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/win32_init.c
View File

@ -415,8 +415,8 @@ int _glfwPlatformInit(void)
if (!_glfwRegisterWindowClassWin32()) if (!_glfwRegisterWindowClassWin32())
return GLFW_FALSE; return GLFW_FALSE;
_glfw.win32.helperWindow = createHelperWindow(); _glfw.win32.helperWindowHandle = createHelperWindow();
if (!_glfw.win32.helperWindow) if (!_glfw.win32.helperWindowHandle)
return GLFW_FALSE; return GLFW_FALSE;
_glfwPlatformPollEvents(); _glfwPlatformPollEvents();
@ -433,8 +433,8 @@ int _glfwPlatformInit(void)
void _glfwPlatformTerminate(void) void _glfwPlatformTerminate(void)
{ {
if (_glfw.win32.helperWindow) if (_glfw.win32.helperWindowHandle)
DestroyWindow(_glfw.win32.helperWindow); DestroyWindow(_glfw.win32.helperWindowHandle);
_glfwUnregisterWindowClassWin32(); _glfwUnregisterWindowClassWin32();

2
src/win32_platform.h
View File

@ -246,7 +246,7 @@ typedef struct _GLFWwindowWin32
// //
typedef struct _GLFWlibraryWin32 typedef struct _GLFWlibraryWin32
{ {
HWND helperWindow; HWND helperWindowHandle;
DWORD foregroundLockTimeout; DWORD foregroundLockTimeout;
char* clipboardString; char* clipboardString;
char keyName[64]; char keyName[64];

4
src/win32_window.c
View File

@ -1605,7 +1605,7 @@ void _glfwPlatformSetClipboardString(_GLFWwindow* window, const char* string)
memcpy(GlobalLock(stringHandle), wideString, wideSize); memcpy(GlobalLock(stringHandle), wideString, wideSize);
GlobalUnlock(stringHandle); GlobalUnlock(stringHandle);
if (!OpenClipboard(_glfw.win32.helperWindow)) if (!OpenClipboard(_glfw.win32.helperWindowHandle))
{ {
GlobalFree(stringHandle); GlobalFree(stringHandle);
free(wideString); free(wideString);
@ -1625,7 +1625,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
{ {
HANDLE stringHandle; HANDLE stringHandle;
if (!OpenClipboard(_glfw.win32.helperWindow)) if (!OpenClipboard(_glfw.win32.helperWindowHandle))
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, "Win32: Failed to open clipboard"); _glfwInputError(GLFW_PLATFORM_ERROR, "Win32: Failed to open clipboard");
return NULL; return NULL;