+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.
+
2004-01-27 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractCellEditor.java: Reformated.
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c \
+jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c \
+jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c \
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c \
@GTK_CAIRO_FALSE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.lo \
@GTK_CAIRO_FALSE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.lo \
@GTK_CAIRO_FALSE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.lo \
+@GTK_CAIRO_FALSE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.lo \
@GTK_CAIRO_FALSE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.lo \
@GTK_CAIRO_FALSE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.lo \
@GTK_CAIRO_FALSE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.lo \
@GTK_CAIRO_TRUE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.lo \
@GTK_CAIRO_TRUE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.lo \
@GTK_CAIRO_TRUE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.lo \
+@GTK_CAIRO_TRUE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.lo \
@GTK_CAIRO_TRUE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.lo \
@GTK_CAIRO_TRUE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.lo \
@GTK_CAIRO_TRUE@jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.lo \
.deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.P \
.deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.P \
.deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.P \
+.deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.P \
.deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.P \
.deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.P \
.deps/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.P \
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)
{
if (menuBar != null)
{
- removeMenuBarPeer(menuBar);
+ removeMenuBarPeer();
menuBar = null;
moveLayout(menuBarHeight);
insets.top -= menuBarHeight;
int oldHeight = 0;
if (menuBar != null)
{
- removeMenuBarPeer(menuBar);
+ removeMenuBarPeer();
oldHeight = menuBarHeight;
insets.top -= menuBarHeight;
}
{
super (awtWidget);
}
-
- public void dispose ()
- {
- }
+
+ public native void dispose();
}
public synchronized void
setMenuBar(MenuBar menuBar)
{
- this.menuBar = menuBar;
- if (menuBar != null)
- menuBar.addNotify();
if (peer != null)
+ {
+ if (this.menuBar != null)
+ this.menuBar.removeNotify();
+ if (menuBar != null)
+ menuBar.addNotify();
((FramePeer) peer).setMenuBar(menuBar);
+ }
+ this.menuBar = menuBar;
}
/*************************************************************************/
public void
addNotify()
{
+ if (menuBar != null)
+ menuBar.addNotify();
if (peer == null)
peer = getToolkit ().createFrame (this);
super.addNotify();
}
+public void removeNotify()
+{
+ if (menuBar != null)
+ menuBar.removeNotify();
+ super.removeNotify();
+}
+
/*************************************************************************/
/**
import java.awt.peer.MenuPeer;
import java.io.Serializable;
import java.util.Vector;
+import java.util.Enumeration;
/**
* This class represents a pull down or tear off menu in Java's AWT.
{
if (peer == null)
peer = getToolkit().createMenu(this);
- java.util.Enumeration e = items.elements();
+ Enumeration e = items.elements();
while (e.hasMoreElements())
{
MenuItem mi = (MenuItem)e.nextElement();
public void
removeNotify()
{
+ Enumeration e = items.elements();
+ while (e.hasMoreElements())
+ {
+ MenuItem mi = (MenuItem) e.nextElement();
+ mi.removeNotify();
+ }
super.removeNotify();
}
public void
removeNotify()
{
+ Enumeration e = menus.elements();
+ while (e.hasMoreElements())
+ {
+ Menu mi = (Menu) e.nextElement();
+ mi.removeNotify();
+ }
super.removeNotify();
}
--- /dev/null
+/* gtkmenucomponentpeer.c -- Native implementation of GtkMenuComponentPeer
+ Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+#include "gtkpeer.h"
+#include "gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h"
+
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuComponentPeer_dispose
+ (JNIEnv *env, jobject obj)
+{
+ /* For MenuComponents and its subclasses, the widgets are
+ automatically destroyed by Gtk when the parent MenuBar
+ is removed from the Frame. So we avoid the widget
+ destruction in GtkGenericPeer dispose() by overriding
+ it here. */
+
+ /* However, references to the Java objects still exist in the
+ state tables, so we still have to remove those. */
+
+ NSA_DEL_GLOBAL_REF (env, obj);
+ NSA_DEL_PTR (env, obj);
+}
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GtkFramePeer_removeMenuBarPeer
- (JNIEnv *env, jobject obj, jobject menubar)
+ (JNIEnv *env, jobject obj)
{
void *wptr;
GtkWidget *box;
GtkWidget *mptr;
+ GList* children;
wptr = NSA_GET_PTR (env, obj);
- mptr = NSA_GET_PTR (env, menubar);
gdk_threads_enter ();
box = GTK_BIN (wptr)->child;
+
+ children = gtk_container_get_children (GTK_CONTAINER (box));
+
+ while (children != NULL && !GTK_IS_MENU_SHELL (children->data))
+ {
+ children = children->next;
+ }
+
+ /* If there isn't a MenuBar in this Frame's list of children
+ then we can just return. */
+ if (!GTK_IS_MENU_SHELL (children->data))
+ return;
+ else
+ mptr = children->data;
+
+ /* This will actually destroy the MenuBar. By removing it from
+ its parent, the reference count for the MenuBar widget will
+ decrement to 0. The widget will be automatically destroyed
+ by Gtk. */
gtk_container_remove (GTK_CONTAINER (box), GTK_WIDGET (mptr));
gdk_threads_leave();
projects / gcc.git / commitdiff