aboutsummaryrefslogtreecommitdiff
path: root/libjava/gnu
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2004-06-03 10:23:12 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2004-06-03 10:23:12 +0000
commit53ef271f84dcf405c5e58ea7b1ef2211f073d3c1 (patch)
treee1ae2760d85c02bed796d0a6bc2c43aee4cc9470 /libjava/gnu
parent5607edfd0812ffe8cd63d1ba6f18df8474fa7b75 (diff)
downloadgcc-53ef271f84dcf405c5e58ea7b1ef2211f073d3c1.zip
gcc-53ef271f84dcf405c5e58ea7b1ef2211f073d3c1.tar.gz
gcc-53ef271f84dcf405c5e58ea7b1ef2211f073d3c1.tar.bz2
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
Diffstat (limited to 'libjava/gnu')
-rw-r--r--libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java
index 15d3d5c..7d80e362 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java
@@ -353,14 +353,10 @@ public class GtkComponentPeer extends GtkGenericPeer
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);