diff options
| author | Roman Kennke <roman@kennke.org> | 2006-10-18 16:19:54 +0000 |
|---|---|---|
| committer | Roman Kennke <roman@kennke.org> | 2006-10-18 16:19:54 +0000 |
| commit | 82cd3501505c224e893dd9a9c437e9a3141e87f4 (patch) | |
| tree | e83e734f48782e636d04b72bcf7ca594cbd19203 | |
| parent | 5d708154d3befd62e270ec6b11369d6600606f1b (diff) | |
| download | classpath-82cd3501505c224e893dd9a9c437e9a3141e87f4.tar.gz | |
2006-10-18 Roman Kennke <kennke@aicas.com>
PR 29502
* gnu/java/awt/peer/gtk/GtkWindowPeer.java
(updateComponent): Don't override this here.
* java/awt/Window.java
(addWindowListener): Ignore null listener. Set newEventsOnly flag.
(addWindowFocusListener): Ignore null listener. Set newEventsOnly
flag.
(addWindowStateListener): Ignore null listener. Set newEventsOnly
flag.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | gnu/java/awt/peer/gtk/GtkWindowPeer.java | 7 | ||||
| -rw-r--r-- | java/awt/Window.java | 20 |
3 files changed, 29 insertions, 10 deletions
@@ -1,5 +1,17 @@ 2006-10-18 Roman Kennke <kennke@aicas.com> + PR 29502 + * gnu/java/awt/peer/gtk/GtkWindowPeer.java + (updateComponent): Don't override this here. + * java/awt/Window.java + (addWindowListener): Ignore null listener. Set newEventsOnly flag. + (addWindowFocusListener): Ignore null listener. Set newEventsOnly + flag. + (addWindowStateListener): Ignore null listener. Set newEventsOnly + flag. + +2006-10-18 Roman Kennke <kennke@aicas.com> + * javax/swing/JEditorPane.java (getStream): Try to detect and set the content type of the connection stream. diff --git a/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/gnu/java/awt/peer/gtk/GtkWindowPeer.java index 20e583aae..5118354f5 100644 --- a/gnu/java/awt/peer/gtk/GtkWindowPeer.java +++ b/gnu/java/awt/peer/gtk/GtkWindowPeer.java @@ -378,13 +378,6 @@ public class GtkWindowPeer extends GtkContainerPeer return g; } - protected void updateComponent (PaintEvent event) - { - // Do not clear anything before painting. Sun never calls - // Window.update, only Window.paint. - paintComponent(event); - } - protected void postMouseEvent(int id, long when, int mods, int x, int y, int clickCount, boolean popupTrigger) { diff --git a/java/awt/Window.java b/java/awt/Window.java index c10db7bde..d045d6f1f 100644 --- a/java/awt/Window.java +++ b/java/awt/Window.java @@ -492,7 +492,11 @@ public class Window extends Container implements Accessible */ public synchronized void addWindowListener(WindowListener listener) { - windowListener = AWTEventMulticaster.add(windowListener, listener); + if (listener != null) + { + newEventsOnly = true; + windowListener = AWTEventMulticaster.add(windowListener, listener); + } } /** @@ -549,7 +553,12 @@ public class Window extends Container implements Accessible */ public void addWindowFocusListener (WindowFocusListener wfl) { - windowFocusListener = AWTEventMulticaster.add (windowFocusListener, wfl); + if (wfl != null) + { + newEventsOnly = true; + windowFocusListener = AWTEventMulticaster.add (windowFocusListener, + wfl); + } } /** @@ -559,7 +568,12 @@ public class Window extends Container implements Accessible */ public void addWindowStateListener (WindowStateListener wsl) { - windowStateListener = AWTEventMulticaster.add (windowStateListener, wsl); + if (wsl != null) + { + newEventsOnly = true; + windowStateListener = AWTEventMulticaster.add (windowStateListener, + wsl); + } } /** |