FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GtkComponentPeer.java (requestFocus): Implement by calling gtkRequestFocus.

Browse source 
2004-06-01  Mark Wielaard  <mark@klomp.org>

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java (requestFocus):
	Implement by calling gtkRequestFocus.
	(gtkRequestFocus): New native method.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus__):
	Renamed to ...
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkRequestFocus):
	New function name.
	(filter_expose_event_handler):
	Mark static.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
	(menu_pos): Mark static.

From-SVN: r82517
This commit is contained in:
Mark Wielaard 2004-05-31 23:03:01 +00:00 • committed by Michael Koch
parent e17b3578a3
commit 1900c4c6bf
4 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libjava/ChangeLog
View file

@ -1,3 +1,18 @@
2004-06-01 Mark Wielaard <mark@klomp.org>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java (requestFocus):
Implement by calling gtkRequestFocus.
(gtkRequestFocus): New native method.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus__):
Renamed to ...
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkRequestFocus):
New function name.
(filter_expose_event_handler):
Mark static.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
(menu_pos): Mark static.
2004-06-01 Michael Koch <konqueror@gmx.de>
* java/text/CollationElementIterator.java,

8
libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java
View file

@ -353,10 +353,14 @@ public class GtkComponentPeer extends GtkGenericPeer
public void requestFocus ()
{
gtkWidgetRequestFocus ();
postFocusEvent (FocusEvent.FOCUS_GAINED, false);
gtkRequestFocus();
}
// 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);

4
libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
View file

@ -472,7 +472,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor
}
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetRequestFocus
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkRequestFocus
(JNIEnv *env, jobject obj)
{
void *ptr;
@ -1056,7 +1056,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_O
(*env)->ReleaseStringUTFChars (env, jname, name);
}
gboolean
static gboolean
filter_expose_event_handler (GtkWidget *widget, GdkEvent *event, jobject peer)
{
/*

7
libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
View file

@ -39,15 +39,13 @@ exception statement from your version. */
#include "gtkpeer.h"
#include "gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h"
void menu_pos (GtkMenu *, gint *, gint *, gboolean *, gpointer);
struct pos
{
gint x;
gint y;
};
void
static void
menu_pos (GtkMenu *menu __attribute__((unused)),
gint *x, gint *y,
gboolean *push_in,
@ -93,7 +91,8 @@ Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup
gdk_threads_enter ();
menu = GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu);
gtk_menu_set_accel_group (menu, gtk_accel_group_new ());
/* FIXME: update this to use GTK-2.4 GtkActions. */
/* FIXME: _gtk_accel_group_attach is a GTK-private function, so
we'll need a different approach here: */
#if 0
_gtk_accel_group_attach (gtk_menu_get_accel_group (menu),
G_OBJECT (gtk_widget_get_toplevel (ptr2)));