From 38e08e9573a51afffd1ecf0ad884731036eed278 Mon Sep 17 00:00:00 2001 From: fitzsim Date: Fri, 19 Sep 2003 19:27:59 +0000 Subject: 2003-09-19 Thomas Fitzsimmons * gnu/java/awt/peer/gtk/GtkDialogPeer.java (create()): Create a top-level GTK window. (getArgs): Add "title" property. * gnu/java/awt/peer/gtk/GtkWindowPeer.java (setResizable): Use "allow_shrink" and "allow_grow" properties. * java/awt/Dialog.java: Initialize resizable to true and change comments accordingly. Initialize visible to false in constructors. * java/awt/Frame.java (dispose): Remove method. * java/awt/Window.java (ownedWindows): New field. (Window(Window,GraphicsConfiguration)): Add a weak reference to owner's ownedWindows vector. (finalize): Remove method. (hide): Hide owned windows. (dispose): Dispose of owned windows. (getOwnedWindows): Implement. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Remove unused GtkArg code. (set(String,boolean)): Clamp gboolean parameter to g_object_set to TRUE or FALSE. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (create): Set window's size requisition. (connectHooks): Fix indentation. (setResizable): Remove function. (static setBounds): Likewise. (setBounds): Replace call to setBounds with GTK size requisition and resize calls. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71585 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.java | 3 ++- libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java | 1 + libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java | 12 +++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'libjava/gnu/java') diff --git a/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.java index b5ea4b0158f..8c0f5ee510f 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkDialogPeer.java @@ -53,7 +53,7 @@ public class GtkDialogPeer extends GtkWindowPeer void create () { - create (GTK_WINDOW_POPUP, + create (GTK_WINDOW_TOPLEVEL, awtComponent.getWidth(), awtComponent.getHeight()); } @@ -64,6 +64,7 @@ public class GtkDialogPeer extends GtkWindowPeer Dialog dialog = (Dialog) component; + args.add ("title", dialog.getTitle ()); args.add ("modal", dialog.isModal ()); args.add ("allow_shrink", dialog.isResizable ()); args.add ("allow_grow", dialog.isResizable ()); diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java index 2f598cb84da..043c08276db 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java @@ -84,6 +84,7 @@ public class GtkFramePeer extends GtkWindowPeer args.add ("allow_shrink", frame.isResizable ()); args.add ("allow_grow", frame.isResizable ()); } + public void setIconImage (Image image) { /* TODO: Waiting on Toolkit Image routines */ diff --git a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java index 7451947b7db..08b2bf67e90 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java @@ -53,7 +53,9 @@ public class GtkWindowPeer extends GtkContainerPeer void create (int type) { - create (type, awtComponent.getWidth(), awtComponent.getHeight()); + create (type, + awtComponent.getWidth(), + awtComponent.getHeight()); } void create () @@ -75,7 +77,7 @@ public class GtkWindowPeer extends GtkContainerPeer args.add ("visible", component.isVisible ()); args.add ("sensitive", component.isEnabled ()); } - + native public void toBack (); native public void toFront (); @@ -86,7 +88,11 @@ public class GtkWindowPeer extends GtkContainerPeer set ("title", title); } - native public void setResizable (boolean r); + public void setResizable (boolean resizable) + { + set ("allow_shrink", resizable); + set ("allow_grow", resizable); + } protected void postConfigureEvent (int x, int y, int width, int height, int top, int left, int bottom, int right) -- cgit v1.2.3