Revision: 4063
          http://vexi.svn.sourceforge.net/vexi/?rev=4063&view=rev
Author:   clrg
Date:     2011-03-23 12:46:18 +0000 (Wed, 23 Mar 2011)

Log Message:
-----------
Fix clean up of *Listener assignments

Modified Paths:
--------------
    trunk/org.vexi-core.main/src/main/java/org/vexi/plat/Swing.java

Modified: trunk/org.vexi-core.main/src/main/java/org/vexi/plat/Swing.java
===================================================================
--- trunk/org.vexi-core.main/src/main/java/org/vexi/plat/Swing.java     
2011-03-23 10:26:38 UTC (rev 4062)
+++ trunk/org.vexi-core.main/src/main/java/org/vexi/plat/Swing.java     
2011-03-23 12:46:18 UTC (rev 4063)
@@ -93,6 +93,7 @@
     
     //////// Platform Implementation //////////////////////////////////
     
+    protected Font.Glyph _createGlyph(Font f, char c) { return new 
SwingGlyph(f, c); }
     protected PixelBuffer _createPixelBuffer(int w, int h, Surface owner) {
         SwingPixelBuffer buf = new SwingPixelBuffer(w, h);
         checkImageIsReady(buf.i);
@@ -103,7 +104,6 @@
 
     // Inner Classes 
/////////////////////////////////////////////////////////////////////////////////////
 
-    protected Font.Glyph _createGlyph(Font f, char c) { return new 
SwingGlyph(f, c); }
     protected static class SwingGlyph extends AWTGlyph {
         private BufferedImage i2 = null;
         int lastcolor = 0;
@@ -151,7 +151,7 @@
     
     protected static class SwingSurface extends 
Surface.DoubleBufferedSurfaceNoBlit
         implements MouseListener, MouseMotionListener, MouseWheelListener, 
KeyListener, ComponentListener, WindowListener, WindowStateListener {
-        
+
         public Picture toPicture() { return new 
AWTPicture(((SwingPixelBuffer)backbuffer).i); }
         private Object buffersync = new Object();
 
@@ -579,10 +579,11 @@
         public void _dispose() {
             panel.removeMouseListener(this);
             panel.removeMouseWheelListener(this);
-            panel.removeKeyListener(this);
             panel.removeComponentListener(this);
             panel.removeMouseMotionListener(this);
+            window.removeKeyListener(this);
             window.removeWindowListener(this);
+            window.removeWindowStateListener(this);
             window.dispose();
         }
 


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

------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software 
be a part of the solution? Download the Intel(R) Manageability Checker 
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn

Reply via email to