From 8ee5b8d931222bf1b8efceeef9348ca2f7942418 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 28 Jun 2006 21:16:14 +0000 Subject: [PATCH] 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. --- src/java/org/lwjgl/opengl/Win32CanvasImplementation.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java b/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java index dea972b0..b92b1a1f 100644 --- a/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java +++ b/src/java/org/lwjgl/opengl/Win32CanvasImplementation.java @@ -33,6 +33,7 @@ package org.lwjgl.opengl; import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; +import java.awt.Toolkit; import java.security.PrivilegedAction; import java.security.AccessController; @@ -46,12 +47,8 @@ import org.lwjgl.LWJGLException; */ 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 {