diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-22 14:34:37 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-22 14:34:37 +0000 |
| commit | 79a16c590f6ef5d89913905d74c678b6365a8556 (patch) | |
| tree | 3249686f31cda2ae8288271aaa9115f890ea6232 /libjava | |
| parent | bd4e293d6754427998e0cf56cacd086c359aa86a (diff) | |
| download | ppe42-gcc-79a16c590f6ef5d89913905d74c678b6365a8556.tar.gz ppe42-gcc-79a16c590f6ef5d89913905d74c678b6365a8556.zip | |
2003-08-22 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkWindowPeer.java: Remove
GTK_WINDOW_DIALOG. Set GTK_WINDOW_POPUP to 1.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70688 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java | 3 | ||||
| -rw-r--r-- | libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 80151e3e9e5..161c2d38df9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-08-22 Thomas Fitzsimmons <fitzsim@redhat.com> + + * gnu/java/awt/peer/gtk/GtkWindowPeer.java: Remove + GTK_WINDOW_DIALOG. Set GTK_WINDOW_POPUP to 1. + 2003-08-21 David Daney <ddaney@avtrex.com> Fix for PR libgcj/12013: diff --git a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java index 21ec0201579..08c1777add3 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java @@ -47,8 +47,7 @@ public class GtkWindowPeer extends GtkContainerPeer implements WindowPeer { static protected final int GTK_WINDOW_TOPLEVEL = 0; - static protected final int GTK_WINDOW_DIALOG = 1; - static protected final int GTK_WINDOW_POPUP = 2; + static protected final int GTK_WINDOW_POPUP = 1; native void create (int type); 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 9a8cc32efd8..95c2bd028a4 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 @@ -119,11 +119,11 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectHooks gtk_widget_realize (layout); connect_awt_hook (env, obj, 1, GTK_LAYOUT (layout)->bin_window); - - gtk_widget_realize (ptr); + + gtk_widget_realize (ptr); connect_awt_hook (env, obj, 1, GTK_WIDGET (ptr)->window); - + gdk_threads_leave (); } |
