[Java-game-lib-cvs] CVS: LWJGL/src/native/win32 org_lwjgl_input_Mouse.cpp,1.29,1.30

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

Modified Files:
	org_lwjgl_input_Mouse.cpp 
Log Message:


Index: org_lwjgl_input_Mouse.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- org_lwjgl_input_Mouse.cpp	30 Sep 2003 11:52:32 -0000	1.29
+++ org_lwjgl_input_Mouse.cpp	7 Oct 2003 13:09:59 -0000	1.30
@@ -56,12 +56,10 @@
 
 // Cached fields of Mouse.java
 static jclass clsMouse;
-static jfieldID fidMButtonCount;
 static jfieldID fidMButtons;
 static jfieldID fidMDX;
 static jfieldID fidMDY;
 static jfieldID fidMDWheel;
-static jfieldID fidMHasWheel;
 
 static POINT cursorPos;
 static RECT windowRect;
@@ -76,7 +74,6 @@
 void InitializeMouseFields();
 void CacheMouseFields();
 void UpdateMouseFields();
-void SetMouseCapabilities();
 
 static void getScreenClientRect(RECT* clientRect, RECT* windowRect)
 {
@@ -99,6 +96,14 @@
   CacheMouseFields();
 }
 
+JNIEXPORT jboolean JNICALL Java_org_lwjgl_input_Mouse_nHasWheel(JNIEnv *, jclass) {
+	return mHasWheel;
+}
+
+JNIEXPORT jint JNICALL Java_org_lwjgl_input_Mouse_nGetButtonCount(JNIEnv *, jclass) {
+	return mButtonCount
+}
+
 /**
  * Called when the Mouse instance is to be created
  */
@@ -126,9 +131,6 @@
 		}
 		/* Do setup of Mouse */
 		SetupMouse();
-
-		/* Set capabilities */
-		SetMouseCapabilities();
 	} else {
 		if(mCreate_success) {
 			/* Do setup of Mouse */
@@ -432,22 +434,9 @@
 }
 
 /**
- * Sets the capabilities of the Mouse
- */
-void SetMouseCapabilities() {
-  //set buttoncount
-  mEnvironment->SetStaticIntField(clsMouse, fidMButtonCount, mButtoncount);
-
-  //set wheel
-  mEnvironment->SetStaticBooleanField(clsMouse, fidMHasWheel, mHaswheel);
-}
-
-/**
  * Caches the field ids for quicker access
  */
 void CacheMouseFields() {
-  fidMButtonCount  = mEnvironment->GetStaticFieldID(clsMouse, "buttonCount", "I");
-  fidMHasWheel     = mEnvironment->GetStaticFieldID(clsMouse, "hasWheel", "Z");
   fidMButtons      = mEnvironment->GetStaticFieldID(clsMouse, "buttons", "[Z");
   fidMDX           = mEnvironment->GetStaticFieldID(clsMouse, "dx", "I");
   fidMDY           = mEnvironment->GetStaticFieldID(clsMouse, "dy", "I");