diff options
| author | Bryce McKinlay <bryce@albatross.co.nz> | 2000-12-18 22:17:25 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2000-12-18 22:17:25 +0000 |
| commit | be36b6d0ddea7d6fab501cc44118d2d5daf750d8 (patch) | |
| tree | 00e1f43706469e55eeb3fb7de2b0bac1b9c60fc5 /libjava/java | |
| parent | 2cb5082c1ee1ed65a3afe6e1bb11f28328860d02 (diff) | |
| download | gcc-be36b6d0ddea7d6fab501cc44118d2d5daf750d8.zip gcc-be36b6d0ddea7d6fab501cc44118d2d5daf750d8.tar.gz gcc-be36b6d0ddea7d6fab501cc44118d2d5daf750d8.tar.bz2 | |
Removed additional addNotify() peer hacks.
From-SVN: r38367
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/awt/Button.java | 2 | ||||
| -rw-r--r-- | libjava/java/awt/Component.java | 6 | ||||
| -rw-r--r-- | libjava/java/awt/Label.java | 2 | ||||
| -rw-r--r-- | libjava/java/awt/Panel.java | 4 | ||||
| -rw-r--r-- | libjava/java/awt/Scrollbar.java | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/libjava/java/awt/Button.java b/libjava/java/awt/Button.java index cee3ae7..2544e9e 100644 --- a/libjava/java/awt/Button.java +++ b/libjava/java/awt/Button.java @@ -38,7 +38,7 @@ public class Button extends Component public void addNotify () { if (peer == null) - peer = (ComponentPeer) getToolkit ().createButton (this); + peer = getToolkit ().createButton (this); super.addNotify(); } diff --git a/libjava/java/awt/Component.java b/libjava/java/awt/Component.java index 3614b2b..09b7244 100644 --- a/libjava/java/awt/Component.java +++ b/libjava/java/awt/Component.java @@ -1306,8 +1306,6 @@ public abstract class Component implements ImageObserver, MenuContainer, private void processPaintEvent(PaintEvent event) { - ComponentPeer peer = getPeer(); - // Can't do graphics without peer if (peer == null) return; @@ -1319,10 +1317,10 @@ public abstract class Component implements ImageObserver, MenuContainer, switch (event.id) { case PaintEvent.PAINT: - if (peer != null) paint(gfx); + paint(gfx); break; case PaintEvent.UPDATE: - if (peer != null) update(gfx); + update(gfx); break; default: throw new IllegalArgumentException("unknown paint event"); diff --git a/libjava/java/awt/Label.java b/libjava/java/awt/Label.java index 840456d..c184dce 100644 --- a/libjava/java/awt/Label.java +++ b/libjava/java/awt/Label.java @@ -42,7 +42,7 @@ public class Label extends Component public void addNotify () { if (peer == null) - peer = (ComponentPeer) getToolkit ().createLabel (this); + peer = getToolkit ().createLabel (this); } public int getAlignment () diff --git a/libjava/java/awt/Panel.java b/libjava/java/awt/Panel.java index a6e4f3e..8719695 100644 --- a/libjava/java/awt/Panel.java +++ b/libjava/java/awt/Panel.java @@ -32,8 +32,8 @@ public class Panel extends Container public void addNotify() { - if (getPeer() == null) - peer = (ComponentPeer) getToolkit().createPanel(this); + if (peer == null) + peer = getToolkit().createPanel(this); super.addNotify(); } } diff --git a/libjava/java/awt/Scrollbar.java b/libjava/java/awt/Scrollbar.java index 2a65a81..88a8d1f 100644 --- a/libjava/java/awt/Scrollbar.java +++ b/libjava/java/awt/Scrollbar.java @@ -54,7 +54,7 @@ public class Scrollbar extends Component implements Adjustable public void addNotify () { if (peer == null) - peer = (ComponentPeer) getToolkit ().createScrollbar (this); + peer = getToolkit ().createScrollbar (this); } public int getOrientation () |