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

        * gnu/java/awt/peer/gtk/GtkFramePeer.java
        (gtkLayoutSetVisible): New method
        (setMenuBar): Hide layout before setting MenuBar
        and reshow it after.
        * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
        (gtkLayoutSetVisible): Hide or show the Gtk Layout.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@76861 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 5 insertions, 0 deletions

diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java
index 83516d1b640..c542b63ad31 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java
@@ -60,6 +60,7 @@ public class GtkFramePeer extends GtkWindowPeer
   native void setMenuBarPeer (MenuBarPeer bar);
   native void removeMenuBarPeer ();
   native void moveLayout (int offset);
+  native void gtkLayoutSetVisible (boolean vis);
 
   public void setMenuBar (MenuBar bar)
   {
@@ -67,16 +68,19 @@ public class GtkFramePeer extends GtkWindowPeer
     {    
       if (menuBar != null)
       {
+        gtkLayoutSetVisible(false);
         removeMenuBarPeer(); 
         menuBar = null;
         moveLayout(menuBarHeight);
         insets.top -= menuBarHeight;
         menuBarHeight = 0;      
         awtComponent.doLayout();
+        gtkLayoutSetVisible(true);
       }
     }
     else
     {
+      gtkLayoutSetVisible(false);
       int oldHeight = 0;
       if (menuBar != null)
       {
@@ -91,6 +95,7 @@ public class GtkFramePeer extends GtkWindowPeer
         moveLayout(oldHeight - menuBarHeight);
       insets.top += menuBarHeight;
       awtComponent.doLayout();
+      gtkLayoutSetVisible(true);
     }
   }