From: Thomas Fitzsimmons Date: Thu, 30 Oct 2003 01:49:39 +0000 (+0000) Subject: gnu_java_awt_peer_gtk_GtkListPeer.c (getSize): Return scrolled window's size request. X-Git-Tag: releases/gcc-3.4.0~2624 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12d104a2b9c2bcb0e85cd0289dc7616422d55753;p=thirdparty%2Fgcc.git gnu_java_awt_peer_gtk_GtkListPeer.c (getSize): Return scrolled window's size request. 2003-10-29 Thomas Fitzsimmons * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (getSize): Return scrolled window's size request. From-SVN: r73075 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d91fa185c3f2..629fd8f946d7 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 944bc2139451..6c37aeb82e2e 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;