From 84eae4c6f6916240ec0849a006d6f2cffb6a78cd Mon Sep 17 00:00:00 2001 From: Brian Matzon Date: Mon, 12 Apr 2004 10:37:50 +0000 Subject: [PATCH] removed restriction about native cursors, and fixed mouse not showing on setNativeCursor(null); --- src/native/win32/org_lwjgl_input_Mouse.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/native/win32/org_lwjgl_input_Mouse.cpp b/src/native/win32/org_lwjgl_input_Mouse.cpp index 34f28848..f59a8877 100644 --- a/src/native/win32/org_lwjgl_input_Mouse.cpp +++ b/src/native/win32/org_lwjgl_input_Mouse.cpp @@ -244,8 +244,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nSetNativeCursor } else { if (usingNativeCursor) { SetClassLong(hwnd, GCL_HCURSOR, (LONG)NULL); - SetCursor(NULL); - ShowCursor(TRUE); + SetCursor(LoadCursor(NULL, IDC_ARROW)); mDIDevice->Unacquire(); if(mDIDevice->SetCooperativeLevel(hwnd, mouseMask) != DI_OK) { throwException(env, "Could not set the CooperativeLevel."); @@ -253,6 +252,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nSetNativeCursor } usingNativeCursor = false; mDIDevice->Acquire(); + ShowCursor(TRUE); } } } @@ -305,9 +305,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nPoll(JNIEnv * env, jclass cla */ JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nGrabMouse (JNIEnv * env, jclass clazz, jboolean grab) { - if(usingNativeCursor) { - return; - } if(grab) { mouseMask = DISCL_EXCLUSIVE | DISCL_FOREGROUND;