diff options
Diffstat (limited to 'libjava/classpath/native/jni/gtk-peer')
6 files changed, 25 insertions, 20 deletions
diff --git a/libjava/classpath/native/jni/gtk-peer/GtkDragSourceContextPeer.c b/libjava/classpath/native/jni/gtk-peer/GtkDragSourceContextPeer.c index aee61bd..b8f1ba5 100644 --- a/libjava/classpath/native/jni/gtk-peer/GtkDragSourceContextPeer.c +++ b/libjava/classpath/native/jni/gtk-peer/GtkDragSourceContextPeer.c @@ -99,9 +99,8 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_create JNIEXPORT void JNICALL Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeSetCursor - (JNIEnv *env, jobject obj, jint type) + (JNIEnv *env __attribute__((unused)), jobject obj, jint type) { - void *ptr; GdkWindow *win; GdkCursorType gdk_cursor_type; GdkCursor *gdk_cursor; @@ -109,7 +108,6 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeSetCursor gdk_threads_enter (); javaObj = obj; - ptr = gtkpeer_get_global_ref (env, obj); switch (type) { @@ -230,10 +228,9 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_connectSignals } static void -connect_signals_for_widget (GtkWidget *w) +connect_signals_for_widget (GtkWidget *w __attribute__((unused))) { /* FIXME: Not implemented. */ - w = NULL; } JNIEXPORT void JNICALL @@ -257,7 +254,6 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeStartDrag (JNIEnv *env, jobject obj, jobject img, jint x, jint y, jint act, jstring target) { - void *ptr; const gchar *data; GtkTargetEntry tar[1]; GdkEvent *event; @@ -268,7 +264,6 @@ Java_gnu_java_awt_dnd_peer_gtk_GtkDragSourceContextPeer_nativeStartDrag gdk_threads_enter (); javaObj = obj; - ptr = gtkpeer_get_global_ref (env, obj); data = (*env)->GetStringUTFChars (env, target, NULL); tar[0].target = (gchar *) data; diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c index 3364640..31bab77 100644 --- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c +++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c @@ -121,7 +121,6 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState { GdkDrawable *drawable; GtkWidget *widget; - int width, height; cairo_t *cr; void *ptr; @@ -136,9 +135,6 @@ Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState drawable = widget->window; g_assert (drawable != NULL); - width = widget->allocation.width; - height = widget->allocation.height; - cr = gdk_cairo_create(drawable); g_assert(cr != NULL); diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c index 4240f11..ea9c1d6 100644 --- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c +++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c @@ -120,6 +120,8 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mouseMove result = XTestFakeMotionEvent (xdisplay, -1, x, y, CurrentTime); + if (result) + g_warning("XTestFakeMotionEvent returned %d\n", result); XFlush (xdisplay); @@ -153,6 +155,8 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mousePress result = XTestFakeButtonEvent (xdisplay, awt_button_mask_to_num (buttons), True, CurrentTime); + if (result) + g_warning("XTestFakeButtonEvent returned %d\n", result); XFlush (xdisplay); @@ -185,6 +189,8 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_mouseRelease result = XTestFakeButtonEvent (xdisplay, awt_button_mask_to_num (buttons), False, CurrentTime); + if (result) + g_warning("XTestFakeButtonEvent returned %d\n", result); XFlush (xdisplay); @@ -275,7 +281,7 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyPress &n_keys)) { /* No matching keymap entry was found. */ - g_printerr ("No matching keymap entries were found\n"); + g_message ("No matching keymap entries were found\n"); gdk_threads_leave (); return; } @@ -287,6 +293,8 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyPress result = XTestFakeKeyEvent (xdisplay, keymap_keys[0].keycode, True, CurrentTime); + if (result) + g_warning("XTestFakeKeyEvent returned %d\n", result); g_free (keymap_keys); @@ -330,7 +338,7 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyRelease &n_keys)) { /* No matching keymap entry was found. */ - g_printerr ("No matching keymap entries were found\n"); + g_message ("No matching keymap entries were found\n"); gdk_threads_leave (); return; } @@ -342,6 +350,8 @@ Java_gnu_java_awt_peer_gtk_GdkRobotPeer_keyRelease result = XTestFakeKeyEvent (xdisplay, keymap_keys[0].keycode, False, CurrentTime); + if (result) + g_warning("XTestFakeKeyEvent returned %d\n", result); g_free (keymap_keys); diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c index b7b1c33..0511c05 100644 --- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c +++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c @@ -83,20 +83,25 @@ Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup - (JNIEnv *env, jobject obj, jobject parent) + (JNIEnv *env, jobject obj, jobject parent __attribute__((unused))) { - void *ptr1, *ptr2; + void *ptr1; GtkMenu *menu; +#if 0 + void *ptr2; +#endif gdk_threads_enter (); ptr1 = gtkpeer_get_widget (env, obj); - ptr2 = gtkpeer_get_widget (env, parent); menu = GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu); gtk_menu_set_accel_group (menu, gtk_accel_group_new ()); /* FIXME: update this to use GTK-2.4 GtkActions. */ + // FIXME: _gtk_accel_group_attach is a GTK-private function, so + // we'll need a different approach here #if 0 + ptr2 = gtkpeer_get_widget (env, parent); _gtk_accel_group_attach (gtk_menu_get_accel_group (menu), G_OBJECT (gtk_widget_get_toplevel (ptr2))); #endif diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c index b209797..ad99664 100644 --- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c +++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c @@ -1,6 +1,6 @@ /* gtktoolkit.c -- Native portion of GtkToolkit - Copyright (C) 1998, 1999, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2005, 2007, 2010 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -216,6 +216,7 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_gtkInit (JNIEnv *env, init_dpi_conversion_factor (); gtktoolkit = (*env)->FindClass(env, "gnu/java/awt/peer/gtk/GtkMainThread"); + gtktoolkit = (*env)->NewGlobalRef(env, gtktoolkit); /* bug fix #40889 */ setRunningID = (*env)->GetStaticMethodID (env, gtktoolkit, "setRunning", "(Z)V"); } diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c index 50197ca..af0868cc 100644 --- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c +++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c @@ -110,7 +110,7 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels GdkPixmap *pixmap; GdkPixbuf *pixbuf; jintArray jpixels; - int width, height, depth, size; + int width, height, size; jclass cls; jfieldID field; guchar *pixels; @@ -129,8 +129,6 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels gdk_threads_enter(); - /* get depth in bytes */ - depth = gdk_drawable_get_depth( pixmap ) >> 3; size = width * height; jpixels = (*env)->NewIntArray ( env, size ); jpixdata = (*env)->GetIntArrayElements (env, jpixels, NULL); |