From 7f9896b027d76fefd90f45e98c40ab521ec36f6b Mon Sep 17 00:00:00 2001 From: fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Sun, 27 Jul 2003 20:01:00 +0000 Subject: [PATCH] 2003-07-27 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c: Create vbox and layout for GtkPlug. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69861 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ .../gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 38eee7084c2f..76e330cf3806 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-07-27 Thomas Fitzsimmons <fitzsim@redhat.com> + + * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c: + Create vbox and layout for GtkPlug. + 2003-07-27 Michael Koch <konqueror@gmx.de> * java/awt/Window.java diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c index c4613a99f917..ca4224733fd2 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c @@ -40,17 +40,26 @@ exception statement from your version. */ #include "gtkpeer.h" #include "gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h" -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create +JNIEXPORT void JNICALL +Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create (JNIEnv *env, jobject obj) { gpointer window; + GtkWidget *vbox, *layout; gdk_threads_enter (); /* Create an "unplugged" GtkPlug. */ window = gtk_plug_new (0); + vbox = gtk_vbox_new (0, 0); + layout = gtk_layout_new (NULL, NULL); + gtk_box_pack_end (GTK_BOX (vbox), layout, 1, 1, 0); + gtk_container_add (GTK_CONTAINER (window), vbox); + + gtk_widget_show (layout); + gtk_widget_show (vbox); + gdk_threads_leave (); NSA_SET_PTR (env, obj, window); @@ -67,6 +76,6 @@ Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct gdk_threads_enter (); gtk_plug_construct (GTK_PLUG (ptr), window_id); - + gdk_threads_leave (); } -- GitLab