[cp-patches] FYI gcj-gui AWT help menu support plus JNI header regeneration

[Mark Wielaard]

Hi,

This patch adds the AWT help menu support from the libgcj gui branch. It
also regenerates the JNI headers so the tree can be build again by
people that don't configure with --enable-regen-headers.

2004-09-23  Mark Wielaard  <address@hidden>

        * examples/gnu/classpath/examples/awt/Demo.java: Add help menu
        example.

        * include/gnu_java_awt_peer_gtk_GtkButtonPeer.h: Regenerate with gcjh
        from CVS.
        * include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h: Likewise.
        * include/gnu_java_awt_peer_gtk_GtkComponentPeer.h: Likewise.
        * include/gnu_java_awt_peer_gtk_GtkFramePeer.h: Likewise.
        * include/gnu_java_awt_peer_gtk_GtkGenericPeer.h: Likewise.
        * include/gnu_java_awt_peer_gtk_GtkLabelPeer.h: Likewise.
        * include/gnu_java_awt_peer_gtk_GtkListPeer.h: Likewise.
        * include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h: Likewise.
        * include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h: Likewise.
        * include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h: Likewise.
        * include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h: Likewise.

2004-09-23  David Jee  <address@hidden>

        PR AWT/17059
        * gnu/java/awt/peer/gtk/GtkMenuBarPeer.java
        (nativeSetHelpMenu): New native method declaration.
        (addHelpMenu): Call nativeSetHelpMenu().
        (addMenu): Remove.
        * java/awt/MenuBar.java
        (setHelpMenu): Call addNotify() on the new help menu.
        (add): Call addNotify() on the new menu.
        (addNotify): Set the help menu if one exists.
        * java/awt/peer/MenuBarPeer.java
        (addMenu): Remove.
        * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c
        (nativeSetHelpMenu): New method.

Committed,

Mark

Index: examples/gnu/classpath/examples/awt/Demo.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/examples/gnu/classpath/examples/awt/Demo.java,v
retrieving revision 1.1
diff -u -r1.1 Demo.java
--- examples/gnu/classpath/examples/awt/Demo.java       1 Aug 2004 21:31:11 
-0000       1.1
+++ examples/gnu/classpath/examples/awt/Demo.java       23 Sep 2004 22:52:15 
-0000
@@ -118,11 +118,17 @@
         });
       menu.add(quit);
       mb.add (menu);
+
       menu = new Menu("Edit", true);
       menu.add(new MenuItem("Cut"));
       menu.add(new MenuItem("Copy"));
       menu.add(new MenuItem("Paste"));
       mb.add (menu);
+
+      Menu helpMenu = new Menu("Help");
+      helpMenu.add(new MenuItem("About"));
+      mb.add(helpMenu);
+      mb.setHelpMenu(helpMenu);
       
       setMenuBar (mb);
       
Index: gnu/java/awt/peer/gtk/GtkMenuBarPeer.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,v
retrieving revision 1.7
diff -u -r1.7 GtkMenuBarPeer.java
--- gnu/java/awt/peer/gtk/GtkMenuBarPeer.java   22 Sep 2004 12:13:42 -0000      
1.7
+++ gnu/java/awt/peer/gtk/GtkMenuBarPeer.java   23 Sep 2004 22:52:15 -0000
@@ -76,10 +76,5 @@
     // nativeSetHelpMenu((MenuPeer) menu.getPeer());
   }
 
-  public void addMenu (Menu menu)
-  {
-    addMenu ((MenuPeer) menu.getPeer ());
-  }
-
   native public void delMenu (int index);
 }
Index: include/gnu_java_awt_peer_gtk_GtkButtonPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h,v
retrieving revision 1.9
diff -u -r1.9 gnu_java_awt_peer_gtk_GtkButtonPeer.h
--- include/gnu_java_awt_peer_gtk_GtkButtonPeer.h       30 Jul 2004 23:16:58 
-0000      1.9
+++ include/gnu_java_awt_peer_gtk_GtkButtonPeer.h       23 Sep 2004 22:52:15 
-0000
@@ -11,12 +11,12 @@
 #endif
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_create (JNIEnv 
*env, jobject, jstring);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectJObject 
(JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectSignals 
(JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetFont 
(JNIEnv *env, jobject, jstring, jint, jint);
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetModifyFont (JNIEnv *env, 
jobject, jstring, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetLabel 
(JNIEnv *env, jobject, jstring);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetSetForeground (JNIEnv *env, 
jobject, jint, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkActivate 
(JNIEnv *env, jobject);
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetRequestFocus (JNIEnv *env, 
jobject);
 
 #ifdef __cplusplus
 }
Index: include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h,v
retrieving revision 1.7
diff -u -r1.7 gnu_java_awt_peer_gtk_GtkCheckboxPeer.h
--- include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h     30 Jul 2004 23:16:58 
-0000      1.7
+++ include/gnu_java_awt_peer_gtk_GtkCheckboxPeer.h     23 Sep 2004 22:52:15 
-0000
@@ -13,7 +13,7 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_create 
(JNIEnv *env, jobject, jobject);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeSetCheckboxGroup (JNIEnv *env, 
jobject, jobject);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_connectSignals (JNIEnv *env, 
jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont 
(JNIEnv *env, jobject, jstring, jint, jint);
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkWidgetModifyFont (JNIEnv *env, 
jobject, jstring, jint, jint);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkButtonSetLabel (JNIEnv *env, 
jobject, jstring);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkToggleButtonSetActive (JNIEnv 
*env, jobject, jboolean);
 
Index: include/gnu_java_awt_peer_gtk_GtkComponentPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h,v
retrieving revision 1.14
diff -u -r1.14 gnu_java_awt_peer_gtk_GtkComponentPeer.h
--- include/gnu_java_awt_peer_gtk_GtkComponentPeer.h    30 Jul 2004 23:16:58 
-0000      1.14
+++ include/gnu_java_awt_peer_gtk_GtkComponentPeer.h    23 Sep 2004 22:52:15 
-0000
@@ -25,10 +25,7 @@
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetParent (JNIEnv *env, 
jobject, jobject);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetRequestFocus (JNIEnv *env, 
jobject);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetDispatchKeyEvent (JNIEnv 
*env, jobject, jint, jlong, jint, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont 
(JNIEnv *env, jobject, jstring, jint, jint);
-JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetQueueDrawArea (JNIEnv 
*env, jobject, jint, jint, jint, jint);
-JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter (JNIEnv *env, 
jobject);
-JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter (JNIEnv *env, 
jobject);
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetRepaintArea (JNIEnv *env, 
jobject, jint, jint, jint, jint);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject (JNIEnv *env, 
jobject);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (JNIEnv *env, 
jobject);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds (JNIEnv *env, 
jobject, jint, jint, jint, jint);
Index: include/gnu_java_awt_peer_gtk_GtkFramePeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkFramePeer.h,v
retrieving revision 1.8
diff -u -r1.8 gnu_java_awt_peer_gtk_GtkFramePeer.h
--- include/gnu_java_awt_peer_gtk_GtkFramePeer.h        14 Aug 2004 17:19:50 
-0000      1.8
+++ include/gnu_java_awt_peer_gtk_GtkFramePeer.h        23 Sep 2004 22:52:15 
-0000
@@ -11,10 +11,10 @@
 #endif
 
 JNIEXPORT jint JNICALL 
Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight (JNIEnv *env, jobject, 
jobject);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarWidth 
(JNIEnv *env, jobject, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarPeer 
(JNIEnv *env, jobject, jobject);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkFramePeer_removeMenuBarPeer (JNIEnv *env, 
jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_moveLayout 
(JNIEnv *env, jobject, jint);
-JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkFramePeer_gtkLayoutSetVisible (JNIEnv *env, 
jobject, jboolean);
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkFramePeer_gtkFixedSetVisible (JNIEnv *env, 
jobject, jboolean);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkFramePeer_nativeSetIconImageFromDecoder (JNIEnv 
*env, jobject, jobject);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkFramePeer_nativeSetIconImageFromData (JNIEnv 
*env, jobject, jintArray, jint, jint);
 
Index: include/gnu_java_awt_peer_gtk_GtkGenericPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkGenericPeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkGenericPeer.h
--- include/gnu_java_awt_peer_gtk_GtkGenericPeer.h      28 May 2004 17:27:53 
-0000      1.3
+++ include/gnu_java_awt_peer_gtk_GtkGenericPeer.h      23 Sep 2004 22:52:15 
-0000
@@ -11,6 +11,7 @@
 #endif
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkGenericPeer_dispose 
(JNIEnv *env, jobject);
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkGenericPeer_gtkWidgetModifyFont (JNIEnv *env, 
jobject, jstring, jint, jint);
 
 #ifdef __cplusplus
 }
Index: include/gnu_java_awt_peer_gtk_GtkLabelPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkLabelPeer.h
--- include/gnu_java_awt_peer_gtk_GtkLabelPeer.h        28 May 2004 17:27:53 
-0000      1.6
+++ include/gnu_java_awt_peer_gtk_GtkLabelPeer.h        23 Sep 2004 22:52:15 
-0000
@@ -11,7 +11,7 @@
 #endif
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_create (JNIEnv 
*env, jobject, jstring, jfloat);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont 
(JNIEnv *env, jobject, jstring, jint, jint);
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkWidgetModifyFont (JNIEnv *env, 
jobject, jstring, jint, jint);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkLabelPeer_nativeSetAlignment (JNIEnv *env, 
jobject, jfloat);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText (JNIEnv 
*env, jobject, jstring);
 
Index: include/gnu_java_awt_peer_gtk_GtkListPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkListPeer.h,v
retrieving revision 1.5
diff -u -r1.5 gnu_java_awt_peer_gtk_GtkListPeer.h
--- include/gnu_java_awt_peer_gtk_GtkListPeer.h 31 May 2004 21:11:43 -0000      
1.5
+++ include/gnu_java_awt_peer_gtk_GtkListPeer.h 23 Sep 2004 22:52:15 -0000
@@ -13,7 +13,7 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_create (JNIEnv 
*env, jobject, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_connectJObject 
(JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_connectSignals 
(JNIEnv *env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_gtkSetFont 
(JNIEnv *env, jobject, jstring, jint, jint);
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkListPeer_gtkWidgetModifyFont (JNIEnv *env, 
jobject, jstring, jint, jint);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkListPeer_gtkWidgetRequestFocus (JNIEnv *env, 
jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize (JNIEnv 
*env, jobject, jint, jint, jintArray);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_append (JNIEnv 
*env, jobject, jobjectArray);
Index: include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkMenuBarPeer.h
--- include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h      28 May 2004 17:27:53 
-0000      1.4
+++ include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h      23 Sep 2004 22:52:15 
-0000
@@ -12,6 +12,7 @@
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_create 
(JNIEnv *env, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu 
(JNIEnv *env, jobject, jobject);
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_nativeSetHelpMenu (JNIEnv *env, 
jobject, jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_delMenu 
(JNIEnv *env, jobject, jint);
 
 #ifdef __cplusplus
Index: include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h,v
retrieving revision 1.5
diff -u -r1.5 gnu_java_awt_peer_gtk_GtkMenuItemPeer.h
--- include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h     28 May 2004 17:27:53 
-0000      1.5
+++ include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h     23 Sep 2004 22:52:15 
-0000
@@ -12,6 +12,8 @@
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create 
(JNIEnv *env, jobject, jstring);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_connectSignals (JNIEnv *env, 
jobject);
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_gtkWidgetModifyFont (JNIEnv *env, 
jobject, jstring, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_setEnabled 
(JNIEnv *env, jobject, jboolean);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_setLabel 
(JNIEnv *env, jobject, jstring);
 
 #ifdef __cplusplus
Index: include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h,v
retrieving revision 1.9
diff -u -r1.9 gnu_java_awt_peer_gtk_GtkTextAreaPeer.h
--- include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h     31 May 2004 21:11:43 
-0000      1.9
+++ include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h     23 Sep 2004 22:52:15 
-0000
@@ -11,7 +11,7 @@
 #endif
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create 
(JNIEnv *env, jobject, jint, jint, jint);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkSetFont 
(JNIEnv *env, jobject, jstring, jint, jint);
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkWidgetModifyFont (JNIEnv *env, 
jobject, jstring, jint, jint);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkWidgetRequestFocus (JNIEnv *env, 
jobject);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_insert 
(JNIEnv *env, jobject, jstring, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_replaceRange 
(JNIEnv *env, jobject, jstring, jint, jint);
Index: include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h,v
retrieving revision 1.9
diff -u -r1.9 gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
--- include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h    31 Jul 2004 21:44:06 
-0000      1.9
+++ include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h    23 Sep 2004 22:52:15 
-0000
@@ -14,7 +14,7 @@
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkWidgetSetBackground (JNIEnv 
*env, jobject, jint, jint, jint);
 JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkWidgetSetForeground (JNIEnv 
*env, jobject, jint, jint, jint);
 JNIEXPORT jint JNICALL 
Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetBorderWidth (JNIEnv 
*env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkSetFont 
(JNIEnv *env, jobject, jstring, jint, jint);
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkWidgetModifyFont (JNIEnv *env, 
jobject, jstring, jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_setEchoChar 
(JNIEnv *env, jobject, jchar);
 
 #ifdef __cplusplus
Index: java/awt/MenuBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/MenuBar.java,v
retrieving revision 1.12
diff -u -r1.12 MenuBar.java
--- java/awt/MenuBar.java       22 Sep 2004 12:13:42 -0000      1.12
+++ java/awt/MenuBar.java       23 Sep 2004 22:52:15 -0000
@@ -141,11 +141,10 @@
       helpMenu.removeNotify ();
       helpMenu.parent = null;
     }
+  helpMenu = menu;
 
   if (menu.parent != null)
     menu.parent.remove (menu);
-  if (menu.parent != null)
-    menu.parent.remove (menu);
   menu.parent = this;
 
   MenuBarPeer peer = (MenuBarPeer) getPeer ();
@@ -177,8 +176,7 @@
 
   if (peer != null)
     {
-      MenuBarPeer mp = (MenuBarPeer) peer;
-      mp.addMenu (menu);
+      menu.addNotify();
     }
 
   return(menu);
@@ -282,6 +280,11 @@
     Menu mi = (Menu)e.nextElement();
     mi.addNotify();
   }
+  if (helpMenu != null)
+  {
+    helpMenu.addNotify();
+    ((MenuBarPeer) peer).addHelpMenu(helpMenu);
+  }
 }
 
 /*************************************************************************/
Index: java/awt/peer/MenuBarPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/peer/MenuBarPeer.java,v
retrieving revision 1.8
diff -u -r1.8 MenuBarPeer.java
--- java/awt/peer/MenuBarPeer.java      12 Oct 2003 13:53:39 -0000      1.8
+++ java/awt/peer/MenuBarPeer.java      23 Sep 2004 22:52:15 -0000
@@ -43,7 +43,6 @@
 public interface MenuBarPeer extends MenuComponentPeer
 {
   void addHelpMenu(Menu menu);
-  void addMenu(Menu menu);
   void delMenu(int index);
 } // interface MenuBarPeer 
 
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,v
retrieving revision 1.8
diff -u -r1.8 gnu_java_awt_peer_gtk_GtkMenuBarPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c  22 Sep 2004 
11:38:58 -0000      1.8
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c  23 Sep 2004 
22:52:15 -0000
@@ -69,6 +69,29 @@
   gdk_threads_leave ();
 }
 
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_nativeSetHelpMenu
+  (JNIEnv *env, jobject obj, jobject menupeer)
+{
+  static void *helpmenu;
+  void *mbar, *menu;
+  GList *list;
+
+  mbar = NSA_GET_PTR (env, obj);
+  menu = NSA_GET_PTR (env, menupeer);
+
+  gdk_threads_enter ();
+  if (helpmenu != NULL)
+    {
+      list = gtk_container_children (GTK_CONTAINER (mbar));
+      while (list != NULL && list->data != helpmenu)
+        list = list->next;
+      if (list != NULL && list->data == helpmenu)
+        gtk_container_remove (GTK_CONTAINER (mbar), GTK_WIDGET (list->data));
+    }
+  helpmenu = menu;
+  gdk_threads_leave ();
+}
+
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_delMenu
   (JNIEnv *env, jobject obj, jint index)
 {

signature.asc
Description: This is a digitally signed message part