PatchSet 6499
Date: 2005/05/15 13:06:43
Author: robilad
Branch: HEAD
Tag: (none)
Log:
resynced with gnu classpath: awt fix
2005-05-15 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath.
2005-04-30 Robert Schuster <[EMAIL PROTECTED]>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
(window_delete_cb): Made the function return TRUE.
Members:
ChangeLog:1.4024->1.4025
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.16->1.17
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4024 kaffe/ChangeLog:1.4025
--- kaffe/ChangeLog:1.4024 Sun May 15 13:04:52 2005
+++ kaffe/ChangeLog Sun May 15 13:06:43 2005
@@ -4,6 +4,15 @@
2005-04-30 Robert Schuster <[EMAIL PROTECTED]>
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
+ (window_delete_cb): Made the function return TRUE.
+
+2005-05-15 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
+ 2005-04-30 Robert Schuster <[EMAIL PROTECTED]>
+
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: Fixed
copyright header.
Index:
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
diff -u
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.16
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.17
---
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.16
Sun May 15 13:04:54 2005
+++
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
Sun May 15 13:06:46 2005
@@ -56,7 +56,7 @@
XEvent *xevent,
XPointer arg);
-static void window_delete_cb (GtkWidget *widget, GdkEvent *event,
+static gboolean window_delete_cb (GtkWidget *widget, GdkEvent *event,
jobject peer);
static void window_destroy_cb (GtkWidget *widget, GdkEvent *event,
jobject peer);
@@ -465,7 +465,7 @@
return False;
}
-static void
+static gboolean
window_delete_cb (GtkWidget *widget __attribute__((unused)),
GdkEvent *event __attribute__((unused)),
jobject peer)
@@ -476,6 +476,12 @@
(jint) AWT_WINDOW_CLOSING,
(jobject) NULL, (jint) 0);
gdk_threads_enter ();
+
+ // Prevents that the Window dissappears ("destroy"
+ // not being signalled). This is necessary because it
+ // should be up to a WindowListener implementation
+ // how the AWT Frame responds to close requests.
+ return TRUE;
}
static void
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
