diff options
| author | fnasser <fnasser@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-16 17:20:34 +0000 |
|---|---|---|
| committer | fnasser <fnasser@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-12-16 17:20:34 +0000 |
| commit | 9f5bf17faa51ee2f10a9d3c784036a21607276fb (patch) | |
| tree | 6034aeefd69ceb462af48daa185e9018d9cc0812 /libjava | |
| parent | 4fed8deb3b7ab6f1dea839d6ba57b042355e7e83 (diff) | |
| download | ppe42-gcc-9f5bf17faa51ee2f10a9d3c784036a21607276fb.tar.gz ppe42-gcc-9f5bf17faa51ee2f10a9d3c784036a21607276fb.zip | |
2003-12-16 Fernando Nasser <fnasser@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(pre_event_handler): Handle GtkButton widgets differently as events
go to its event_window.
(connect_awt_hook): Remove compiler warning.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74704 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 05d0fb89382..0e17095c202 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-12-16 Fernando Nasser <fnasser@redhat.com> + + * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c + (pre_event_handler): Handle GtkButton widgets differently as events + go to its event_window. + (connect_awt_hook): Remove compiler warning. + i2003-12-16 Guilhem Lavaux <guilhem@kaffe.org> * java/io/ObjectInputStream.java diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c index 75eeaf7ce14..b158e62c52d 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c @@ -1064,6 +1064,10 @@ pre_event_handler (GtkWidget *widget, GdkEvent *event, jobject peer) { obj_window = gtk_widget_get_parent (window->focus_widget)->window; } + else if (GTK_IS_BUTTON (window->focus_widget)) + /* GtkButton events go to the "event_window" and this is what + we registered when the button was created. */ + obj_window = GTK_BUTTON (window->focus_widget)->event_window; else obj_window = window->focus_widget->window; @@ -1164,7 +1168,7 @@ connect_awt_hook (JNIEnv *env, jobject peer_obj, int nwindows, ...) { va_list ap; jobject *obj; -void *ptr = NSA_GET_PTR (env, peer_obj); + //void *ptr = NSA_GET_PTR (env, peer_obj); obj = NSA_GET_GLOBAL_REF (env, peer_obj); //g_print("Connection obj %s\n", gtk_widget_get_name (GTK_WIDGET (ptr))); |
