diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-04-22 03:05:39 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-04-22 03:05:39 +0000 |
| commit | 760903c0561e31470c62567019dc4f89d46b25fc (patch) | |
| tree | 8cf49adef6ef831f4363f6d0395a5c7770fef325 /libjava/java/awt/PopupMenu.java | |
| parent | d80d2d2a5bc41e42d5670a5336fd38307eebb1d9 (diff) | |
| download | gcc-760903c0561e31470c62567019dc4f89d46b25fc.zip gcc-760903c0561e31470c62567019dc4f89d46b25fc.tar.gz gcc-760903c0561e31470c62567019dc4f89d46b25fc.tar.bz2 | |
Makefile.in: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Added Line2D.java.
* java/awt/geom/Line2D.java: Wrote.
* java/awt/Menu.java (addNotify): Wrote.
* java/awt/PopupMenu.java (addNotify): Implemented.
(show): Likewise.
* java/awt/Scrollbar.java (addNotify): Call super.addNotify.
* java/awt/List.java (addNotify): Call super.addNotify.
* java/awt/Label.java (addNotify): Call super.addNotify.
* java/awt/FileDialog.java (addNotify): Call super.addNotify.
* java/awt/Dialog.java (addNotify): Call super.addNotify.
* java/awt/Choice.java (addNotify): Call super.addNotify.
* java/awt/CheckboxMenuItem.java (addNotify): Call super.addNotify.
* java/awt/Checkbox.java (addNotify): Call super.addNotify.
* java/awt/List.java (replaceItem): Notify peer.
* java/awt/geom/Rectangle2D.java
(Float.setRect(float,float,float,float)): New method.
* java/awt/event/ContainerEvent.java (getContainer): Now returns
Container.
* java/awt/RenderingHints.java (Key): Class now public.
* java/awt/Rectangle.java (Rectangle): Now implements
Serializable.
(getPathIterator): Removed.
* java/awt/GraphicsConfiguration.java (GraphicsConfiguration): New
constructor.
* java/awt/FileDialog.java: Wrote.
* java/awt/EventQueue.java (isDispatchThread): Now public.
(invokeLater): Likewise.
* java/awt/Component.java (setCursor): Update peer.
(getFontMetrics): Use peer.
* java/awt/ComponentOrientation.java (ComponentOrientation): Class
now final.
From-SVN: r41489
Diffstat (limited to 'libjava/java/awt/PopupMenu.java')
| -rw-r--r-- | libjava/java/awt/PopupMenu.java | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/libjava/java/awt/PopupMenu.java b/libjava/java/awt/PopupMenu.java index 3be7f84..ed4f343 100644 --- a/libjava/java/awt/PopupMenu.java +++ b/libjava/java/awt/PopupMenu.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation +/* Copyright (C) 2000, 2001 Free Software Foundation This file is part of libjava. @@ -8,6 +8,8 @@ details. */ package java.awt; +import java.awt.peer.PopupMenuPeer; + /* Status: Incomplete. */ public class PopupMenu extends Menu @@ -24,14 +26,31 @@ public class PopupMenu extends Menu public void addNotify() { - // FIXME + if (peer != null) + { + // This choice of toolkit seems unsatisfying, but I'm not sure + // what else to do. + peer = Toolkit.getDefaultToolkit ().createPopupMenu (this); + } + super.addNotify (); } public void show(Component origin, int x, int y) { - // FIXME + if (! origin.isShowing () + // FIXME: or ! parent is showing -- but how? + ) + { + // This is an invalid call which we choose to ignore. + return; + } + + addNotify (); // FIXME? + Event e = new Event (origin, 0, 0, x, y, 0, 0); + PopupMenuPeer p = (PopupMenuPeer) peer; + p.show (e); } - + // Accessibility API not yet implemented. // public AccessibleContext getAccessibleContext() } |