diff options
| author | Michael Koch <mkoch@gcc.gnu.org> | 2005-05-06 06:07:01 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2005-05-06 06:07:01 +0000 |
| commit | 9b8d7b425267df5fb5fa7f257560848c0ba0c246 (patch) | |
| tree | 558d270079b6a41b946e6d34804dee81de9e0fe0 | |
| parent | 9dc83af902a99a589dfb8c05c0f16e1a5bdf812d (diff) | |
| download | gcc-9b8d7b425267df5fb5fa7f257560848c0ba0c246.zip gcc-9b8d7b425267df5fb5fa7f257560848c0ba0c246.tar.gz gcc-9b8d7b425267df5fb5fa7f257560848c0ba0c246.tar.bz2 | |
[multiple changes]
2005-05-06 Mark Wielaard <mark@klomp.org>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
(window_delete_cb): Don't use C++ style comments.
2005-05-06 Robert Schuster <thebohemian@gmx.net>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: Fixed
copyright header.
2005-05-06 Robert Schuster <thebohemian@gmx.net>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
(window_delete_cb): Made the function return TRUE.
From-SVN: r99301
| -rw-r--r-- | libjava/ChangeLog | 15 | ||||
| -rw-r--r-- | libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c | 12 |
2 files changed, 24 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e479199..d40a594 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,18 @@ +2005-05-06 Mark Wielaard <mark@klomp.org> + + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: + (window_delete_cb): Don't use C++ style comments. + +2005-05-06 Robert Schuster <thebohemian@gmx.net> + + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: Fixed + copyright header. + +2005-05-06 Robert Schuster <thebohemian@gmx.net> + + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: + (window_delete_cb): Made the function return TRUE. + 2005-05-06 Roman Kennke <roman@kennke.org> * javax/swing/text/PlainView.java diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c index 184ca56..318b13a 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c @@ -1,5 +1,5 @@ /* gtkwindowpeer.c -- Native implementation of GtkWindowPeer - Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,7 +56,7 @@ static Bool property_notify_predicate (Display *display, 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 @@ property_notify_predicate (Display *xdisplay __attribute__((unused)), return False; } -static void +static gboolean window_delete_cb (GtkWidget *widget __attribute__((unused)), GdkEvent *event __attribute__((unused)), jobject peer) @@ -476,6 +476,12 @@ window_delete_cb (GtkWidget *widget __attribute__((unused)), (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 |