aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Fitzsimmons <fitzsim@redhat.com>2003-07-27 20:01:00 +0000
committerThomas Fitzsimmons <fitzsim@gcc.gnu.org>2003-07-27 20:01:00 +0000
commitf17163688b81896920ad917e224a27f4007e9360 (patch)
tree062d6098eaa5cea4095e52031f95fe20f96e1264
parentb528910ddd20beff184e5051471ed6759af2a4cf (diff)
downloadgcc-f17163688b81896920ad917e224a27f4007e9360.zip
gcc-f17163688b81896920ad917e224a27f4007e9360.tar.gz
gcc-f17163688b81896920ad917e224a27f4007e9360.tar.bz2
gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c: Create vbox and layout for GtkPlug.
2003-07-27 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c: Create vbox and layout for GtkPlug. From-SVN: r69861
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c15
2 files changed, 17 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 38eee70..76e330c 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 c4613a9..ca42247 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 ();
}