summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
authorfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>2003-10-30 01:49:39 +0000
committerfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>2003-10-30 01:49:39 +0000
commitddebab8b709bd4a3d5d770243d77e423e962f188 (patch)
tree61ff9f7fd9a51b4c139a8b9531b95b2ca5c85d3a /libjava
parent76cfd4f918c98f1bafc475e61c0611aab29a84ae (diff)
downloadppe42-gcc-ddebab8b709bd4a3d5d770243d77e423e962f188.tar.gz
ppe42-gcc-ddebab8b709bd4a3d5d770243d77e423e962f188.zip
2003-10-29 Thomas Fitzsimmons <fitzsim@redhat.com>
* 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
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d91fa185c3f..629fd8f946d 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-29 Thomas Fitzsimmons <fitzsim@redhat.com>
+
+ * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (getSize): Return
+ scrolled window's size request.
+
2003-10-29 Sascha Brawer <brawer@dandelis.ch>
* 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 944bc213945..6c37aeb82e2 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;
OpenPOWER on IntegriCloud