diff options
| author | Kim Ho <kho@redhat.com> | 2004-01-21 20:11:08 +0000 |
|---|---|---|
| committer | Kim Ho <kho@gcc.gnu.org> | 2004-01-21 20:11:08 +0000 |
| commit | 2bd408db4b3175b662dbef38f6b8c763bcacb722 (patch) | |
| tree | d695e353631e4ed149936cf8fe64f9c31a3ec356 /libjava/gnu/java | |
| parent | 4b60eb3b4a97b0f3fb6c2659c05a870da4ecef21 (diff) | |
| download | gcc-2bd408db4b3175b662dbef38f6b8c763bcacb722.zip gcc-2bd408db4b3175b662dbef38f6b8c763bcacb722.tar.gz gcc-2bd408db4b3175b662dbef38f6b8c763bcacb722.tar.bz2 | |
GtkFramePeer.java (postConfigureEvent): Fix comments.
2004-01-21 Kim Ho <kho@redhat.com>
* gnu/java/awt/peer/gtk/GtkFramePeer.java (postConfigureEvent):
Fix comments.
(removeMenuBarPeer): Make package private.
(setMenuBarPeer): Make package private.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(menubar_resize_cb): Mark attributes unused.
(getMenuBarHeight): ditto.
From-SVN: r76299
Diffstat (limited to 'libjava/gnu/java')
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java index c91779b..6c59847 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java @@ -57,8 +57,8 @@ public class GtkFramePeer extends GtkWindowPeer private MenuBarPeer menuBar; native int getMenuBarHeight (MenuBarPeer bar); - native public void setMenuBarPeer (MenuBarPeer bar); - native public void removeMenuBarPeer (MenuBarPeer bar); + native void setMenuBarPeer (MenuBarPeer bar); + native void removeMenuBarPeer (MenuBarPeer bar); public void setMenuBar (MenuBar bar) { @@ -145,12 +145,13 @@ public class GtkFramePeer extends GtkWindowPeer protected void postConfigureEvent (int x, int y, int width, int height) { int frame_x = x - insets.left; - // Add the height of the menubar (if none, menuBarHeight is 0 and has no - // effect). To move the frame down a bit so as to still fit in the window. + // Since insets.top includes the MenuBar height, we need to add back + // the MenuBar height to the frame's y position. + // If no MenuBar exists in this frame, the MenuBar height will be 0. int frame_y = y - insets.top + menuBarHeight; int frame_width = width + insets.left + insets.right; - // Add the height of the menubar to adjust the height so it still fits in - // the window. + // Ditto as above. Since insets.top already includes the MenuBar's height, + // we need to subtract the MenuBar's height from the top inset. int frame_height = height + insets.top + insets.bottom - menuBarHeight; if (frame_x != awtComponent.getX() || frame_y != awtComponent.getY() |