Imported GNU Classpath gcj-import-20051117.

       * gnu/java/net/protocol/file/Connection.java: Removed, fully merged.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107153 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 7 insertions, 26 deletions

diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkDialogPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkDialogPeer.java
index f5ba3ad2c5e..3e3125a2b38 100644
--- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkDialogPeer.java
+++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkDialogPeer.java
@@ -44,10 +44,6 @@ import java.awt.Rectangle;
 import java.awt.event.PaintEvent;
 import java.awt.peer.DialogPeer;
 
-import javax.swing.JDialog;
-import javax.swing.JPopupMenu;
-import javax.swing.JToolTip;
-
 public class GtkDialogPeer extends GtkWindowPeer
   implements DialogPeer
 {
@@ -87,27 +83,9 @@ public class GtkDialogPeer extends GtkWindowPeer
   void create ()
   {
     Dialog dialog = (Dialog) awtComponent;
-    int type = GDK_WINDOW_TYPE_HINT_DIALOG;
-
-    if (dialog instanceof JDialog)
-      {
-        Class heavyWeightClass;
-        try
-          {
-            heavyWeightClass = Class.forName("javax.swing.Popup$JWindowPopup");
-          }
-        catch (ClassNotFoundException e)
-          {
-            throw new AssertionError(e);
-          }
-        
-        if (dialog.getClass() == heavyWeightClass 
-            || ((JDialog) dialog).getContentPane() instanceof JToolTip)
-          type = GDK_WINDOW_TYPE_HINT_MENU;
-      }
     
     // Create a decorated dialog window.
-    create (type, !((Dialog) awtComponent).isUndecorated ());
+    create (GDK_WINDOW_TYPE_HINT_DIALOG, !((Dialog) awtComponent).isUndecorated ());
 
     gtkWindowSetModal (dialog.isModal ());
     setTitle (dialog.getTitle ());
diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java
index c84d51037e3..57fb87f37bf 100644
--- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java
+++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java
@@ -41,7 +41,6 @@ package gnu.java.awt.peer.gtk;
 import java.awt.Component;
 import java.awt.Frame;
 import java.awt.Window;
-import java.awt.event.ComponentEvent;
 import java.awt.event.WindowEvent;
 import java.awt.peer.WindowPeer;
 
@@ -80,12 +79,16 @@ public class GtkWindowPeer extends GtkContainerPeer
 
   void create (int type, boolean decorated)
   {
+    Window window = (Window) awtComponent;
     GtkWindowPeer parent_peer = null;
     Component parent = awtComponent.getParent();
-
+    
+    if (!window.isFocusableWindow())
+      type = GDK_WINDOW_TYPE_HINT_MENU;
+    
     if (parent != null)
       parent_peer = (GtkWindowPeer) awtComponent.getParent().getPeer();
-
+    
     create (type, decorated, parent_peer);
   }