GtkMenuItemPeer.java (setEnabled): Stub out.

2003-10-08  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__.

From-SVN: r72231

20 files changed, 146 insertions, 210 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1218905..5950b35 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,53 @@
+2003-10-08  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__.
+
 2003-10-08  Michael Koch  <konqueror@gmx.de>
 
 	* java/util/LinkedList.java:
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
index 8a51d03..4e338f6 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
@@ -85,7 +85,10 @@ public class GtkMenuItemPeer extends GtkMenuComponentPeer
     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 ()
diff --git a/libjava/jni/classpath/jcl.c b/libjava/jni/classpath/jcl.c
index 66c756e0..629d071 100644
--- a/libjava/jni/classpath/jcl.c
+++ b/libjava/jni/classpath/jcl.c
@@ -39,6 +39,10 @@ exception statement from your version. */
 #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 @@ JNIEXPORT void * JNICALL JCL_realloc(JNIEnv *env, void *ptr, size_t size)
   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);
 	}
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
index b3eee27..b013040 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c
@@ -177,7 +177,8 @@ Java_gnu_java_awt_peer_gtk_GtkChoicePeer_select
 
 
 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,
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c
index 7c6beec..cf19711 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c
@@ -82,7 +82,7 @@ Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState (JNIEnv *env,
 		      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 @@ Java_gnu_java_awt_peer_gtk_GtkClipboard_initNativeState (JNIEnv *env,
 }
 
 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 @@ Java_gnu_java_awt_peer_gtk_GtkClipboard_requestStringConversion (JNIEnv *env,
 }
 
 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 @@ selection_received (GtkWidget *widget, GtkSelectionData *selection_data,
 }
 
 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 @@ selection_get (GtkWidget *widget,
 }
 
 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 @@ Java_gnu_java_awt_peer_gtk_GtkClipboard_selectionGet (JNIEnv *env,
 }
 
 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);
 
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
index 455af68..0499b27 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
@@ -133,31 +133,6 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus
   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 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetUsize (JNIEnv *env,
   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 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_isEnabled
 
 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;
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
index 90ff6f4..b6a172d 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
@@ -1142,6 +1142,7 @@ awt_event_handler (GdkEvent *event)
 				      JNI_FALSE);
 	  break;
         default:
+	  break;
 	}
       g_free (obj_ptr);
     }
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c
index dd446c8..f4e9c35 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c
@@ -44,9 +44,10 @@ exception statement from your version. */
   (((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 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkImagePainter_drawPixels
       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]);
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c
index bdf064f..944bc21 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c
@@ -322,7 +322,9 @@ Java_gnu_java_awt_peer_gtk_GtkListPeer_setMultipleMode
 }
 
 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 @@ item_select (GtkCList *list, int row, int col, GdkEventButton *event,
 }
 
 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,
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
index 03566f2..d936a59 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
@@ -185,7 +185,8 @@ Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit (JNIEnv *env, jclass clazz)
  * 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 ();
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
index ee39208..10c9e4c 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
@@ -94,14 +94,8 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_setLabel
   (*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);
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
index ec81542..e8cd78c 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
@@ -40,13 +40,14 @@ exception statement from your version. */
 #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
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c
index b52c75d..5d38989 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c
@@ -60,38 +60,6 @@ struct _GtkLayoutChild {
   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)
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
index 66affcf..c5a2230 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
@@ -46,12 +46,16 @@ struct pos
 };
 
 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 @@ Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup
   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 ();
 }
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
index 499b312..08ae7e5 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
@@ -44,7 +44,6 @@ Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create
   (JNIEnv *env, jobject obj)
 {
   gpointer window;
-  GtkWidget *layout;
 
   gdk_threads_enter ();
   window = gtk_scrolled_window_new (NULL, NULL);
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
index b964ffd..95e114e 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
@@ -450,7 +450,7 @@ Java_gnu_java_awt_peer_gtk_GtkTextComponentPeer_setText
 }
 
 static void
-textcomponent_commit_cb (GtkIMContext *context,
+textcomponent_commit_cb (GtkIMContext *context __attribute__((unused)),
                          const gchar  *str,
                          jobject peer)
 {
@@ -472,7 +472,7 @@ textcomponent_commit_cb (GtkIMContext *context,
 }
 
 static void
-textcomponent_changed_cb (GtkEditable *editable,
+textcomponent_changed_cb (GtkEditable *editable __attribute__((unused)),
 			  jobject peer)
 {
   (*gdk_env)->CallVoidMethod (gdk_env, peer, postTextEventID);
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
index 1436bad..37c3690 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
@@ -40,7 +40,8 @@ exception statement from your version. */
 #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 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_beep (JNIEnv *env, jobject obj)
 }
 
 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 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_sync (JNIEnv *env, jobject obj)
 
 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 @@ Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenSizeDimensions
 }
 
 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;
 
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 692c50e..0674b3a 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
@@ -67,7 +67,7 @@ Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create
      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 @@ Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toFront (JNIEnv *env,
 
 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. */
diff --git a/libjava/jni/gtk-peer/gthread-jni.c b/libjava/jni/gtk-peer/gthread-jni.c
index b1077a7..a762b4e 100644
--- a/libjava/jni/gtk-peer/gthread-jni.c
+++ b/libjava/jni/gtk-peer/gthread-jni.c
@@ -189,7 +189,7 @@ static GMutex *g_mutex_new_jni_impl (void) {
 }
 
 /* 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 @@ static void g_mutex_lock_jni_impl (GMutex *mutex) {
  * 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 @@ static void g_cond_broadcast_jni_impl (GCond *cond) {
 /*  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 @@ static void g_cond_wait_jni_impl (GCond *cond, GMutex *mutex) {
  * 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 @@ static void g_cond_free_jni_impl (GCond *cond) {
 /*  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 @@ GThreadFunctions g_thread_jni_functions =
   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
 };
 
 /* ??? */
diff --git a/libjava/jni/gtk-peer/gtkpeer.h b/libjava/jni/gtk-peer/gtkpeer.h
index 29414e1..5f9d215 100644
--- a/libjava/jni/gtk-peer/gtkpeer.h
+++ b/libjava/jni/gtk-peer/gtkpeer.h
@@ -54,6 +54,10 @@ exception statement from your version. */
 #ifndef __GTKPEER_H__
 #define __GTKPEER_H__
 
+#ifndef __GNUC__
+#define __attribute__(x) /* nothing */
+#endif
+
 #ifdef JVM_SUN
 
 extern struct state_table *native_state_table;