Index: include/gnu_java_awt_peer_gtk_GdkFontMetrics.h =================================================================== RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GdkFontMetrics.h,v retrieving revision 1.3 diff -u -r1.3 gnu_java_awt_peer_gtk_GdkFontMetrics.h --- include/gnu_java_awt_peer_gtk_GdkFontMetrics.h 2 Dec 2003 09:33:49 -0000 1.3 +++ include/gnu_java_awt_peer_gtk_GdkFontMetrics.h 30 Apr 2004 11:03:50 -0000 @@ -11,7 +11,7 @@ #endif extern JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState (JNIEnv *env, jobject, jstring, jint); -extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth__Ljava_lang_String_2ILjava_lang_String_2 (JNIEnv *env, jobject, jstring, jint, jstring); +extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth (JNIEnv *env, jobject, jstring, jint, jstring); #ifdef __cplusplus } Index: include/gnu_java_awt_peer_gtk_GdkGraphics.h =================================================================== RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GdkGraphics.h,v retrieving revision 1.3 diff -u -r1.3 gnu_java_awt_peer_gtk_GdkGraphics.h --- include/gnu_java_awt_peer_gtk_GdkGraphics.h 19 Mar 2004 21:25:56 -0000 1.3 +++ include/gnu_java_awt_peer_gtk_GdkGraphics.h 30 Apr 2004 11:03:50 -0000 @@ -27,7 +27,7 @@ extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawPolyline (JNIEnv *env, jobject, jintArray, jintArray, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawRect (JNIEnv *env, jobject, jint, jint, jint, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillRect (JNIEnv *env, jobject, jint, jint, jint, jint); -extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString__Ljava_lang_String_2IILjava_lang_String_2II (JNIEnv *env, jobject, jstring, jint, jint, jstring, jint, jint); +extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString (JNIEnv *env, jobject, jstring, jint, jint, jstring, jint, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setClipRectangle (JNIEnv *env, jobject, jint, jint, jint, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setFGColor (JNIEnv *env, jobject, jint, jint, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setFunction (JNIEnv *env, jobject, jint); Index: include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h =================================================================== RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h,v retrieving revision 1.1 diff -u -r1.1 gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h --- include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h 12 Feb 2004 16:53:09 -0000 1.1 +++ include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h 30 Apr 2004 11:03:50 -0000 @@ -10,7 +10,7 @@ { #endif -extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create__J (JNIEnv *env, jobject, jlong); +extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create (JNIEnv *env, jobject, jlong); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct (JNIEnv *env, jobject, jlong); #ifdef __cplusplus Index: include/gnu_java_awt_peer_gtk_GtkLabelPeer.h =================================================================== RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h,v retrieving revision 1.4 diff -u -r1.4 gnu_java_awt_peer_gtk_GtkLabelPeer.h --- include/gnu_java_awt_peer_gtk_GtkLabelPeer.h 19 Mar 2004 21:25:56 -0000 1.4 +++ include/gnu_java_awt_peer_gtk_GtkLabelPeer.h 30 Apr 2004 11:03:50 -0000 @@ -10,7 +10,7 @@ { #endif -extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_create__Ljava_lang_String_2F (JNIEnv *env, jobject, jstring, jfloat); +extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_create (JNIEnv *env, jobject, jstring, jfloat); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_nativeSetAlignment (JNIEnv *env, jobject, jfloat); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText (JNIEnv *env, jobject, jstring); Index: include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h =================================================================== RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h,v retrieving revision 1.2 diff -u -r1.2 gnu_java_awt_peer_gtk_GtkMenuBarPeer.h --- include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h 30 Jul 2003 16:47:19 -0000 1.2 +++ include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h 30 Apr 2004 11:03:50 -0000 @@ -11,7 +11,7 @@ #endif extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_create (JNIEnv *env, jobject); -extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu__Ljava_awt_peer_MenuPeer_2 (JNIEnv *env, jobject, jobject); +extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu (JNIEnv *env, jobject, jobject); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_delMenu (JNIEnv *env, jobject, jint); #ifdef __cplusplus Index: include/gnu_java_awt_peer_gtk_GtkMenuPeer.h =================================================================== RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkMenuPeer.h,v retrieving revision 1.2 diff -u -r1.2 gnu_java_awt_peer_gtk_GtkMenuPeer.h --- include/gnu_java_awt_peer_gtk_GtkMenuPeer.h 30 Jul 2003 16:47:19 -0000 1.2 +++ include/gnu_java_awt_peer_gtk_GtkMenuPeer.h 30 Apr 2004 11:03:50 -0000 @@ -11,7 +11,7 @@ #endif extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create (JNIEnv *env, jobject, jstring); -extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addItem__Ljava_awt_peer_MenuItemPeer_2IZ (JNIEnv *env, jobject, jobject, jint, jboolean); +extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addItem (JNIEnv *env, jobject, jobject, jint, jboolean); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_setupAccelGroup (JNIEnv *env, jobject, jobject); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_delItem (JNIEnv *env, jobject, jint); Index: include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h =================================================================== RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h,v retrieving revision 1.2 diff -u -r1.2 gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h --- include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h 30 Jul 2003 16:47:19 -0000 1.2 +++ include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h 30 Apr 2004 11:03:50 -0000 @@ -11,7 +11,7 @@ #endif extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup (JNIEnv *env, jobject, jobject); -extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show__IIJ (JNIEnv *env, jobject, jint, jint, jlong); +extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show (JNIEnv *env, jobject, jint, jint, jlong); #ifdef __cplusplus } Index: include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h =================================================================== RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h,v retrieving revision 1.3 diff -u -r1.3 gnu_java_awt_peer_gtk_GtkScrollPanePeer.h --- include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h 7 Jan 2004 02:23:37 -0000 1.3 +++ include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h 30 Apr 2004 11:03:50 -0000 @@ -10,7 +10,7 @@ { #endif -extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create__II (JNIEnv *env, jobject, jint, jint); +extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create (JNIEnv *env, jobject, jint, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetScrollPosition (JNIEnv *env, jobject, jint, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetHScrollIncrement (JNIEnv *env, jobject, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetVScrollIncrement (JNIEnv *env, jobject, jint); Index: include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h =================================================================== RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h,v retrieving revision 1.3 diff -u -r1.3 gnu_java_awt_peer_gtk_GtkScrollbarPeer.h --- include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h 7 Jan 2004 02:23:37 -0000 1.3 +++ include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h 30 Apr 2004 11:03:50 -0000 @@ -10,7 +10,7 @@ { #endif -extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create__IIIIIII (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint, jint); +extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectJObject (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setLineIncrement (JNIEnv *env, jobject, jint); Index: include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h =================================================================== RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h,v retrieving revision 1.6 diff -u -r1.6 gnu_java_awt_peer_gtk_GtkTextAreaPeer.h --- include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h 13 Jan 2004 22:37:28 -0000 1.6 +++ include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h 30 Apr 2004 11:03:50 -0000 @@ -10,7 +10,7 @@ { #endif -extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create__III (JNIEnv *env, jobject, jint, jint, jint); +extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create (JNIEnv *env, jobject, jint, jint, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_insert (JNIEnv *env, jobject, jstring, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_replaceRange (JNIEnv *env, jobject, jstring, jint, jint); Index: include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h =================================================================== RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h,v retrieving revision 1.6 diff -u -r1.6 gnu_java_awt_peer_gtk_GtkTextFieldPeer.h --- include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h 20 Jan 2004 21:33:35 -0000 1.6 +++ include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h 30 Apr 2004 11:03:50 -0000 @@ -10,7 +10,7 @@ { #endif -extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_create__I (JNIEnv *env, jobject, jint); +extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_create (JNIEnv *env, jobject, jint); extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetBorderWidth (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_setEchoChar (JNIEnv *env, jobject, jchar); Index: include/gnu_java_awt_peer_gtk_GtkWindowPeer.h =================================================================== RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h,v retrieving revision 1.8 diff -u -r1.8 gnu_java_awt_peer_gtk_GtkWindowPeer.h --- include/gnu_java_awt_peer_gtk_GtkWindowPeer.h 13 Jan 2004 22:29:35 -0000 1.8 +++ include/gnu_java_awt_peer_gtk_GtkWindowPeer.h 30 Apr 2004 11:03:50 -0000 @@ -10,7 +10,7 @@ { #endif -extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create__IZIILgnu_java_awt_peer_gtk_GtkWindowPeer_2_3I (JNIEnv *env, jobject, jint, jboolean, jint, jint, jobject, jintArray); +extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create (JNIEnv *env, jobject, jint, jboolean, jint, jint, jobject, jintArray); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectJObject (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals (JNIEnv *env, jobject); extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toBack (JNIEnv *env, jobject); Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,v retrieving revision 1.6 diff -u -r1.6 gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c --- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c 29 Mar 2004 07:07:26 -0000 1.6 +++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c 30 Apr 2004 11:03:51 -0000 @@ -37,7 +37,7 @@ #include "gtkpeer.h" -#include "gnu_java_awt_peer_gtk_GtkMenuItemPeer.h" +#include "gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h" JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer_create Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,v retrieving revision 1.11 diff -u -r1.11 gnu_java_awt_peer_gtk_GtkCheckboxPeer.c --- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c 7 Apr 2004 20:28:53 -0000 1.11 +++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c 30 Apr 2004 11:03:51 -0000 @@ -42,40 +42,6 @@ static void item_toggled (GtkToggleButton *item, jobject peer); -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer_dispose - (JNIEnv *env, jobject obj) -{ - /* The actual underlying widget is owned by a different class. So - we just clean up the hash table here. */ - NSA_DEL_PTR (env, obj); -} - -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer_remove - (JNIEnv *env, jobject obj, jobject checkbox) -{ - GtkRadioButton *button; - void *ptr; - GSList *list; - - ptr = NSA_GET_PTR (env, checkbox); - gdk_threads_enter (); - button = GTK_RADIO_BUTTON (ptr); - - /* Update the group to point to some other widget in the group. We - have to do this because Gtk doesn't have a separate object to - represent a radio button's group. */ - for (list = gtk_radio_button_group (button); list != NULL; - list = list->next) - { - if (list->data != button) - break; - } - - gdk_threads_leave (); - - NSA_SET_PTR (env, obj, list ? list->data : NULL); -} - JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeCreate (JNIEnv *env, jobject obj, jobject group, jboolean state) Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v retrieving revision 1.25 diff -u -r1.25 gnu_java_awt_peer_gtk_GtkComponentPeer.c --- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c 17 Apr 2004 23:24:47 -0000 1.25 +++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c 30 Apr 2004 11:03:51 -0000 @@ -43,24 +43,6 @@ static GtkWidget *find_fg_color_widget (GtkWidget *widget); static GtkWidget *find_bg_color_widget (GtkWidget *widget); -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkGenericPeer_dispose - (JNIEnv *env, jobject obj) -{ - void *ptr; - - /* Remove entries from state tables */ - NSA_DEL_GLOBAL_REF (env, obj); - ptr = NSA_DEL_PTR (env, obj); - - gdk_threads_enter (); - - /* For now the native state for any object must be a widget. - However, a subclass could override dispose() if required. */ - gtk_widget_destroy (GTK_WIDGET (ptr)); - - gdk_threads_leave (); -} - JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor (JNIEnv *env, jobject obj, jint type) @@ -128,18 +110,6 @@ gdk_threads_leave (); } -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus - (JNIEnv *env, jobject obj) -{ - void *ptr; - - ptr = NSA_GET_PTR (env, obj); - - gdk_threads_enter (); - /* XXX gtk_widget_grab_focus (GTK_WIDGET (ptr)); */ - gdk_threads_leave (); -} - /* * Find the origin of a widget's window. */ @@ -232,19 +202,6 @@ gdk_threads_leave (); (*env)->ReleaseIntArrayElements (env, jdims, dims, 0); -} - -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetUsize (JNIEnv *env, - jobject obj, jint w, jint h) -{ - void *ptr; - - ptr = NSA_GET_PTR (env, obj); - - gdk_threads_enter (); - gtk_widget_set_usize (GTK_WIDGET (ptr), w, h); - gdk_threads_leave (); } JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v retrieving revision 1.26 diff -u -r1.26 gnu_java_awt_peer_gtk_GtkWindowPeer.c --- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c 29 Mar 2004 07:07:27 -0000 1.26 +++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c 30 Apr 2004 11:03:51 -0000 @@ -284,28 +284,6 @@ } /* - * Set a frame's title - */ - -JNIEXPORT void JNICALL -Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setTitle - (JNIEnv *env, jobject obj, jstring title) -{ - void *ptr; - const char *str; - - ptr = NSA_GET_PTR (env, obj); - - str = (*env)->GetStringUTFChars (env, title, NULL); - - gdk_threads_enter (); - gtk_window_set_title (GTK_WINDOW (ptr), str); - gdk_threads_leave (); - - (*env)->ReleaseStringUTFChars (env, title, str); -} - -/* * Lower the z-level of a window. */ Index: native/jni/gtk-peer/gthread-jni.c =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gthread-jni.c,v retrieving revision 1.10 diff -u -r1.10 gthread-jni.c --- native/jni/gtk-peer/gthread-jni.c 9 Apr 2004 17:35:56 -0000 1.10 +++ native/jni/gtk-peer/gthread-jni.c 30 Apr 2004 11:03:51 -0000 @@ -505,7 +505,3 @@ NULL }; -/* ??? */ -void gdk_threads_wake () { - -} Index: native/jni/java-io/javaio.h =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/java-io/javaio.h,v retrieving revision 1.4 diff -u -r1.4 javaio.h --- native/jni/java-io/javaio.h 29 Mar 2004 07:07:27 -0000 1.4 +++ native/jni/java-io/javaio.h 30 Apr 2004 11:03:51 -0000 @@ -48,6 +48,8 @@ extern jlong _javaio_get_file_length(JNIEnv *, jint); extern jlong _javaio_skip_bytes(JNIEnv *, jint, jlong); extern jint _javaio_open(JNIEnv *, jstring, int); +extern jint _javaio_open_read(JNIEnv *, jstring); +extern jint _javaio_open_readwrite(JNIEnv *, jstring); extern void _javaio_close(JNIEnv *, jint fd); extern jint _javaio_read(JNIEnv *, jobject obj, jint, jarray, jint, jint); extern jint _javaio_write(JNIEnv *, jobject obj, jint, jarray, jint, jint); Index: native/jni/java-lang/java_lang_VMDouble.c =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/java_lang_VMDouble.c,v retrieving revision 1.3 diff -u -r1.3 java_lang_VMDouble.c --- native/jni/java-lang/java_lang_VMDouble.c 29 Mar 2004 07:07:27 -0000 1.3 +++ native/jni/java-lang/java_lang_VMDouble.c 30 Apr 2004 11:03:51 -0000 @@ -39,6 +39,7 @@ #include #include "java_lang_Double.h" +#include "java_lang_VMDouble.h" /* * Class: java_lang_VMDouble Index: native/jni/java-lang/java_lang_reflect_Array.c =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/java_lang_reflect_Array.c,v retrieving revision 1.4 diff -u -r1.4 java_lang_reflect_Array.c --- native/jni/java-lang/java_lang_reflect_Array.c 29 Mar 2004 07:07:27 -0000 1.4 +++ native/jni/java-lang/java_lang_reflect_Array.c 30 Apr 2004 11:03:51 -0000 @@ -1,5 +1,5 @@ /* java.lang.reflect.Array native functions - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -41,18 +41,10 @@ * Version: 1.1.0 * Date: 2 Jun 1998 */ + #include -#include "java_lang_reflect_Array.h" -/* - * Class: java_lang_reflect_Array - * Method: getLength - * Signature: (Ljava/lang/Object;)I - */ -JNIEXPORT jint JNICALL Java_java_lang_reflect_Array_getLength - (JNIEnv * env, jclass thisClass, jobject arr) { - return (*env)->GetArrayLength(env, arr); -} +#include "java_lang_reflect_Array.h" /* * Class: java_lang_reflect_Array Index: native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c,v retrieving revision 1.8 diff -u -r1.8 gnu_java_nio_channels_FileChannelImpl.c --- native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c 29 Apr 2004 16:46:44 -0000 1.8 +++ native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c 30 Apr 2004 11:03:51 -0000 @@ -279,30 +279,6 @@ return file_size; } -/*************************************************************************/ -/* - * Return the length of the file - * Exception on error - */ -JNIEXPORT jlong JNICALL -Java_java_io_FileDescriptor_nativeGetLength(JNIEnv *env, jobject obj, jlong fd) -{ - int native_fd; - jlong file_size; - int result; - - native_fd = get_native_fd(env, obj); - - TARGET_NATIVE_FILE_SIZE(native_fd, file_size, result); - if (result != TARGET_NATIVE_OK) - { - JCL_ThrowException(env, IO_EXCEPTION, - TARGET_NATIVE_LAST_ERROR_STRING()); - return TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1; - } - - return file_size; -} /* * Return the current position of the file pointer