From 55e7bb5cc5290004556654cd1a4b310229835883 Mon Sep 17 00:00:00 2001 From: kho Date: Tue, 27 Jan 2004 19:29:57 +0000 Subject: 2004-01-27 Kim Ho * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@76740 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java') diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java index 6bc1ca94d29..8fd96b45a57 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; } -- cgit v1.2.3