diff options
| author | kho <kho@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-19 14:27:45 +0000 |
|---|---|---|
| committer | kho <kho@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-19 14:27:45 +0000 |
| commit | fea51eac929c4bc60b4e75a13ca674deec587952 (patch) | |
| tree | 34def173eca9b0823df6cf9bb1777b1bb4131cfc /libjava/java/awt/Frame.java | |
| parent | 4910bd8d8f04c3e09cf872c0b50f3fa34c8a503b (diff) | |
| download | ppe42-gcc-fea51eac929c4bc60b4e75a13ca674deec587952.tar.gz ppe42-gcc-fea51eac929c4bc60b4e75a13ca674deec587952.zip | |
2004-01-19 Kim Ho <kho@redhat.com>
* gnu/java/awt/peer/gtk/GtkFramePeer.java (getMenuBarHeight): Added
MenuBarPeer parameter.
(removeMenuBarPeer): New native method.
(setMenuBar): Call remove if menu bar is null. Adjust insets
appropriately.
(postSizeAllocateEvent): New method. Called when menu bar size is
allocated. Adjust insets and redo layout.
(GtkFramePeer): Set menu bar during frame creation.
(postConfigureEvent): Adjust position and size to accomodate
menu bar.
* java/awt/Frame.java (setMenuBar): addNotify to create menu bar.
* java/awt/Menu.java (addSeparator): Use peer's addSeparator.
(addNotify): Create the peer if it doesn't exist and call addNotify
for the menu's items.
* java/awt/MenuBar.java (addNotify): Create this menu bar's menus.
* java/awt/MenuItem.java (addNotify): Create the peer if it
doesn't exist.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(removeMenuBarPeer): New method. Remove menu bar on the current
frame.
(setMenuBarPeer): Add the menu bar to the current frame and the
callback for size-allocate events on the menu bar.
(getMenuBarHeight): Add menu bar parameter.
(menubar_resize_cb): New callback method for postSizeAllocate events.
Also: Fix indentation on last ChangeLog entry.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@76149 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/awt/Frame.java')
| -rw-r--r-- | libjava/java/awt/Frame.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libjava/java/awt/Frame.java b/libjava/java/awt/Frame.java index b6a34272449..7a5c9d98f8e 100644 --- a/libjava/java/awt/Frame.java +++ b/libjava/java/awt/Frame.java @@ -1,5 +1,5 @@ /* Frame.java -- AWT toplevel window - Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -342,6 +342,8 @@ public synchronized void setMenuBar(MenuBar menuBar) { this.menuBar = menuBar; + if (menuBar != null) + menuBar.addNotify(); if (peer != null) ((FramePeer) peer).setMenuBar(menuBar); } |
