From 93a269bccf608baa5e7f8b7ec13ba823b8b2f086 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 12 Oct 2009 02:11:15 -0700
Subject: JOGLNewtAppletBase et al - no dispose event at destruction, since
it's critical within a browser
---
src/demos/applets/JOGLNewtApplet1Run.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
(limited to 'src/demos/applets/JOGLNewtApplet1Run.java')
diff --git a/src/demos/applets/JOGLNewtApplet1Run.java b/src/demos/applets/JOGLNewtApplet1Run.java
index f839387..e3696ab 100755
--- a/src/demos/applets/JOGLNewtApplet1Run.java
+++ b/src/demos/applets/JOGLNewtApplet1Run.java
@@ -16,6 +16,7 @@ import com.sun.javafx.newt.opengl.*;
public class JOGLNewtApplet1Run extends Applet {
JOGLNewtAppletBase base;
+ Window nWindow = null;
public void init() {
if(!(this instanceof Container)) {
@@ -51,8 +52,8 @@ public class JOGLNewtApplet1Run extends Applet {
GLCapabilities caps = new GLCapabilities(GLProfile.get(glProfileName));
Display nDisplay = NewtFactory.createDisplay(NativeWindowFactory.TYPE_AWT, null); // local display
Screen nScreen = NewtFactory.createScreen(NativeWindowFactory.TYPE_AWT, nDisplay, 0); // screen 0
- Window nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, new Object[] { container },
- nScreen, caps, true /* undecorated */);
+ nWindow = NewtFactory.createWindow(NativeWindowFactory.TYPE_AWT, new Object[] { container },
+ nScreen, caps, true /* undecorated */);
// nWindow.setPosition(x, y);
// nWindow.setSize(container.getWidth(), container.getHeight());
if(null!=nWindow) {
@@ -85,7 +86,12 @@ public class JOGLNewtApplet1Run extends Applet {
}
public void destroy() {
- base.destroy();
+ base.destroy(false); // no dispose events
+ base=null;
+ if(null!=nWindow) {
+ nWindow.destroy();
+ nWindow=null;
+ }
}
}
--
cgit v1.2.3