This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: Eliminate GTK peer compiler warnings
- From: Thomas Fitzsimmons <fitzsim at redhat dot com>
- To: classpath at gnu dot org
- Cc: java-patches at gcc dot gnu dot org
- Date: Tue, 07 Oct 2003 20:36:59 -0400
- Subject: Patch: Eliminate GTK peer compiler warnings
Hello,
GCC emits many warnings when it is compiling the GTK peers. Most of the
warnings are for unused parameters which must be present to satisfy JNI
and GTK interface requirements (e.g. the JNIEnv pointer and GTK callback
parameters).
This patch flags these parameters as "unused" using GCC's __attribute__
extension. It provides a fall-back for compilers that don't support
attributes. The patch also contains fixes that eliminate all other
compiler warnings in the GTK peers.
Any objections?
Tom
2003-10-07 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkMenuItemPeer.java (setEnabled): Stub
out.
* jni/classpath/jcl.c [!__GNUC__]: Elide __attribute__.
(JCL_free): Attach "unused" attribute to env parameter.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,
jni/gtk-peer/gthread-jni.c: Attach "unused" attribute to unused
parameters.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c:
(initNativeState): Pass 0 as info argument to
gtk_selection_add_target.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:
(setVisible, gtkFixedNew, gtkFixedPut, gtkFixedMove): Remove
unused method implementations.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(awt_event_handler): Add break statement after default label.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c
(drawPixels): Remove unused variable i.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
(setEnabled): Remove method implementation.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
(accel_attach): Call _gtk_accel_group_attach with G_OBJECT
argument.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c (sr): Remove
unused function.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
(menu_pos): Assign TRUE to push_in.
(setupAccelGroup): Call _gtk_accel_group_attach with G_OBJECT
argument.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
(create): Remove unused variable layout.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (create):
Pass window_widget, rather than window, to
gtk_widget_set_size_request.
* jni/gtk-peer/gthread-jni.c (g_thread_jni_functions): Fill out
structure initialization with NULL values.
* jni/gtk-peer/gtkpeer.h [!__GNUC__]: Elide __attribute__.
Index: gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java,v
retrieving revision 1.2
diff -u -r1.2 GtkMenuItemPeer.java
--- gnu/java/awt/peer/gtk/GtkMenuItemPeer.java 13 Jul 2003 15:09:20 -0000 1.2
+++ gnu/java/awt/peer/gtk/GtkMenuItemPeer.java 7 Oct 2003 23:01:15 -0000
@@ -85,7 +85,10 @@
setEnabled (true);
}
- native public void setEnabled (boolean b);
+ public void setEnabled (boolean b)
+ {
+ // do nothing, for now.
+ }
native public void setLabel (String label);
protected void postMenuActionEvent ()
Index: jni/classpath/jcl.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/classpath/jcl.c,v
retrieving revision 1.1
diff -u -r1.1 jcl.c
--- jni/classpath/jcl.c 31 Jan 2003 17:54:14 -0000 1.1
+++ jni/classpath/jcl.c 7 Oct 2003 23:01:16 -0000
@@ -39,6 +39,10 @@
#include <jcl.h>
#include <malloc.h>
+#ifndef __GNUC__
+#define __attribute__(x) /* nothing */
+#endif
+
static char errstr[4098]; // this way the memory is pre-allocated, so that we do not have to worry if we are out of memory.
JNIEXPORT void JNICALL JCL_ThrowException(JNIEnv * env, char * className, char * errMsg) {
@@ -85,7 +89,9 @@
return(ptr);
}
-JNIEXPORT void JNICALL JCL_free(JNIEnv * env, void * p) {
+JNIEXPORT void JNICALL JCL_free(JNIEnv * env __attribute__((unused)),
+ void * p)
+{
if(p != NULL) {
free(p);
}
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GtkChoicePeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c 31 Jan 2003 17:54:14 -0000 1.1
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c 7 Oct 2003 23:01:16 -0000
@@ -177,7 +177,8 @@
static void
-item_activate (GtkItem *item, struct item_event_hook_info *ie)
+item_activate (GtkItem *item __attribute__((unused)),
+ struct item_event_hook_info *ie)
{
gdk_threads_leave ();
(*gdk_env)->CallVoidMethod (gdk_env, ie->peer_obj,
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GtkClipboard.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c 31 Jan 2003 17:54:14 -0000 1.1
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c 7 Oct 2003 23:01:16 -0000
@@ -82,7 +82,7 @@
GTK_SIGNAL_FUNC (selection_clear), NULL);
gtk_selection_add_target (clipboard, GDK_SELECTION_PRIMARY,
- GDK_TARGET_STRING, GDK_TARGET_STRING);
+ GDK_TARGET_STRING, 0);
gtk_signal_connect (GTK_OBJECT(clipboard), "selection_get",
GTK_SIGNAL_FUNC (selection_get), NULL);
@@ -91,8 +91,8 @@
}
JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkClipboard_requestStringConversion (JNIEnv *env,
- jclass clazz)
+Java_gnu_java_awt_peer_gtk_GtkClipboard_requestStringConversion
+ (JNIEnv *env __attribute__((unused)), jclass clazz __attribute__((unused)))
{
gdk_threads_enter ();
gtk_selection_convert (clipboard, GDK_SELECTION_PRIMARY,
@@ -101,8 +101,10 @@
}
void
-selection_received (GtkWidget *widget, GtkSelectionData *selection_data,
- guint time, gpointer data)
+selection_received (GtkWidget *widget __attribute__((unused)),
+ GtkSelectionData *selection_data __attribute__((unused)),
+ guint time __attribute__((unused)),
+ gpointer data __attribute__((unused)))
{
/* Check to see if retrieval succeeded */
if (selection_data->length < 0
@@ -123,11 +125,11 @@
}
void
-selection_get (GtkWidget *widget,
+selection_get (GtkWidget *widget __attribute__((unused)),
GtkSelectionData *selection_data,
- guint info,
- guint time,
- gpointer data)
+ guint info __attribute__((unused)),
+ guint time __attribute__((unused)),
+ gpointer data __attribute__((unused)))
{
jstring jstr;
const char *utf;
@@ -153,8 +155,8 @@
}
JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkClipboard_selectionGet (JNIEnv *env,
- jclass clazz)
+Java_gnu_java_awt_peer_gtk_GtkClipboard_selectionGet
+ (JNIEnv *env, jclass clazz __attribute__((unused)))
{
GdkWindow *owner;
@@ -172,7 +174,8 @@
}
gint
-selection_clear (GtkWidget *widget, GdkEventSelection *event)
+selection_clear (GtkWidget *widget __attribute__((unused)),
+ GdkEventSelection *event __attribute__((unused)))
{
(*gdk_env)->CallVoidMethod (gdk_env, cb_obj, selectionClearID);
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.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c 2 Oct 2003 18:34:56 -0000 1.6
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c 7 Oct 2003 23:01:16 -0000
@@ -133,31 +133,6 @@
gdk_threads_leave ();
}
-
-/*
- * Show a widget (NO LONGER USED)
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setVisible
- (JNIEnv *env, jobject obj, jboolean visible)
-{
- GtkWidget *widget;
- void *ptr;
-
- ptr = NSA_GET_PTR (env, obj);
-
- gdk_threads_enter ();
- widget = GTK_WIDGET (ptr);
-
- if (visible)
- gtk_widget_show (widget);
- else
- gtk_widget_hide (widget);
-
- gdk_flush ();
- gdk_threads_leave ();
-}
-
/*
* Find the origin of a widget's window.
*/
@@ -225,104 +200,6 @@
gdk_threads_leave ();
}
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkFixedNew (JNIEnv *env,
- jobject obj, jint width, jint height, jboolean visible)
-{
- GtkWidget *layout;
-
- gdk_threads_enter ();
- layout = gtk_layout_new (NULL, NULL);
- gtk_widget_realize (layout);
- connect_awt_hook (env, obj, 1, GTK_LAYOUT (layout)->bin_window);
- set_visible (layout, visible);
- gdk_threads_leave ();
-
- NSA_SET_PTR (env, obj, layout);
-}
-
-/*
- * Place a widget on the layout widget.
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkFixedPut
- (JNIEnv *env, jobject obj, jobject container, jint x, jint y)
-{
- GList *child;
- GtkWidget *fix;
- void *containerptr=NULL;
- void *objptr=NULL;
-
- /* We hawe a container which, if it is a window, will have
- this component added to its fixed. If it is a fixed, we add the
- component to it. */
-
- containerptr=NSA_GET_PTR (env, container);
- objptr=NSA_GET_PTR (env, obj);
-
- gdk_threads_enter ();
- if (GTK_IS_WINDOW(GTK_OBJECT(containerptr)))
- {
- child=gtk_container_children (GTK_CONTAINER(containerptr));
-
- while (child && !GTK_IS_FIXED(child->data))
- {
- child=g_list_next(child);
- }
-
- fix=GTK_WIDGET(child->data);
- g_list_free(child);
- }
- else
- if (GTK_IS_SCROLLED_WINDOW(GTK_OBJECT(containerptr)))
- {
- child=gtk_container_children (GTK_CONTAINER (GTK_BIN(containerptr)->child));
-
- while (child && !GTK_IS_FIXED(child->data))
- {
- child=g_list_next(child);
- }
-
- fix=GTK_WIDGET(child->data);
-
- g_list_free(child);
- }
- else
- {
- fix=GTK_WIDGET(containerptr);
- }
-
- gtk_fixed_put(GTK_FIXED(fix),GTK_WIDGET(objptr),x,y);
- gtk_widget_realize (GTK_WIDGET (objptr));
- gtk_widget_show (GTK_WIDGET (objptr));
-
- gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkFixedMove (JNIEnv *env,
- jobject obj, jint x, jint y)
-{
- GtkWidget *widget;
- void *ptr=NULL;
-
- /* For some reason, ScrolledWindow tries to scroll its contents
- by moving them using this function. Since we want to use GTK's
- nice fast scrolling, we try to second guess it here. This
- might cause problems later. */
-
- if (x >= 0 && y >= 0)
- {
- ptr = NSA_GET_PTR (env, obj);
-
- gdk_threads_enter ();
- widget=GTK_WIDGET (ptr);
- if (!GTK_IS_WINDOW (widget))
- gtk_fixed_move (GTK_FIXED (widget->parent), widget, x, y);
- gdk_threads_leave ();
- }
-}
-
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds
(JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height)
{
@@ -482,7 +359,7 @@
JNIEXPORT jboolean JNICALL
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_modalHasGrab
- (JNIEnv *env, jclass clazz)
+ (JNIEnv *env __attribute__((unused)), jclass clazz __attribute__((unused)))
{
GtkWidget *widget;
jboolean retval;
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.7
diff -u -r1.7 gnu_java_awt_peer_gtk_GtkEvents.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c 7 Oct 2003 21:33:29 -0000 1.7
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c 7 Oct 2003 23:01:16 -0000
@@ -1142,6 +1142,7 @@
JNI_FALSE);
break;
default:
+ break;
}
g_free (obj_ptr);
}
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GtkImagePainter.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c 31 Jan 2003 17:54:14 -0000 1.1
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c 7 Oct 2003 23:01:16 -0000
@@ -44,9 +44,10 @@
(((w) << 24) | (((w) & 0xff00) << 8) | (((w) >> 8) & 0xff00) | ((w) >> 24))
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImagePainter_drawPixels
-(JNIEnv *env, jobject obj, jobject gc_obj, jint bg_red, jint bg_green,
- jint bg_blue, jint x, jint y, jint width, jint height, jintArray jpixels,
- jint offset, jint scansize, jdoubleArray jaffine)
+(JNIEnv *env, jobject obj __attribute__((unused)), jobject gc_obj,
+ jint bg_red, jint bg_green, jint bg_blue, jint x, jint y, jint width,
+ jint height, jintArray jpixels, jint offset, jint scansize,
+ jdoubleArray jaffine)
{
struct graphics *g;
jint *pixels, *elems;
@@ -114,8 +115,7 @@
ArtAlphaGamma *alphagamma = NULL;
art_u8 *dst;
int new_width, new_height;
- int i;
-
+
affine = (*env)->GetDoubleArrayElements (env, jaffine, NULL);
new_width = abs (width * affine[0]);
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkListPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c 30 Jun 2003 23:53:29 -0000 1.2
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c 7 Oct 2003 23:01:16 -0000
@@ -322,7 +322,9 @@
}
static void
-item_select (GtkCList *list, int row, int col, GdkEventButton *event,
+item_select (GtkCList *list __attribute__((unused)),
+ int row, int col __attribute__((unused)),
+ GdkEventButton *event __attribute__((unused)),
jobject *peer_obj)
{
(*gdk_env)->CallVoidMethod (gdk_env, *peer_obj,
@@ -332,8 +334,11 @@
}
static void
-item_unselect (GtkCList *list, int row, int col, GdkEventButton *event,
- jobject *peer_obj)
+item_unselect (GtkCList *list __attribute__((unused)),
+ int row,
+ int col __attribute__((unused)),
+ GdkEventButton *event __attribute__((unused)),
+ jobject *peer_obj)
{
(*gdk_env)->CallVoidMethod (gdk_env, *peer_obj,
postListItemEventID,
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkMainThread.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c 2 Oct 2003 18:34:56 -0000 1.6
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c 7 Oct 2003 23:01:16 -0000
@@ -185,7 +185,8 @@
* Run gtk_main and block.
*/
JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkMain (JNIEnv *env, jobject obj)
+Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkMain
+ (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)))
{
gdk_threads_enter ();
gtk_main ();
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c 31 Jan 2003 17:54:14 -0000 1.1
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c 7 Oct 2003 23:01:16 -0000
@@ -94,14 +94,8 @@
(*env)->ReleaseStringUTFChars (env, label, str);
}
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_setEnabled
- (JNIEnv *env, jobject obj, jboolean enabled)
-{
-/* Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setEnabled (env, obj, enabled); */
-}
-
static void
-item_activate (GtkMenuItem *item, jobject *peer_obj)
+item_activate (GtkMenuItem *item __attribute__((unused)), jobject *peer_obj)
{
(*gdk_env)->CallVoidMethod (gdk_env, *peer_obj,
postMenuActionEventID);
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.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GtkMenuPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c 31 Jan 2003 17:54:14 -0000 1.1
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c 7 Oct 2003 23:01:16 -0000
@@ -40,13 +40,14 @@
#include "gnu_java_awt_peer_gtk_GtkMenuPeer.h"
static void
-accel_attach (GtkMenuItem *menu_item, gpointer *user_data)
+accel_attach (GtkMenuItem *menu_item,
+ gpointer *user_data __attribute__((unused)))
{
GtkAccelGroup *accel;
accel = gtk_menu_get_accel_group (GTK_MENU (menu_item->submenu));
- gtk_accel_group_attach (accel,
- GTK_OBJECT (gtk_widget_get_toplevel (GTK_WIDGET(menu_item))));
+ _gtk_accel_group_attach (accel,
+ G_OBJECT (gtk_widget_get_toplevel (GTK_WIDGET(menu_item))));
}
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_setupAccelGroup
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GtkPanelPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c 31 Jan 2003 17:54:14 -0000 1.1
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c 7 Oct 2003 23:01:16 -0000
@@ -60,38 +60,6 @@
gint y;
};
-static
-void sr (GtkWidget *widget, GtkRequisition *requisition, gpointer user_data)
-{
- GtkLayout *layout;
- GtkLayoutChild *child;
- GList *children;
-
- layout = GTK_LAYOUT (widget);
- requisition->width = GTK_WIDGET (widget)->allocation.width;
- requisition->height = GTK_WIDGET (widget)->allocation.height;
-
- children = layout->children;
- while (children)
- {
- child = children->data;
- children = children->next;
-
- if (GTK_WIDGET_VISIBLE (child->widget))
- {
- requisition->height = MAX (requisition->height,
- child->y +
- child->widget->allocation.height);
- requisition->width = MAX (requisition->width,
- child->x +
- child->widget->allocation.width);
- }
- }
-
- requisition->height += GTK_CONTAINER (layout)->border_width * 2;
- requisition->width += GTK_CONTAINER (layout)->border_width * 2;
-}
-
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GtkPanelPeer_connectHooks
(JNIEnv *env, jobject obj)
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c 31 Jan 2003 17:54:14 -0000 1.1
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c 7 Oct 2003 23:01:16 -0000
@@ -46,12 +46,16 @@
};
void
-menu_pos (GtkMenu *menu, gint *x, gint *y, gpointer user_data)
+menu_pos (GtkMenu *menu __attribute__((unused)),
+ gint *x, gint *y,
+ gboolean *push_in,
+ gpointer user_data)
{
struct pos *p = (struct pos *) user_data;
*x = p->x;
*y = p->y;
+ *push_in = TRUE;
}
JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show
@@ -87,7 +91,7 @@
gdk_threads_enter ();
menu = GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu);
gtk_menu_set_accel_group (menu, gtk_accel_group_new ());
- gtk_accel_group_attach (gtk_menu_get_accel_group (menu),
- GTK_OBJECT (gtk_widget_get_toplevel (ptr2)));
+ _gtk_accel_group_attach (gtk_menu_get_accel_group (menu),
+ G_OBJECT (gtk_widget_get_toplevel (ptr2)));
gdk_threads_leave ();
}
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c 31 Jan 2003 17:54:14 -0000 1.1
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c 7 Oct 2003 23:01:16 -0000
@@ -44,7 +44,6 @@
(JNIEnv *env, jobject obj)
{
gpointer window;
- GtkWidget *layout;
gdk_threads_enter ();
window = gtk_scrolled_window_new (NULL, NULL);
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.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c 7 Oct 2003 21:33:29 -0000 1.6
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c 7 Oct 2003 23:01:16 -0000
@@ -450,7 +450,7 @@
}
static void
-textcomponent_commit_cb (GtkIMContext *context,
+textcomponent_commit_cb (GtkIMContext *context __attribute__((unused)),
const gchar *str,
jobject peer)
{
@@ -472,7 +472,7 @@
}
static void
-textcomponent_changed_cb (GtkEditable *editable,
+textcomponent_changed_cb (GtkEditable *editable __attribute__((unused)),
jobject peer)
{
(*gdk_env)->CallVoidMethod (gdk_env, peer, postTextEventID);
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GtkToolkit.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c 31 Jan 2003 17:54:14 -0000 1.1
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c 7 Oct 2003 23:01:16 -0000
@@ -40,7 +40,8 @@
#include "gnu_java_awt_peer_gtk_GtkToolkit.h"
JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkToolkit_beep (JNIEnv *env, jobject obj)
+Java_gnu_java_awt_peer_gtk_GtkToolkit_beep
+ (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)))
{
gdk_threads_enter ();
gdk_beep ();
@@ -48,7 +49,8 @@
}
JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkToolkit_sync (JNIEnv *env, jobject obj)
+Java_gnu_java_awt_peer_gtk_GtkToolkit_sync
+ (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)))
{
gdk_threads_enter ();
gdk_flush ();
@@ -57,7 +59,8 @@
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenSizeDimensions
-(JNIEnv *env, jobject obj, jintArray jdims)
+ (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jintArray jdims)
{
jint *dims = (*env)->GetIntArrayElements (env, jdims, 0);
@@ -72,8 +75,8 @@
}
JNIEXPORT jint JNICALL
-Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenResolution (JNIEnv *env,
- jobject obj)
+Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenResolution
+ (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)))
{
jint res;
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.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c 2 Oct 2003 18:34:56 -0000 1.6
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c 7 Oct 2003 23:01:16 -0000
@@ -67,7 +67,7 @@
window will snap to its default requisition of 0x0. If we omit
this call, Frames and Dialogs shrink to degenerate 1x1 windows
when their resizable property changes. */
- gtk_widget_set_size_request (window, width, height);
+ gtk_widget_set_size_request (window_widget, width, height);
/* Keep this window in front of its parent, if it has one. */
if (parent)
@@ -235,8 +235,8 @@
JNIEXPORT void JNICALL
Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setBoundsCallback
- (JNIEnv *env, jobject obj, jobject window,
- jint x, jint y, jint width, jint height)
+ (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)),
+ jobject window, jint x, jint y, jint width, jint height)
{
/* Circumvent package-private access to call Window's
setBoundsCallback method. */
Index: jni/gtk-peer/gthread-jni.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gthread-jni.c,v
retrieving revision 1.2
diff -u -r1.2 gthread-jni.c
--- jni/gtk-peer/gthread-jni.c 30 Jun 2003 23:53:29 -0000 1.2
+++ jni/gtk-peer/gthread-jni.c 7 Oct 2003 23:01:16 -0000
@@ -189,7 +189,7 @@
}
/* Lock a mutex. */
-static void g_mutex_lock_jni_impl (GMutex *mutex) {
+static void g_mutex_lock_jni_impl (GMutex *mutex __attribute__((unused))) {
JNIEnv *gdk_env;
(*gdk_vm)->GetEnv(gdk_vm, (void **)&gdk_env, JNI_VERSION_1_1);
@@ -201,7 +201,9 @@
* do not provide such an interface. To be at least minimally correct,
* pretend we tried and failed.
*/
-static gboolean g_mutex_trylock_jni_impl (GMutex *mutex) {
+static gboolean g_mutex_trylock_jni_impl
+ (GMutex *mutex __attribute__((unused)))
+{
// Shall we implement this in a JikesRVM-specific way under a flag?
return FALSE;
}
@@ -285,7 +287,9 @@
/* Wait on a condition variable. For us, this simply means call
* Object.wait.
*/
-static void g_cond_wait_jni_impl (GCond *cond, GMutex *mutex) {
+static void g_cond_wait_jni_impl
+ (GCond *cond, GMutex *mutex __attribute__((unused)))
+{
jclass lcl_class;
jmethodID wait_mth;
JNIEnv *gdk_env;
@@ -313,7 +317,10 @@
* so, that is Java-speak for wait timing out.
*/
static gboolean
-g_cond_timed_wait_jni_impl (GCond *cond, GMutex *mutex, GTimeVal *end_time) {
+g_cond_timed_wait_jni_impl
+ (GCond *cond, GMutex *mutex __attribute__((unused)),
+ GTimeVal *end_time)
+{
jclass lcl_class;
jmethodID wait_mth;
JNIEnv *gdk_env;
@@ -364,7 +371,9 @@
/* Create a new thread-local key. We use java.lang.ThreadLocal objects
* for this.
*/
-static GPrivate *g_private_new_jni_impl (GDestroyNotify notify) {
+static GPrivate *g_private_new_jni_impl
+ (GDestroyNotify notify __attribute__((unused)))
+{
jclass lcl_class;
jobject *local;
JNIEnv *gdk_env;
@@ -474,7 +483,14 @@
g_cond_free_jni_impl, /* cond_free */
g_private_new_jni_impl, /* private_new */
g_private_get_jni_impl, /* private_get */
- g_private_set_jni_impl /* private_set */
+ g_private_set_jni_impl, /* private_set */
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL
};
/* ??? */
Index: jni/gtk-peer/gtkpeer.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gtkpeer.h,v
retrieving revision 1.5
diff -u -r1.5 gtkpeer.h
--- jni/gtk-peer/gtkpeer.h 7 Oct 2003 21:33:29 -0000 1.5
+++ jni/gtk-peer/gtkpeer.h 7 Oct 2003 23:01:16 -0000
@@ -54,6 +54,10 @@
#ifndef __GTKPEER_H__
#define __GTKPEER_H__
+#ifndef __GNUC__
+#define __attribute__(x) /* nothing */
+#endif
+
#ifdef JVM_SUN
extern struct state_table *native_state_table;