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

Removed cached instance handle.

Browse Source
This commit is contained in:
Camilla Berglund 2013-02-01 04:05:12 +01:00
parent b872089fa9
commit 231ee1bdc7
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/win32_init.c
View File

@ -179,8 +179,6 @@ int _glfwPlatformInit(void)
_control87(MCW_EM, MCW_EM); _control87(MCW_EM, MCW_EM);
#endif #endif
_glfw.win32.instance = GetModuleHandle(NULL);
// Save the original gamma ramp // Save the original gamma ramp
_glfw.originalRampSize = 256; _glfw.originalRampSize = 256;
_glfwPlatformGetGammaRamp(&_glfw.originalRamp); _glfwPlatformGetGammaRamp(&_glfw.originalRamp);
@ -204,7 +202,7 @@ void _glfwPlatformTerminate(void)
if (_glfw.win32.classAtom) if (_glfw.win32.classAtom)
{ {
UnregisterClass(_GLFW_WNDCLASSNAME, _glfw.win32.instance); UnregisterClass(_GLFW_WNDCLASSNAME, GetModuleHandle(NULL));
_glfw.win32.classAtom = 0; _glfw.win32.classAtom = 0;
} }

1
src/win32_platform.h
View File

@ -157,7 +157,6 @@ typedef struct _GLFWwindowWin32
//------------------------------------------------------------------------ //------------------------------------------------------------------------
typedef struct _GLFWlibraryWin32 typedef struct _GLFWlibraryWin32
{ {
HINSTANCE instance;
ATOM classAtom; ATOM classAtom;
DWORD foregroundLockTimeout; DWORD foregroundLockTimeout;
char* clipboardString; char* clipboardString;

6
src/win32_window.c
View File

@ -680,14 +680,14 @@ static ATOM registerWindowClass(void)
wc.lpfnWndProc = (WNDPROC) windowProc; // Message handler wc.lpfnWndProc = (WNDPROC) windowProc; // Message handler
wc.cbClsExtra = 0; // No extra class data wc.cbClsExtra = 0; // No extra class data
wc.cbWndExtra = sizeof(void*) + sizeof(int); // Make room for one pointer wc.cbWndExtra = sizeof(void*) + sizeof(int); // Make room for one pointer
wc.hInstance = _glfw.win32.instance; // Set instance wc.hInstance = GetModuleHandle(NULL); // Set instance
wc.hCursor = LoadCursor(NULL, IDC_ARROW); // Load arrow pointer wc.hCursor = LoadCursor(NULL, IDC_ARROW); // Load arrow pointer
wc.hbrBackground = NULL; // No background wc.hbrBackground = NULL; // No background
wc.lpszMenuName = NULL; // No menu wc.lpszMenuName = NULL; // No menu
wc.lpszClassName = _GLFW_WNDCLASSNAME; // Set class name wc.lpszClassName = _GLFW_WNDCLASSNAME; // Set class name
// Load user-provided icon if available // Load user-provided icon if available
wc.hIcon = LoadIcon(_glfw.win32.instance, L"GLFW_ICON"); wc.hIcon = LoadIcon(GetModuleHandle(NULL), L"GLFW_ICON");
if (!wc.hIcon) if (!wc.hIcon)
{ {
// Load default icon // Load default icon
@ -774,7 +774,7 @@ static int createWindow(_GLFWwindow* window,
fullHeight, // Decorated window height fullHeight, // Decorated window height
NULL, // No parent window NULL, // No parent window
NULL, // No menu NULL, // No menu
_glfw.win32.instance, GetModuleHandle(NULL),
window); // Pass GLFW window to WM_CREATE window); // Pass GLFW window to WM_CREATE
free(wideTitle); free(wideTitle);