Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.63
diff -u -b -B -r1.63 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java	31 May 2004 21:11:40 -0000	1.63
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java	3 Jun 2004 13:28:02 -0000
@@ -353,13 +353,9 @@
 
   public void requestFocus ()
   {
-    gtkRequestFocus();
+    gtkWidgetRequestFocus();
+    postFocusEvent(FocusEvent.FOCUS_GAINED, false);
   }
-
-  // Called from requestFocus, we don't want to make requestFocus itself
-  // native since several JNI header generators have difficulties with
-  // overridden and/or miranda methods. (Bug in gcjh < 3.5.)
-  native private void gtkRequestFocus ();
 
   public void reshape (int x, int y, int width, int height) 
   {
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v
retrieving revision 1.29
diff -u -b -B -r1.29 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	31 May 2004 21:12:12 -0000	1.29
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	3 Jun 2004 13:28:02 -0000
@@ -472,7 +472,7 @@
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkRequestFocus
+Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetRequestFocus
   (JNIEnv *env, jobject obj)
 {
   void *ptr;
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,v
retrieving revision 1.10
diff -u -b -B -r1.10 gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c	28 May 2004 17:28:06 -0000	1.10
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c	3 Jun 2004 13:28:02 -0000
@@ -91,8 +91,7 @@
   gdk_threads_enter ();
   menu = GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu);
   gtk_menu_set_accel_group (menu, gtk_accel_group_new ());
-  /* FIXME: _gtk_accel_group_attach is a GTK-private function, so
-     we'll need a different approach here: */
+  /* FIXME: update this to use GTK-2.4 GtkActions. */
 #if 0
   _gtk_accel_group_attach (gtk_menu_get_accel_group (menu),
 			   G_OBJECT (gtk_widget_get_toplevel (ptr2)));