From f5106d92ed817e76d49605cb24ccc7a762301a6e Mon Sep 17 00:00:00 2001 From: Caspian Rychlik-Prince Date: Sat, 22 Jan 2005 00:34:50 +0000 Subject: [PATCH] Fixing Mac problems. --- src/java/org/lwjgl/NativeSysImplementation.java | 5 +++++ src/java/org/lwjgl/opengl/MacOSXDisplay.java | 2 +- src/java/org/lwjgl/opengl/MacOSXFrame.java | 1 - src/java/org/lwjgl/opengl/Pbuffer.java | 8 +++----- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/java/org/lwjgl/NativeSysImplementation.java b/src/java/org/lwjgl/NativeSysImplementation.java index 16309829..fb1ba15c 100644 --- a/src/java/org/lwjgl/NativeSysImplementation.java +++ b/src/java/org/lwjgl/NativeSysImplementation.java @@ -39,6 +39,11 @@ package org.lwjgl; * @version $Revision$ */ class NativeSysImplementation extends DefaultSysImplementation { + + static { + Sys.initialize(); + } + public native long getTimerResolution(); public native long getTime(); diff --git a/src/java/org/lwjgl/opengl/MacOSXDisplay.java b/src/java/org/lwjgl/opengl/MacOSXDisplay.java index 098b502f..3a85fcee 100644 --- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java +++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java @@ -179,7 +179,7 @@ final class MacOSXDisplay implements DisplayImplementation { public boolean isCloseRequested() { boolean result; synchronized (this) { - result = close_requested; + result = close_requested || (frame != null && frame.syncIsCloseRequested()); close_requested = false; } return result; diff --git a/src/java/org/lwjgl/opengl/MacOSXFrame.java b/src/java/org/lwjgl/opengl/MacOSXFrame.java index e305613e..1170be6e 100644 --- a/src/java/org/lwjgl/opengl/MacOSXFrame.java +++ b/src/java/org/lwjgl/opengl/MacOSXFrame.java @@ -47,7 +47,6 @@ import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; -import java.lang.reflect.InvocationTargetException; import org.lwjgl.LWJGLException; diff --git a/src/java/org/lwjgl/opengl/Pbuffer.java b/src/java/org/lwjgl/opengl/Pbuffer.java index 17f0e8e3..779b43aa 100644 --- a/src/java/org/lwjgl/opengl/Pbuffer.java +++ b/src/java/org/lwjgl/opengl/Pbuffer.java @@ -31,13 +31,11 @@ */ package org.lwjgl.opengl; -import org.lwjgl.Sys; -import org.lwjgl.BufferUtils; -import org.lwjgl.LWJGLException; - -import java.nio.IntBuffer; import java.nio.ByteBuffer; +import org.lwjgl.LWJGLException; +import org.lwjgl.Sys; + /** * $Id$ *