GtkWindowPeer.java: Remove GTK_WINDOW_DIALOG.

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.

From-SVN: r70688

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 80151e3e9e5b2d6837e74df21200cd36617460bc..161c2d38df943b3444bd1f3b7c16c7e04ba66a81 100644 (file)
--- 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 21ec02015791ce43b744b19f526f08667370978a..08c1777add3450ff6d2fac896eca5f5e2440e37f 100644 (file)
--- 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 9a8cc32efd8a6e7acd7220d6aad3372c6afd958b..95c2bd028a4e9006b9ba584f7e48845578a52131 100644 (file)
--- 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 ();
 }