FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2004-01-27 Kim Ho <kho@redhat.com>

Browse source 
* 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
This commit is contained in:
Kim Ho 2004-01-27 19:29:57 +00:00 • committed by Kim Ho
parent 69a4504000
commit e300e74f17
10 changed files with 139 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java
View file

@ -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;
}

6
libjava/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
View file

@ -47,8 +47,6 @@ public class GtkMenuComponentPeer extends GtkGenericPeer
{
super (awtWidget);
}
public void dispose ()
{
}
public native void dispose();
}