* gnu/java/awt/peer/gtk/GtkWindowPeer.java (postConfigureEvent):

	Removed println.
	* gnu/java/awt/peer/gtk/GtkToolkit.java (static): Removed
	println.
	(createImage): Likewise.
	(setComponentState): Likewise.
	(createLabel): Likewise.
	* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java (getMinimumSize):
	Removed println.
	(getPreferredSize): Likewise.
	* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java (getMinimumSize):
	Removed println.
	(getPreferredSize): Likewise.
	* gnu/java/awt/peer/gtk/GtkImage.java (GtkImage): Removed
	println.
	* gnu/java/awt/peer/gtk/GtkDialogPeer.java (handleEvent): Removed
	println.
	* gnu/java/awt/peer/gtk/GtkComponentPeer.java (getMinimumSize):
	Removed println.
	(getPreferredSize): Likewise.
	(setBackground): Likewise.
	(setForeground): Likewise.
	(getArgs): Likewise.
	* gnu/java/awt/peer/gtk/GdkGraphics.java (clipRect): Removed
	println.
	(drawRoundRect): Likewise.
	(fillRoundRect): Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetSize):
	Removed printf.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
	(Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getHScrollbarHeight): Removed printf.
	(Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getVScrollbarWidth):
	Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c (sr):
	Removed printf.  Now static.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
	(Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit): Removed
	printf.
	(Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkMain): Likewise.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkFixedPut): Removed
	printf.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkFixedMove):
	Likewise.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds):
	Likewise.
	(find_gtk_layout): Likewise.
	(set_parent): Likewise.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_Object_2): Likewise.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_create): Likewise.
	* native/jni/gtk-peer/gnu_java_awt_image_GdkPixbufDecoder.c
	(area_prepared): Remove printf.  Now static.
	(area_updated): Likewise.
	(closed): Likewise.

6 files changed, 11 insertions, 75 deletions

diff --git a/native/jni/gtk-peer/gnu_java_awt_image_GdkPixbufDecoder.c b/native/jni/gtk-peer/gnu_java_awt_image_GdkPixbufDecoder.c
index c5db9af15..439039c44 100644
--- a/native/jni/gtk-peer/gnu_java_awt_image_GdkPixbufDecoder.c
+++ b/native/jni/gtk-peer/gnu_java_awt_image_GdkPixbufDecoder.c
@@ -1,5 +1,5 @@
 /* gdkpixbufdecoder.c
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -76,17 +76,13 @@ Java_gnu_java_awt_image_GdkPixbufDecoder_initState (JNIEnv *env, jclass clazz)
   getFDID = (*env)->GetFieldID (env, filedescriptor, "fd", "I"); 
 }
 
-void
+static void
 area_prepared (GdkPixbufLoader *loader, struct loader_vector *lv)
 {
   ArtPixBuf *pixbuf;
 
   //  pixbuf = GDK_PIXBUF_LOADER(gdk_pixbuf_loader_get_pixbuf (loader))->art_pixbuf;
 
-  printf ("AREA PREPARED\n");
-
-  return;
-
   gdk_threads_leave ();
   (*gdk_env)->CallVoidMethod (gdk_env,
 			      *(lv->loader), 
@@ -97,7 +93,7 @@ area_prepared (GdkPixbufLoader *loader, struct loader_vector *lv)
   gdk_threads_enter ();
 }
 
-void
+static void
 area_updated (GdkPixbufLoader *loader, 
 	      gint x, gint y, 
 	      gint width, gint height,
@@ -107,8 +103,6 @@ area_updated (GdkPixbufLoader *loader,
   jintArray jpixels;
   jint *pixels, scansize, num_pixels;
 
-  printf ("AREA UPDATED\n");
-
   /*  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader)->art_pixbuf;
 
   g_return_if_fail (pixbuf->format == ART_PIX_RGB);
@@ -166,11 +160,9 @@ area_updated (GdkPixbufLoader *loader,
   gdk_threads_enter ();
 }
 
-void
+static void
 closed (GdkPixbufLoader *loader, struct loader_vector *lv)
 {
-  printf ("IN CLOSED CALLBACK\n");
-
   gdk_threads_leave ();
 
   (*gdk_env)->DeleteGlobalRef (gdk_env, *(lv->loader)); 
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
index d8b1ec078..58b1a0418 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
@@ -1,5 +1,5 @@
 /* gtkcomponentpeer.c -- Native implementation of GtkComponentPeer
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -269,19 +269,12 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkFixedPut
   gdk_threads_enter ();
   if (GTK_IS_WINDOW(GTK_OBJECT(containerptr)))
     {
-      printf("fixedput: container is window\n");
-
       child=gtk_container_children (GTK_CONTAINER(containerptr));
       
-      if (!child)
-	printf("No children in window!\n");
       while (child && !GTK_IS_FIXED(child->data))
 	{
-	  printf("Child\n");
 	  child=g_list_next(child);
 	}
-      if(!child)
-	printf("Child is not fixed!\n");
       
       fix=GTK_WIDGET(child->data);
       g_list_free(child);
@@ -289,19 +282,12 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkFixedPut
   else
     if (GTK_IS_SCROLLED_WINDOW(GTK_OBJECT(containerptr)))
     {
-      printf("fixedput: container is scrolled window\n");
-
       child=gtk_container_children (GTK_CONTAINER (GTK_BIN(containerptr)->child));
       
-      if (!child)
-	printf("No children in window!\n");
       while (child && !GTK_IS_FIXED(child->data))
 	{
-	  printf("Child\n");
 	  child=g_list_next(child);
 	}
-      if(!child)
-	printf("Child is not fixed!\n");
       
       fix=GTK_WIDGET(child->data);
 
@@ -309,12 +295,9 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkFixedPut
     }
   else
     {
-      printf("fixedput: container is fixed\n");
       fix=GTK_WIDGET(containerptr);
     }
   
-  printf("fixedput: fixed found: %p\n",fix);
-
   gtk_fixed_put(GTK_FIXED(fix),GTK_WIDGET(objptr),x,y);
   gtk_widget_realize (GTK_WIDGET (objptr));
   gtk_widget_show (GTK_WIDGET (objptr));
@@ -334,8 +317,6 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkFixedMove (JNIEnv *env,
      nice fast scrolling, we try to second guess it here.  This
      might cause problems later.  */
   
-  printf ("GTKFIXED MOVE CALLED\n");
-
   if (x >= 0 && y >= 0) 
     {
       ptr = NSA_GET_PTR (env, obj);
@@ -356,9 +337,6 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBoun
 
   ptr = NSA_GET_PTR (env, obj);
 
-  printf ("Cpeer.setBounds: %i, %i  %ix%i\n",
-	  x, y, width, height);
-
   gdk_threads_enter ();
 
   widget = GTK_WIDGET (ptr);
@@ -439,15 +417,11 @@ set_visible (GtkWidget *widget, jboolean visible)
 GtkLayout *
 find_gtk_layout (GtkWidget *parent)
 {
-  printf ("FINDGTKLAYTOU BEGIN\n");
   if (GTK_IS_WINDOW (parent))
     {
       GList *children = gtk_container_children 
 	                  (GTK_CONTAINER (GTK_BIN (parent)->child));
 
-  printf ("FINDGTKLAYTOU END\n");
-
-
       if (GTK_IS_MENU_BAR (children->data))
 	return GTK_LAYOUT (children->next->data);
       else /* GTK_IS_LAYOUT (children->data) */
@@ -462,15 +436,11 @@ find_gtk_layout (GtkWidget *parent)
 void
 set_parent (GtkWidget *widget, GtkContainer *parent)
 {
-  printf ("SET PARENT START\n");
-
   if (GTK_IS_WINDOW (parent))
     {
       GList *children = gtk_container_children 
 	                  (GTK_CONTAINER (GTK_BIN (parent)->child));
 
-  printf ("SET PARENT ENDISH\n");
-
       if (GTK_IS_MENU_BAR (children->data))
 	gtk_layout_put (GTK_LAYOUT (children->next->data), widget, 0, 0);
       else /* GTK_IS_LAYOUT (children->data) */
@@ -628,14 +598,7 @@ Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_O
   if (!strcmp (name, "parent"))
     {
       gdk_threads_enter ();
-      printf ("CON CHECK\n");
-      printf ("we have a %s\n", gtk_type_name (GTK_OBJECT_TYPE (ptr1)));
-      if (GTK_IS_WINDOW (ptr1))
-	printf ("we have a window!\n");
-      if (!ptr2)
-	printf ("ptr2 is null!\n");
       set_parent (GTK_WIDGET (ptr1), GTK_CONTAINER (ptr2));
-      printf ("CON END\n");
       gdk_threads_leave ();
 
       (*env)->ReleaseStringUTFChars (env, jname, name);
@@ -661,8 +624,6 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_create
 
   gdk_threads_enter ();
   gtk_button_get_type ();
-  printf ("typename: %s\n", typename);
-  printf ("%i\n", gtk_type_from_name (typename));
   widget = gtk_object_newv (gtk_type_from_name (typename),
 			    0, NULL);
 /*    widget = gtk_type_new (gtk_type_from_name (typename)); */
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
index b9548b6d7..af14f0be8 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
@@ -1,5 +1,5 @@
 /* gtkmainthread.c -- Native implementation of GtkMainThread
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -70,8 +70,6 @@ Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit (JNIEnv *env, jclass clazz)
 /*    jclass gtkgenericpeer; */
   jclass gtkcomponentpeer, gtkwindowpeer, gtkscrollbarpeer, gtklistpeer, gtkmenuitempeer;
 
-  printf ("init\n");
-
   NSA_INIT (env, clazz);
 
   /* GTK requires a program's argc and argv variables, and requires that they
@@ -159,9 +157,7 @@ Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit (JNIEnv *env, jclass clazz)
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkMain (JNIEnv *env, jobject obj)
 {
-  printf ("TRYING TO GET INTO GTKMAIN\n");
   gdk_threads_enter ();
-  printf ("ACQUIRED LOCK TO RUN GTKMAIN\n");
   gtk_main ();
   gdk_threads_leave ();
 }
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c
index ee03b0cb7..b52c75d53 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c
@@ -1,5 +1,5 @@
 /* gtkpanelpeer.c -- Native implementation of GtkPanelPeer
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -60,8 +60,8 @@ struct _GtkLayoutChild {
   gint y;
 };
 
-void sr (GtkWidget *widget, GtkRequisition *requisition,
-	 gpointer user_data)
+static
+void sr (GtkWidget *widget, GtkRequisition *requisition, gpointer user_data)
 {
   GtkLayout *layout;
   GtkLayoutChild *child;
@@ -71,13 +71,6 @@ void sr (GtkWidget *widget, GtkRequisition *requisition,
   requisition->width = GTK_WIDGET (widget)->allocation.width;
   requisition->height = GTK_WIDGET (widget)->allocation.height;
 
-  if (user_data)
-    {
-      printf ("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!11\n");
-      printf ("%i, %i\n",   requisition->width,   requisition->height);
-    }
-  return;
-
   children = layout->children;
   while (children)
     {
@@ -97,8 +90,6 @@ void sr (GtkWidget *widget, GtkRequisition *requisition,
 
   requisition->height += GTK_CONTAINER (layout)->border_width * 2;
   requisition->width += GTK_CONTAINER (layout)->border_width * 2;
-
-  printf ("width, height %i, %i\n", requisition->width, requisition->height);
 }
 
 JNIEXPORT void JNICALL 
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
index 19b8a7e0c..499b3124d 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c
@@ -1,5 +1,5 @@
 /* gtkscrollpanepeer.c -- Native implementation of GtkScrollPanePeer
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -140,7 +140,6 @@ Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getHScrollbarHeight
   gdk_threads_enter ();
   sw = GTK_SCROLLED_WINDOW (ptr);
   height = (sw->hscrollbar_visible) ? sw->hscrollbar->allocation.height : 0;
-  printf ("height: %i\n", height);
   gdk_threads_leave ();
 
   return height;
@@ -159,7 +158,6 @@ Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_getVScrollbarWidth
   gdk_threads_enter ();
   sw = GTK_SCROLLED_WINDOW (ptr);
   width = (sw->vscrollbar_visible) ? sw->vscrollbar->allocation.width : 0;
-  printf ("width: %i\n", width);
   gdk_threads_leave ();
 
   return width;
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
index 9419c1265..9085a5793 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
@@ -1,5 +1,5 @@
 /* gtktextfieldpeer.c -- Native implementation of GtkTextFieldPeer
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -120,8 +120,6 @@ Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetSize
 					    'W'));
   dims[1]=myreq.height;
   
-  printf("native: %i x %i\n", dims[0], dims[1]);
-
   gdk_threads_leave ();
   
   (*env)->ReleaseIntArrayElements (env, jdims, dims, 0);