Commit 53ef271f by Michael Koch Committed by Michael Koch

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.

From-SVN: r82596
parent 5607edfd
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.
2004-06-02 Olga Rodimina <rodimina@redhat.com> 2004-06-02 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JCheckBoxMenuItem.java: * javax/swing/JCheckBoxMenuItem.java:
......
...@@ -353,14 +353,10 @@ public class GtkComponentPeer extends GtkGenericPeer ...@@ -353,14 +353,10 @@ public class GtkComponentPeer extends GtkGenericPeer
public void requestFocus () 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) public void reshape (int x, int y, int width, int height)
{ {
setBounds (x, y, width, height); setBounds (x, y, width, height);
......
...@@ -472,7 +472,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor ...@@ -472,7 +472,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor
} }
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkRequestFocus Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetRequestFocus
(JNIEnv *env, jobject obj) (JNIEnv *env, jobject obj)
{ {
void *ptr; void *ptr;
......
...@@ -91,8 +91,7 @@ Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup ...@@ -91,8 +91,7 @@ Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup
gdk_threads_enter (); gdk_threads_enter ();
menu = GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu); menu = GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu);
gtk_menu_set_accel_group (menu, gtk_accel_group_new ()); gtk_menu_set_accel_group (menu, gtk_accel_group_new ());
/* FIXME: _gtk_accel_group_attach is a GTK-private function, so /* FIXME: update this to use GTK-2.4 GtkActions. */
we'll need a different approach here: */
#if 0 #if 0
_gtk_accel_group_attach (gtk_menu_get_accel_group (menu), _gtk_accel_group_attach (gtk_menu_get_accel_group (menu),
G_OBJECT (gtk_widget_get_toplevel (ptr2))); G_OBJECT (gtk_widget_get_toplevel (ptr2)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment