diff options
| author | kho <kho@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-19 14:08:19 +0000 |
|---|---|---|
| committer | kho <kho@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-19 14:08:19 +0000 |
| commit | 4910bd8d8f04c3e09cf872c0b50f3fa34c8a503b (patch) | |
| tree | f1cd8309ab52979658c58aa7e37303c0d92b463d /libjava | |
| parent | 0d4d45dc36200b0b221e9d26211f28fbe36cebd0 (diff) | |
| download | ppe42-gcc-4910bd8d8f04c3e09cf872c0b50f3fa34c8a503b.tar.gz ppe42-gcc-4910bd8d8f04c3e09cf872c0b50f3fa34c8a503b.zip | |
2004-01-16 Kim Ho <kho@redhat.com>
* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
(gtkWidgetGetDimensions): Remove.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(gtkWidgetGetDimensions): Remove.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@76148 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java | 1 | ||||
| -rw-r--r-- | libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c | 27 |
3 files changed, 7 insertions, 28 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7b4dca8db29..77031646aee 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2004-01-16 Kim Ho <kho@redhat.com> + + * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java + (gtkWidgetGetDimensions): Remove. + * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c + (gtkWidgetGetDimensions): Remove. + 2004-01-16 Tom Tromey <tromey@redhat.com> * java/awt/Container.java: Typo and indentation fixes. diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java index 95f0dde50b7..0e36439d16c 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java @@ -63,7 +63,6 @@ public class GtkFileDialogPeer extends GtkDialogPeer implements FileDialogPeer native void connectJObject (); native void connectSignals (); native void nativeSetFile (String file); - native void gtkWidgetGetDimensions (int[] dims); public void setFile (String fileName) { diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c index d2509abfab2..677f1532a12 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c @@ -400,33 +400,6 @@ Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight 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) |
