Index: ChangeLog =================================================================== RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v retrieving revision 1.2563 diff -u -r1.2563 ChangeLog --- ChangeLog 16 Jan 2004 20:05:39 -0000 1.2563 +++ ChangeLog 16 Jan 2004 21:41:58 -0000 @@ -1,4 +1,11 @@ 2004-01-16 Kim Ho + + * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java + (gtkWidgetGetDimensions): Remove. + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c + (gtkWidgetGetDimensions): Remove. + +2004-01-16 Kim Ho * gnu/java/awt/peer/gtk/GtkComponentPeer.java (GtkComponentPeer): If it is a FileDialog and has dimensions of 0 by 0, then the initial Index: gnu/java/awt/peer/gtk/GtkFileDialogPeer.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,v retrieving revision 1.5 diff -u -r1.5 GtkFileDialogPeer.java --- gnu/java/awt/peer/gtk/GtkFileDialogPeer.java 16 Jan 2004 20:05:41 -0000 1.5 +++ gnu/java/awt/peer/gtk/GtkFileDialogPeer.java 16 Jan 2004 21:41:58 -0000 @@ -63,7 +63,6 @@ native void connectJObject (); native void connectSignals (); native void nativeSetFile (String file); - native void gtkWidgetGetDimensions (int[] dims); public void setFile (String fileName) { Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c =================================================================== RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v retrieving revision 1.13 diff -u -r1.13 gnu_java_awt_peer_gtk_GtkWindowPeer.c --- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c 16 Jan 2004 20:05:41 -0000 1.13 +++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c 16 Jan 2004 21:42:04 -0000 @@ -400,33 +400,6 @@ return height; } -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_gtkWidgetGetDimensions - (JNIEnv *env, jobject obj, jintArray jdims) -{ - void *ptr; - jint *dims; - int top, left, bottom, right; - GtkRequisition req; - - ptr = NSA_GET_PTR (env, obj); - dims = (*env)->GetIntArrayElements (env, jdims, 0); - dims[0] = dims[1] = 0; - - gdk_threads_enter (); - - gtk_widget_size_request (GTK_WIDGET (ptr), &req); - - window_get_frame_extents (GTK_WIDGET (ptr), &top, &left, &bottom, &right); - - dims[0] = req.width + left + right; - dims[1] = req.height + top + bottom; - - gdk_threads_leave (); - - (*env)->ReleaseIntArrayElements (env, jdims, dims, 0); -} - static void window_get_frame_extents (GtkWidget *window, int *top, int *left, int *bottom, int *right)