Commit 9b8d7b42 by Michael Koch

[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
parent 9dc83af9
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> 2005-05-06 Roman Kennke <roman@kennke.org>
* javax/swing/text/PlainView.java * javax/swing/text/PlainView.java
......
/* gtkwindowpeer.c -- Native implementation of GtkWindowPeer /* 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. This file is part of GNU Classpath.
...@@ -56,7 +56,7 @@ static Bool property_notify_predicate (Display *display, ...@@ -56,7 +56,7 @@ static Bool property_notify_predicate (Display *display,
XEvent *xevent, XEvent *xevent,
XPointer arg); XPointer arg);
static void window_delete_cb (GtkWidget *widget, GdkEvent *event, static gboolean window_delete_cb (GtkWidget *widget, GdkEvent *event,
jobject peer); jobject peer);
static void window_destroy_cb (GtkWidget *widget, GdkEvent *event, static void window_destroy_cb (GtkWidget *widget, GdkEvent *event,
jobject peer); jobject peer);
...@@ -465,7 +465,7 @@ property_notify_predicate (Display *xdisplay __attribute__((unused)), ...@@ -465,7 +465,7 @@ property_notify_predicate (Display *xdisplay __attribute__((unused)),
return False; return False;
} }
static void static gboolean
window_delete_cb (GtkWidget *widget __attribute__((unused)), window_delete_cb (GtkWidget *widget __attribute__((unused)),
GdkEvent *event __attribute__((unused)), GdkEvent *event __attribute__((unused)),
jobject peer) jobject peer)
...@@ -476,6 +476,12 @@ window_delete_cb (GtkWidget *widget __attribute__((unused)), ...@@ -476,6 +476,12 @@ window_delete_cb (GtkWidget *widget __attribute__((unused)),
(jint) AWT_WINDOW_CLOSING, (jint) AWT_WINDOW_CLOSING,
(jobject) NULL, (jint) 0); (jobject) NULL, (jint) 0);
gdk_threads_enter (); 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 static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment