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

Revision: 2395
Author:   elias_naur
Date:     2006-06-28 14:16:14 -0700 (Wed, 28 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2395&view=rev

Log Message:
-----------
Windows: replace loadLibrary("jawt") with Toolkit.getDefaultToolkit() which is better and avoids classloader issues with multiple loaded natives. Additionally, getDefaultToolkit is not a privileged action, while loadLibrary is.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java
Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java	2006-06-28 06:02:00 UTC (rev 2394)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java	2006-06-28 21:16:14 UTC (rev 2395)
@@ -33,6 +33,7 @@
 
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
+import java.awt.Toolkit;
 import java.security.PrivilegedAction;
 import java.security.AccessController;
 
@@ -46,12 +47,8 @@
  */
 final class Win32CanvasImplementation implements AWTCanvasImplementation {
 	static {
-		AccessController.doPrivileged(new PrivilegedAction() {
-			public Object run() {
-				System.loadLibrary("jawt");
-				return null;
-			}
-		});
+		// Make sure the awt stuff is properly initialised (the jawt library in particular)
+		Toolkit.getDefaultToolkit();
 	}
 
 	public PeerInfo createPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) throws LWJGLException {


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