This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[gui][PATCH] fixes for compiler warnings
- From: Thomas Fitzsimmons <fitzsim at redhat dot com>
- To: java-patches at gcc dot gnu dot org
- Date: Fri, 07 May 2004 18:41:31 -0400
- Subject: [gui][PATCH] fixes for compiler warnings
Hi,
I committed the attached patch to java-gui-branch.
It fixes a bunch of compiler warnings that crept into the peers.
Tom
2004-05-07 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java
(gtkWidgetDispatchKeyEvent): Remove keyChar parameter.
(handleEvent): Remove keyChar argument to
gtkWidgetDispatchKeyEvent calls.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Fix
compiler warnings.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c:
Likewise.
Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.16.2.6
diff -u -r1.16.2.6 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java 7 May 2004 00:18:03 -0000 1.16.2.6
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java 7 May 2004 22:36:51 -0000
@@ -95,7 +95,7 @@
native void gtkWidgetSetForeground (int red, int green, int blue);
native protected void gtkWidgetRequestFocus ();
native void gtkWidgetDispatchKeyEvent (int id, long when, int mods,
- int keyCode, char keyChar, int keyLocation);
+ int keyCode, int keyLocation);
native void gtkSetFont (String name, int style, int size);
native void gtkWidgetQueueDrawArea(int x, int y, int width, int height);
native void addExposeFilter();
@@ -264,12 +264,12 @@
case KeyEvent.KEY_PRESSED:
ke = (KeyEvent) event;
gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiers (),
- ke.getKeyCode (), ke.getKeyChar (), ke.getKeyLocation ());
+ ke.getKeyCode (), ke.getKeyLocation ());
break;
case KeyEvent.KEY_RELEASED:
ke = (KeyEvent) event;
gtkWidgetDispatchKeyEvent (ke.getID (), ke.getWhen (), ke.getModifiers (),
- ke.getKeyCode (), ke.getKeyChar (), ke.getKeyLocation ());
+ ke.getKeyCode (), ke.getKeyLocation ());
break;
}
}
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v
retrieving revision 1.15.2.7
diff -u -r1.15.2.7 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c 7 May 2004 00:18:04 -0000 1.15.2.7
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c 7 May 2004 22:36:51 -0000
@@ -509,16 +509,13 @@
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetDispatchKeyEvent
(JNIEnv *env, jobject obj, jint id, jlong when, jint mods,
- jint keyCode, jchar keyChar, jint keyLocation)
+ jint keyCode, jint keyLocation)
{
void *ptr;
GdkEvent *event = NULL;
- GdkEventKey *keyevent = NULL;
GdkKeymapKey *keymap_keys = NULL;
gint n_keys = 0;
- gint level = 0;
guint lookup_keyval = 0;
- GdkModifierType consumed_modifiers;
ptr = NSA_GET_PTR (env, obj);
@@ -599,9 +596,7 @@
event->key.state,
event->key.group,
&event->key.keyval,
- &event->key.group,
- &level,
- &consumed_modifiers))
+ NULL, NULL, NULL))
{
/* No matching keyval was found. */
g_printerr ("No matching keyval was found\n");
@@ -1304,9 +1299,10 @@
return bg_color_widget;
}
-static gboolean focus_in_cb (GtkWidget *widget,
- GdkEventFocus *event,
- jobject peer)
+static gboolean
+focus_in_cb (GtkWidget *widget __attribute((unused)),
+ GdkEventFocus *event __attribute((unused)),
+ jobject peer)
{
(*gdk_env)->CallVoidMethod (gdk_env, peer,
postFocusEventID,
@@ -1315,9 +1311,10 @@
return FALSE;
}
-static gboolean focus_out_cb (GtkWidget *widget,
- GdkEventFocus *event,
- jobject peer)
+static gboolean
+focus_out_cb (GtkWidget *widget __attribute((unused)),
+ GdkEventFocus *event __attribute((unused)),
+ jobject peer)
{
(*gdk_env)->CallVoidMethod (gdk_env, peer,
postFocusEventID,
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,v
retrieving revision 1.19.2.5
diff -u -r1.19.2.5 gnu_java_awt_peer_gtk_GtkEvents.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c 7 May 2004 00:18:04 -0000 1.19.2.5
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c 7 May 2004 22:36:51 -0000
@@ -806,6 +806,7 @@
}
}
+#if 0
/* Checks if keyval triggers a KEY_TYPED event on the source widget.
This function identifies special keyvals that don't trigger
GtkIMContext "commit" signals, but that do trigger Java KEY_TYPED
@@ -830,6 +831,7 @@
|| (keyval == GDK_Tab
&& GTK_IS_TEXT_VIEW(source))) ? 1 : 0;
}
+#endif
void
awt_event_handler (GdkEvent *event)
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,v
retrieving revision 1.4.8.1
diff -u -r1.4.8.1 gnu_java_awt_peer_gtk_GtkMenuPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c 26 Mar 2004 17:06:35 -0000 1.4.8.1
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c 7 May 2004 22:36:51 -0000
@@ -129,7 +129,7 @@
(JNIEnv *env, jobject obj, jobject menuitempeer, jint key, jboolean shift)
{
void *ptr1, *ptr2;
- GtkMenu *menu;
+ GtkWidget *menu;
ptr1 = NSA_GET_PTR (env, obj);
ptr2 = NSA_GET_PTR (env, menuitempeer);
@@ -142,7 +142,7 @@
if (key)
{
gtk_widget_add_accelerator (GTK_WIDGET (ptr2), "activate",
- gtk_menu_get_accel_group (menu), key,
+ gtk_menu_get_accel_group (GTK_MENU (menu)), key,
(GDK_CONTROL_MASK
| ((shift) ? GDK_SHIFT_MASK : 0)),
GTK_ACCEL_VISIBLE);
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,v
retrieving revision 1.11.8.1
diff -u -r1.11.8.1 gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c 6 May 2004 23:29:42 -0000 1.11.8.1
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c 7 May 2004 22:36:51 -0000
@@ -40,10 +40,6 @@
#include "gnu_java_awt_peer_gtk_GtkComponentPeer.h"
#include "gnu_java_awt_peer_gtk_GtkTextComponentPeer.h"
-static void textcomponent_commit_cb (GtkIMContext *context,
- const gchar *str,
- jobject peer);
-
static void textcomponent_changed_cb (GtkEditable *editable,
jobject peer);
@@ -471,28 +467,6 @@
gdk_threads_leave ();
(*env)->ReleaseStringUTFChars (env, contents, str);
-}
-
-static void
-textcomponent_commit_cb (GtkIMContext *context __attribute__((unused)),
- const gchar *str,
- jobject peer)
-{
- /* str is a \0-terminated UTF-8 encoded character. */
- gunichar2 *jc = g_utf8_to_utf16 (str, -1, NULL, NULL, NULL);
- GdkEvent *event = gtk_get_current_event ();
-
- if (jc)
- (*gdk_env)->CallVoidMethod (gdk_env, peer,
- postKeyEventID,
- (jint) AWT_KEY_TYPED,
- (jlong) event->key.time,
- keyevent_state_to_awt_mods (event),
- VK_UNDEFINED,
- (jchar) jc[0],
- AWT_KEY_LOCATION_UNKNOWN);
- g_free (jc);
- gdk_event_free (event);
}
static void