From eb2a5f91b204eb8305fd2ca9058b7040dc5cdbf0 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Fri, 22 Aug 2003 14:34:37 +0000 Subject: GtkWindowPeer.java: Remove GTK_WINDOW_DIALOG. 2003-08-22 Thomas Fitzsimmons * gnu/java/awt/peer/gtk/GtkWindowPeer.java: Remove GTK_WINDOW_DIALOG. Set GTK_WINDOW_POPUP to 1. From-SVN: r70688 --- libjava/ChangeLog | 5 +++++ libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java | 3 +-- libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'libjava') diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 80151e3..161c2d3 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-08-22 Thomas Fitzsimmons + + * gnu/java/awt/peer/gtk/GtkWindowPeer.java: Remove + GTK_WINDOW_DIALOG. Set GTK_WINDOW_POPUP to 1. + 2003-08-21 David Daney 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 21ec020..08c1777 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 9a8cc32..95c2bd0 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 (); } -- cgit v1.1