[Java-game-lib-cvs] CVS: LWJGL/src/native/win32 org_lwjgl_Window.cpp,1.5,1.6 org_lwjgl_opengl_BaseGL.cpp,1.17,1.18

[Elias N. <eli...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv14073/src/native/win32

Modified Files:
	org_lwjgl_Window.cpp org_lwjgl_opengl_BaseGL.cpp 
Log Message:
Linux/win32 changes for 0.6

Index: org_lwjgl_Window.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Window.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Window.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- org_lwjgl_Window.cpp	29 Mar 2003 21:52:14 -0000	1.5
+++ org_lwjgl_Window.cpp	30 Mar 2003 19:26:39 -0000	1.6
@@ -178,15 +178,15 @@
 			case SC_MONITORPOWER:
 				return 0L;
 			case SC_MINIMIZE:
-				environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "minimized", "Z"), true);
+				environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "minimized", "Z"), JNI_TRUE);
 				appActivate(true);
 				break;
 			case SC_RESTORE:
-				environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "minimized", "Z"), false);
+				environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "minimized", "Z"), JNI_FALSE);
 				appActivate(false);
 				break;
 			case SC_CLOSE:
-				environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "closeRequested", "Z"), true);
+				environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "closeRequested", "Z"), JNI_TRUE);
 				//don't continue processing this command since this 
 				//would shutdown the window, which the application might not want to
 				return 0L;
@@ -198,11 +198,11 @@
 			switch(LOWORD(wParam)) {
 			case WA_ACTIVE:
 			case WA_CLICKACTIVE:
-				environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "minimized", "Z"), false);
+				environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "minimized", "Z"), JNI_FALSE);
 				isMinimized = false;
 				break;
 			case WA_INACTIVE:
-				environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "minimized", "Z"), true);
+				environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "minimized", "Z"), JNI_TRUE);
 				isMinimized = true;
 				break;
 			}
@@ -211,12 +211,12 @@
 		break;
 		case WM_QUIT:
 		{
-			environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "closeRequested", "Z"), true);
+			environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "closeRequested", "Z"), JNI_TRUE);
 			return 0L;
 		}
 		case WM_PAINT:
 		{
-			environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "dirty", "Z"), true);
+			environment->SetBooleanField(window, environment->GetFieldID(environment->GetObjectClass(window), "dirty", "Z"), JNI_TRUE);
 		}
 	}
 
@@ -353,40 +353,11 @@
  * Signature: ()V
  */
 JNIEXPORT void JNICALL Java_org_lwjgl_Window_nSetTitle
-  (JNIEnv * env, jobject obj)
+  (JNIEnv * env, jobject obj, jstring title_obj)
 {
-	const char * title = env->GetStringUTFChars((jstring) obj, NULL);
+	const char * title = env->GetStringUTFChars(title_obj, NULL);
 	SetWindowText(hwnd, title);
-	env->ReleaseStringUTFChars((jstring) obj, title);
-}
-
-/*
- * Class:     org_lwjgl_Window
- * Method:    swapBuffers
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Window_swapBuffers
-  (JNIEnv * env, jobject obj)
-{
-	SwapBuffers(hdc);
-}
-
-/*
- * Class:     org_lwjgl_Window
- * Method:    nDestroy
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_Window_nDestroy
-  (JNIEnv * env, jobject obj)
-{
-	// Cache env and obj
-	environment = env;
-	window = obj;
-
-	closeWindow();
-
-	environment = NULL;
-	window = NULL;
+	env->ReleaseStringUTFChars(title_obj, title);
 }
 
 /*
@@ -426,4 +397,4 @@
   (JNIEnv * env, jobject obj)
 {
 	handleMessages(env, obj);
-}
\ No newline at end of file
+}

Index: org_lwjgl_opengl_BaseGL.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_BaseGL.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- org_lwjgl_opengl_BaseGL.cpp	28 Mar 2003 23:16:13 -0000	1.17
+++ org_lwjgl_opengl_BaseGL.cpp	30 Mar 2003 19:26:39 -0000	1.18
@@ -204,6 +204,18 @@
 		wglDeleteContext(hglrc); 
 		hglrc = NULL;
 	}
-
+	closeWindow();
 	extgl_Close();
 }
+
+/*
+ * Class:     org_lwjgl_opengl_BaseGL
+ * Method:    swapBuffers
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_BaseGL_swapBuffers
+  (JNIEnv *, jobject) 
+{
+	SwapBuffers(wglGetCurrentDC());
+}
+