Patch: gtk peer - partly revert of last patch.

[Michael Koch <konqueror at gmx dot de>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi list,


I just commited the attached patch to partly revert the last patch to 
the gtk peer as commented by Mark Wielaard.


Michael


2004-06-03  Michael Koch  <konqueror@gmx.de>

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java
	(requestFocus): Revert last changes.
	(gtkRequestFocus): Removed.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkRequestFocus):
	Renamed to ...
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetRequestFocus):
	Reverted last patch.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup):
	Reverted comment change.
- -- 
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAvvyUWSOgCCdjSDsRAjYaAKCPV46hDLHqqymqX0PiwAog1f61VQCgkdP2
SX+wlKALF5RYWWK1yEZnAvg=
=ox93
-----END PGP SIGNATURE-----

Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.19
diff -u -b -B -r1.19 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java	31 May 2004 23:03:00 -0000	1.19
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java	3 Jun 2004 10:21:41 -0000
@@ -353,14 +353,10 @@
 
   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) 
   {
     setBounds (x, y, width, height);
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v
retrieving revision 1.23
diff -u -b -B -r1.23 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	31 May 2004 23:03:00 -0000	1.23
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	3 Jun 2004 10:21:42 -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: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,v
retrieving revision 1.7
diff -u -b -B -r1.7 gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c	31 May 2004 23:03:01 -0000	1.7
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c	3 Jun 2004 10:21:42 -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)));