Fixes against JOGL a4b16ad544f3f7872f15e52d7ada7dc1e506d333

11 files changed, 20 insertions, 30 deletions

diff --git a/src/demos/GLNewtRun.java b/src/demos/GLNewtRun.java
index 72389e3..d3816cc 100755
--- a/src/demos/GLNewtRun.java
+++ b/src/demos/GLNewtRun.java
@@ -9,19 +9,11 @@ import com.jogamp.newt.*;
 import com.jogamp.newt.event.*;
 import com.jogamp.newt.opengl.*;
 
-public class GLNewtRun implements WindowListener, KeyListener, MouseListener {
+public class GLNewtRun extends WindowAdapter implements KeyListener, MouseListener {
 
     static GLWindow window;
     static volatile boolean quit = false;
 
-    public void windowResized(WindowEvent e) { }
-
-    public void windowMoved(WindowEvent e) { }
-
-    public void windowGainedFocus(WindowEvent e) { }
-
-    public void windowLostFocus(WindowEvent e) { }
-
     public void windowDestroyNotify(WindowEvent e) {
         quit = true;
     }
diff --git a/src/demos/applets/JOGLNewtApplet1Run.java b/src/demos/applets/JOGLNewtApplet1Run.java
index 9496155..0490120 100755
--- a/src/demos/applets/JOGLNewtApplet1Run.java
+++ b/src/demos/applets/JOGLNewtApplet1Run.java
@@ -43,7 +43,6 @@ public class JOGLNewtApplet1Run extends Applet {
         }
         base = new JOGLNewtAppletBase(glEventListenerClazzName, 
                                       glSwapInterval,
-                                      false /* pumpMessages == handleWindowEvents */,
                                       glDebug,
                                       glTrace);
 
diff --git a/src/demos/applets/JOGLNewtAppletBase.java b/src/demos/applets/JOGLNewtAppletBase.java
index a8cb160..4b7377d 100755
--- a/src/demos/applets/JOGLNewtAppletBase.java
+++ b/src/demos/applets/JOGLNewtAppletBase.java
@@ -12,10 +12,9 @@ import com.jogamp.opengl.util.*;
 /** Shows how to deploy an applet using JOGL. This demo must be
     referenced from a web page via an <applet> tag. */
 
-public class JOGLNewtAppletBase implements WindowListener, KeyListener, MouseListener, GLEventListener {
+public class JOGLNewtAppletBase extends WindowAdapter implements KeyListener, MouseListener, GLEventListener {
     String glEventListenerClazzName;
     int glSwapInterval;
-    boolean handleWindowEvents;
     boolean glDebug;
     boolean glTrace;
 
@@ -26,13 +25,11 @@ public class JOGLNewtAppletBase implements WindowListener, KeyListener, MouseLis
 
     public JOGLNewtAppletBase(String glEventListenerClazzName, 
                               int glSwapInterval,
-                              boolean handleWindowEvents,
                               boolean glDebug,
                               boolean glTrace) {
     
         this.glEventListenerClazzName=glEventListenerClazzName;
         this.glSwapInterval=glSwapInterval;
-        this.handleWindowEvents=handleWindowEvents;
         this.glDebug = glDebug;
         this.glTrace = glTrace;
     }
@@ -126,7 +123,6 @@ public class JOGLNewtAppletBase implements WindowListener, KeyListener, MouseLis
             }
             glWindow.addKeyListener(this);
 
-            glWindow.setRunPumpMessages(handleWindowEvents);
             glWindow.enablePerfLog(true);
 
             // glAnimator = new FPSAnimator(canvas, 60);
@@ -200,21 +196,6 @@ public class JOGLNewtAppletBase implements WindowListener, KeyListener, MouseLis
     // ***********************************************************************************
     // ***********************************************************************************
 
-    public void windowResized(WindowEvent e) {
-    }
-
-    public void windowMoved(WindowEvent e) {
-    }
-
-    public void windowDestroyNotify(WindowEvent e) {
-    }
-    public void windowGainedFocus(WindowEvent e) { }
-    public void windowLostFocus(WindowEvent e) { }
-
-    // ***********************************************************************************
-    // ***********************************************************************************
-    // ***********************************************************************************
-
     public void keyPressed(KeyEvent e) { 
         System.out.println(e);
     }
diff --git a/src/demos/es1/RedSquare.java b/src/demos/es1/RedSquare.java
index 3b6168a..5bf3d60 100755
--- a/src/demos/es1/RedSquare.java
+++ b/src/demos/es1/RedSquare.java
@@ -38,6 +38,9 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
         this.type=type;
     }
 
+    public void windowRepaint(WindowUpdateEvent e) {
+    }
+
     public void windowResized(WindowEvent e) {
     }
 
diff --git a/src/demos/es1/angeles/Main.java b/src/demos/es1/angeles/Main.java
index 0ad882b..7853ee3 100755
--- a/src/demos/es1/angeles/Main.java
+++ b/src/demos/es1/angeles/Main.java
@@ -11,6 +11,7 @@ public class Main implements WindowListener, MouseListener {
     public boolean quit = false;
     public GLWindow window = null;
 
+    public void windowRepaint(WindowUpdateEvent e) { }
     public void windowResized(WindowEvent e) { }
     public void windowMoved(WindowEvent e) { }
     public void windowGainedFocus(WindowEvent e) { }
diff --git a/src/demos/es1/cubefbo/Main.java b/src/demos/es1/cubefbo/Main.java
index 8951d0c..7efec18 100755
--- a/src/demos/es1/cubefbo/Main.java
+++ b/src/demos/es1/cubefbo/Main.java
@@ -11,6 +11,7 @@ public class Main implements WindowListener, MouseListener {
     public boolean quit = false;
     public GLWindow window = null;
 
+    public void windowRepaint(WindowUpdateEvent e) { }
     public void windowResized(WindowEvent e) { }
     public void windowMoved(WindowEvent e) { }
     public void windowGainedFocus(WindowEvent e) { }
diff --git a/src/demos/es2/RedSquare.java b/src/demos/es2/RedSquare.java
index 980697d..af3567d 100755
--- a/src/demos/es2/RedSquare.java
+++ b/src/demos/es2/RedSquare.java
@@ -31,6 +31,8 @@ public class RedSquare extends Thread implements WindowListener, KeyListener, Mo
         this.type=type;
     }
 
+    public void windowRepaint(WindowUpdateEvent e) { }
+
     public void windowResized(WindowEvent e) { }
 
     public void windowMoved(WindowEvent e) { }
diff --git a/src/demos/newt/NEWTTest1.java b/src/demos/newt/NEWTTest1.java
index 1a2f757..bcfff5a 100644
--- a/src/demos/newt/NEWTTest1.java
+++ b/src/demos/newt/NEWTTest1.java
@@ -16,6 +16,10 @@ public class NEWTTest1 implements WindowListener, KeyListener, MouseListener
         new NEWTTest1().run();
     }
 
+    public void windowRepaint(WindowUpdateEvent e) { 
+        System.err.println("windowRepaint "+e);
+    }
+
     public void windowResized(WindowEvent e) {
         System.err.println("windowResized "+e);
     }
diff --git a/src/demos/newt/TaskManagerTest1.java b/src/demos/newt/TaskManagerTest1.java
index 4fcc6a5..6a8f8e5 100644
--- a/src/demos/newt/TaskManagerTest1.java
+++ b/src/demos/newt/TaskManagerTest1.java
@@ -29,6 +29,9 @@ public class TaskManagerTest1  implements WindowListener, KeyListener, MouseList
     Window window;
     Display display;
 
+    public void windowRepaint(WindowUpdateEvent e) { 
+        System.err.println("windowRepaint "+e);
+    }
     public void windowResized(WindowEvent e) {
         System.err.println("windowResized "+e);
     }
diff --git a/src/demos/newt/TaskManagerTest2.java b/src/demos/newt/TaskManagerTest2.java
index 93f61f1..35c707c 100644
--- a/src/demos/newt/TaskManagerTest2.java
+++ b/src/demos/newt/TaskManagerTest2.java
@@ -12,6 +12,9 @@ public class TaskManagerTest2  implements WindowListener, KeyListener, MouseList
         new TaskManagerTest2().run();
     }
 
+    public void windowRepaint(WindowUpdateEvent e) { 
+        System.err.println("windowRepaint "+e);
+    }
     public void windowResized(WindowEvent e) {
         System.err.println("windowResized "+e);
     }
diff --git a/src/demos/readbuffer/Main.java b/src/demos/readbuffer/Main.java
index 2311ace..bf4ddde 100755
--- a/src/demos/readbuffer/Main.java
+++ b/src/demos/readbuffer/Main.java
@@ -18,6 +18,7 @@ public class Main implements WindowListener, MouseListener, SurfaceUpdatedListen
         }
     }
 
+    public void windowRepaint(WindowUpdateEvent e) { }
     public void windowResized(WindowEvent e) { }
     public void windowMoved(WindowEvent e) { }
     public void windowGainedFocus(WindowEvent e) { }