diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-03 10:23:12 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-06-03 10:23:12 +0000 |
| commit | 4a86305db2c1a8ee36f492c3ec2c31c770999dd6 (patch) | |
| tree | e1ae2760d85c02bed796d0a6bc2c43aee4cc9470 /libjava/gnu/java/awt | |
| parent | 93f93279f0f0950a57397a9776fc9f2c5b4016e4 (diff) | |
| download | gcc-4a86305db2c1a8ee36f492c3ec2c31c770999dd6.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@82596 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/java/awt')
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java | 8 |
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 15d3d5c4b02..7d80e3626c9 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); |