[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3722] trunk/LWJGL/src/java/org/lwjgl

[<ma...@us...>]

Revision: 3722
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3722&view=rev
Author:   matzon
Date:     2012-01-11 20:46:57 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
adding WS_MAXIMIZEBOX patch for windows and bumping native version

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java

Modified: trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	2012-01-06 11:52:48 UTC (rev 3721)
+++ trunk/LWJGL/src/java/org/lwjgl/WindowsSysImplementation.java	2012-01-11 20:46:57 UTC (rev 3722)
@@ -46,7 +46,7 @@
  * $Id$
  */
 final class WindowsSysImplementation extends DefaultSysImplementation {
-	private static final int JNI_VERSION = 23;
+	private static final int JNI_VERSION = 24;
 
 	static {
 		Sys.initialize();

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2012-01-06 11:52:48 UTC (rev 3721)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2012-01-11 20:46:57 UTC (rev 3722)
@@ -143,6 +143,7 @@
 	private static final int GWL_EXSTYLE = -20;
 
 	private static final int WS_THICKFRAME 		= 0x00040000;
+	private static final int WS_MAXIMIZEBOX		= 0x00010000;
 	
 	private static final int HTCLIENT			= 0x01;
 
@@ -858,6 +859,8 @@
 				switch ((int)wParam) {
 					case SIZE_RESTORED:
 					case SIZE_MAXIMIZED:
+						resized = true;
+						updateWidthAndHeight();
 						setMinimized(false);
 						break;
 					case SIZE_MINIMIZED:
@@ -1011,9 +1014,9 @@
 
 			// update frame style
 			if(resizable) {
-				setWindowLongPtr(hwnd, GWL_STYLE, style |= WS_THICKFRAME);
+				setWindowLongPtr(hwnd, GWL_STYLE, style |= (WS_THICKFRAME | WS_MAXIMIZEBOX));
 			} else {
-				setWindowLongPtr(hwnd, GWL_STYLE, style &= ~WS_THICKFRAME);
+				setWindowLongPtr(hwnd, GWL_STYLE, style &= ~(WS_THICKFRAME | WS_MAXIMIZEBOX));
 			}
 
 			// from the existing client rect, determine the new window rect

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.