From ddebab8b709bd4a3d5d770243d77e423e962f188 Mon Sep 17 00:00:00 2001 From: fitzsim Date: Thu, 30 Oct 2003 01:49:39 +0000 Subject: [PATCH] 2003-10-29 Thomas Fitzsimmons * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (getSize): Return scrolled window's size request. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73075 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d91fa18..629fd8f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-10-29 Thomas Fitzsimmons + + * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (getSize): Return + scrolled window's size request. + 2003-10-29 Sascha Brawer * java/awt/geom/CubicCurve2D.java (contains): Docfix for URL of embedded drawing. diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c index 944bc21..6c37aeb 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c @@ -228,7 +228,6 @@ Java_gnu_java_awt_peer_gtk_GtkListPeer_deselect gdk_threads_leave (); } -/* FIXME: magic mojo (that doesn't seem to do anything) */ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize (JNIEnv *env, jobject obj, jint rows, jintArray jdims) @@ -251,7 +250,7 @@ Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize list = GTK_WIDGET (CLIST_FROM_SW (ptr)); sw = GTK_SCROLLED_WINDOW (ptr); - gtk_widget_size_request(list, &myreq); + gtk_widget_size_request(GTK_WIDGET(sw), &myreq); dims[1]=myreq.height; dims[0]=myreq.width; -- 2.7.4