diff options
| author | Kim Ho <kho@redhat.com> | 2004-01-27 19:29:57 +0000 |
|---|---|---|
| committer | Kim Ho <kho@gcc.gnu.org> | 2004-01-27 19:29:57 +0000 |
| commit | e300e74f17fecbb6c2e81857e76ad73b90c4e0eb (patch) | |
| tree | a3afb43550d8b4af2eb0c9d58281277ebf3e398d /libjava/gnu/java/awt/peer | |
| parent | 69a45040007b26fada08e77f7b6716ced9fbe2ab (diff) | |
| download | gcc-e300e74f17fecbb6c2e81857e76ad73b90c4e0eb.zip gcc-e300e74f17fecbb6c2e81857e76ad73b90c4e0eb.tar.gz gcc-e300e74f17fecbb6c2e81857e76ad73b90c4e0eb.tar.bz2 | |
2004-01-27 Kim Ho <kho@redhat.com>
* gnu/java/awt/peer/gtk/GtkFramePeer.java
(removeMenuBarPeer): Remove MenuBarPeer argument.
* gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
(dispose): Call native method.
* java/awt/Frame.java (setMenuBar): Create and remove
MenuBar peers only if the Frame has a peer.
(addNotify): Create the MenuBar peer if one exists.
(removeNotify): Remove MenuBar peer if one exists.
* java/awt/Menu.java: Fix imports.
(addNotify): Don't use full class name.
(removeNotify): Call removeNotify on all children.
* java/awt/MenuBar.java (removeNotify): Call
removeNotify on all children.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(removeMenuBarPeer): Remove MenuBarPeer argument.
Iterate through children to find the Frame's MenuBar.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c
New file.
(dispose): Remove references to the MenuComponent.
From-SVN: r76740
Diffstat (limited to 'libjava/gnu/java/awt/peer')
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java | 6 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java index 6bc1ca9..8fd96b4 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java @@ -58,7 +58,7 @@ public class GtkFramePeer extends GtkWindowPeer native int getMenuBarHeight (MenuBarPeer bar); native void setMenuBarPeer (MenuBarPeer bar); - native void removeMenuBarPeer (MenuBarPeer bar); + native void removeMenuBarPeer (); native void moveLayout (int offset); public void setMenuBar (MenuBar bar) @@ -67,7 +67,7 @@ public class GtkFramePeer extends GtkWindowPeer { if (menuBar != null) { - removeMenuBarPeer(menuBar); + removeMenuBarPeer(); menuBar = null; moveLayout(menuBarHeight); insets.top -= menuBarHeight; @@ -80,7 +80,7 @@ public class GtkFramePeer extends GtkWindowPeer int oldHeight = 0; if (menuBar != null) { - removeMenuBarPeer(menuBar); + removeMenuBarPeer(); oldHeight = menuBarHeight; insets.top -= menuBarHeight; } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java index eeef383..92f0223 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java @@ -47,8 +47,6 @@ public class GtkMenuComponentPeer extends GtkGenericPeer { super (awtWidget); } - - public void dispose () - { - } + + public native void dispose(); } |