summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog58
-rw-r--r--gnu/java/awt/peer/gtk/GdkGraphics.java10
-rw-r--r--gnu/java/awt/peer/gtk/GtkComponentPeer.java7
-rw-r--r--gnu/java/awt/peer/gtk/GtkDialogPeer.java8
-rw-r--r--gnu/java/awt/peer/gtk/GtkImage.java5
-rw-r--r--gnu/java/awt/peer/gtk/GtkTextAreaPeer.java8
-rw-r--r--gnu/java/awt/peer/gtk/GtkTextFieldPeer.java8
-rw-r--r--gnu/java/awt/peer/gtk/GtkToolkit.java15
-rw-r--r--gnu/java/awt/peer/gtk/GtkWindowPeer.java3
-rw-r--r--gnu/java/awt/peer/gtk/TestAWT.java21
-rw-r--r--native/jni/gtk-peer/gnu_java_awt_image_GdkPixbufDecoder.c16
-rw-r--r--native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c41
-rw-r--r--native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c6
-rw-r--r--native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c15
-rw-r--r--native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c4
-rw-r--r--native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c4
16 files changed, 92 insertions, 137 deletions
diff --git a/ChangeLog b/ChangeLog
index ccba8e57c..8e40381ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,61 @@
+2002-11-09 Tom Tromey <tromey@redhat.com>
+
+ * 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.
+
2002-11-08 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/charset/ISO_8859_1.java,
diff --git a/gnu/java/awt/peer/gtk/GdkGraphics.java b/gnu/java/awt/peer/gtk/GdkGraphics.java
index 605ee97a6..e5282c12f 100644
--- a/gnu/java/awt/peer/gtk/GdkGraphics.java
+++ b/gnu/java/awt/peer/gtk/GdkGraphics.java
@@ -1,5 +1,5 @@
/* GdkGraphics.java
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -92,10 +92,6 @@ public class GdkGraphics extends Graphics
public void clipRect (int x, int y, int width, int height)
{
- if (!clip.intersects (new Rectangle (x, y, width, height)))
- {
- System.out.println ("DONT' INTERSETCT");
- }
clip = clip.intersection (new Rectangle (x, y, width, height));
setClipRectangle (clip.x, clip.y, clip.width, clip.height);
}
@@ -218,13 +214,13 @@ public class GdkGraphics extends Graphics
public void drawRoundRect(int x, int y, int width, int height,
int arcWidth, int arcHeight)
{
- System.out.println ("drawRoundRect called [UNIMPLEMENTED]");
+ // System.out.println ("drawRoundRect called [UNIMPLEMENTED]");
}
public void fillRoundRect (int x, int y, int width, int height,
int arcWidth, int arcHeight)
{
- System.out.println ("fillRoundRect called [UNIMPLEMENTED]");
+ // System.out.println ("fillRoundRect called [UNIMPLEMENTED]");
}
public Shape getClip ()
diff --git a/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
index 9ea0bdfde..a71a3dce2 100644
--- a/gnu/java/awt/peer/gtk/GtkComponentPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkComponentPeer.java
@@ -151,7 +151,6 @@ public class GtkComponentPeer extends GtkGenericPeer
int dim[]=new int[2];
gtkWidgetGetDimensions (dim);
Dimension d = new Dimension (dim[0],dim[1]);
- System.out.println ("min: " + this + d);
return (d);
}
@@ -160,7 +159,6 @@ public class GtkComponentPeer extends GtkGenericPeer
int dim[]=new int[2];
gtkWidgetGetDimensions (dim);
Dimension d = new Dimension (dim[0],dim[1]);
- System.out.println ("pref: " + this + d);
return (d);
}
@@ -242,7 +240,7 @@ public class GtkComponentPeer extends GtkGenericPeer
public void setBackground (Color c)
{
- System.out.println ("setBackground [UNIMPLEMENTED");
+ // System.out.println ("setBackground [UNIMPLEMENTED");
}
native public void setNativeBounds (int x, int y, int width, int height);
@@ -277,7 +275,7 @@ public class GtkComponentPeer extends GtkGenericPeer
public void setForeground (Color c)
{
- System.out.println ("setForeground [UNIMPLEMENTED");
+ // System.out.println ("setForeground [UNIMPLEMENTED");
}
public Color getForeground ()
@@ -349,7 +347,6 @@ public class GtkComponentPeer extends GtkGenericPeer
do
{
component = component.getParent ();
- System.out.println ("COMPONPEER: " + component);
p = component.getPeer ();
} while (p instanceof java.awt.peer.LightweightPeer);
diff --git a/gnu/java/awt/peer/gtk/GtkDialogPeer.java b/gnu/java/awt/peer/gtk/GtkDialogPeer.java
index 88182b2b0..b47956d4f 100644
--- a/gnu/java/awt/peer/gtk/GtkDialogPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkDialogPeer.java
@@ -1,5 +1,5 @@
/* GtkDialogPeer.java -- Implements DialogPeer with GTK
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -67,10 +67,10 @@ public class GtkDialogPeer extends GtkWindowPeer
public void handleEvent (AWTEvent event)
{
- int id = event.getID();
+// int id = event.getID();
- if (id == WindowEvent.WINDOW_CLOSING)
- System.out.println ("got a closing event");
+// if (id == WindowEvent.WINDOW_CLOSING)
+// System.out.println ("got a closing event");
}
}
diff --git a/gnu/java/awt/peer/gtk/GtkImage.java b/gnu/java/awt/peer/gtk/GtkImage.java
index 7fdfe4f18..f0c8bf410 100644
--- a/gnu/java/awt/peer/gtk/GtkImage.java
+++ b/gnu/java/awt/peer/gtk/GtkImage.java
@@ -1,5 +1,5 @@
/* GtkImage.java
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -74,9 +74,6 @@ public class GtkImage extends Image implements ImageConsumer
source = producer;
this.g = g;
- System.out.println (source);
- System.out.println (this);
-
source.addConsumer (this);
}
diff --git a/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java b/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java
index d418ae14d..7a648b913 100644
--- a/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java
@@ -1,5 +1,5 @@
/* GtkTextAreaPeer.java -- Implements TextAreaPeer with GTK
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -67,9 +67,6 @@ public class GtkTextAreaPeer extends GtkTextComponentPeer
gtkTextGetSize (rows, cols, dims);
- System.out.println ("TAP: getMinimumSize " + cols + " = " + dims[0] +
- " x " + dims[1]);
-
return (new Dimension (dims[0], dims[1]));
}
@@ -79,9 +76,6 @@ public class GtkTextAreaPeer extends GtkTextComponentPeer
gtkTextGetSize (rows, cols, dims);
- System.out.println ("TAP: getPreferredSize " + cols + " = " + dims[0] +
- " x " + dims[1]);
-
return (new Dimension (dims[0], dims[1]));
}
diff --git a/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java b/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java
index 8f41103bd..4dc23f8ba 100644
--- a/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java
@@ -1,5 +1,5 @@
/* GtkTextFieldPeer.java -- Implements TextFieldPeer with GTK
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -65,9 +65,6 @@ public class GtkTextFieldPeer extends GtkTextComponentPeer
gtkEntryGetSize (cols, dims);
- System.out.println ("TFP: getMinimumSize " + cols + " = " + dims[0] +
- " x " + dims[1]);
-
return (new Dimension (dims[0], dims[1]));
}
@@ -77,9 +74,6 @@ public class GtkTextFieldPeer extends GtkTextComponentPeer
gtkEntryGetSize (cols, dims);
- System.out.println ("TFP: getPreferredSize " + cols + " = " + dims[0] +
- " x " + dims[1]);
-
return (new Dimension (dims[0], dims[1]));
}
diff --git a/gnu/java/awt/peer/gtk/GtkToolkit.java b/gnu/java/awt/peer/gtk/GtkToolkit.java
index df3d326b2..f6a738b0a 100644
--- a/gnu/java/awt/peer/gtk/GtkToolkit.java
+++ b/gnu/java/awt/peer/gtk/GtkToolkit.java
@@ -69,11 +69,7 @@ public class GtkToolkit extends java.awt.Toolkit
static
{
- /* if (Configuration.INIT_LOAD_LIBRARY)
- {*/
- System.out.println("loading gtkpeer");
- System.loadLibrary("gtkpeer");
- // }
+ System.loadLibrary("gtkpeer");
}
public GtkToolkit ()
@@ -113,7 +109,7 @@ public class GtkToolkit extends java.awt.Toolkit
public Image createImage (byte[] imagedata, int imageoffset,
int imagelength)
{
- System.out.println ("createImage byte[] NOT SUPPORTED");
+ // System.out.println ("createImage byte[] NOT SUPPORTED");
return null;
}
@@ -189,9 +185,6 @@ public class GtkToolkit extends java.awt.Toolkit
Rectangle bounds = c.getBounds ();
cp.setBounds (bounds.x, bounds.y, bounds.width, bounds.height);
- if (c instanceof Canvas)
- System.out.println ("width " + bounds.width + " height " + bounds.height);
-
cp.setVisible (c.isVisible ());
}
}
@@ -241,9 +234,7 @@ public class GtkToolkit extends java.awt.Toolkit
protected LabelPeer createLabel (Label label)
{
- LabelPeer lp = new GtkLabelPeer (label);
- System.out.println("Returning " + lp);
- return lp;
+ return new GtkLabelPeer (label);
}
protected ListPeer createList (List list)
diff --git a/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/gnu/java/awt/peer/gtk/GtkWindowPeer.java
index ee97e56cd..76752d5ad 100644
--- a/gnu/java/awt/peer/gtk/GtkWindowPeer.java
+++ b/gnu/java/awt/peer/gtk/GtkWindowPeer.java
@@ -1,5 +1,5 @@
/* GtkWindowPeer.java -- Implements WindowPeer with GTK
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -105,7 +105,6 @@ public class GtkWindowPeer extends GtkContainerPeer
|| insets.bottom != bottom
|| insets.right != right)
{
- System.out.println ("invalidating");
awtComponent.invalidate ();
}
diff --git a/gnu/java/awt/peer/gtk/TestAWT.java b/gnu/java/awt/peer/gtk/TestAWT.java
index 417a99dea..183db24b7 100644
--- a/gnu/java/awt/peer/gtk/TestAWT.java
+++ b/gnu/java/awt/peer/gtk/TestAWT.java
@@ -1,5 +1,5 @@
/* TestAWT.java -- Tests the AWT like testgtk
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -51,7 +51,9 @@ class TestAWT
prop.put ("awt.toolkit", "gnu.java.awt.peer.gtk.GtkToolkit");
}
MainWindow f = new MainWindow();
+ System.out.println(f.isDisplayable());
f.show();
+ System.out.println(f.isDisplayable());
}
}
@@ -122,8 +124,6 @@ class MainWindow extends PrettyFrame implements ActionListener
MainWindow ()
{
- System.out.println ("INSET:" + getInsets ());
-
MenuBar mb = new MenuBar ();
Menu menu = new Menu ("File");
Menu submenu = new Menu ("Testing");
@@ -164,7 +164,6 @@ class MainWindow extends PrettyFrame implements ActionListener
sp.add (p);
add (sp, "Center");
- System.out.println (86 + (windows.size ()*22));
setSize (200, 86 + (windows.size ()*22));
setTitle ("TestAWT");
}
@@ -173,13 +172,8 @@ class MainWindow extends PrettyFrame implements ActionListener
{
Button source = (Button) evt.getSource ();
- System.out.println (source);
- System.out.println (closeButton);
-
if (source==closeButton)
{
- System.out.println ("INSET:" + getInsets ());
- System.out.println ("BOUNDS:" + getBounds ());
System.getProperties ().list (System.out);
dispose();
System.exit (0);
@@ -189,7 +183,10 @@ class MainWindow extends PrettyFrame implements ActionListener
if (w.isVisible ())
w.dispose ();
else
- w.setVisible (true);
+ {
+ w.setVisible (true);
+ w.show();
+ }
}
}
@@ -229,7 +226,6 @@ class ButtonsWindow extends SubFrame implements ActionListener
});
add (cb, "South");
setTitle ("Buttons");
- pack ();
}
public void actionPerformed (ActionEvent evt)
@@ -371,7 +367,6 @@ class CursorsWindow extends SubFrame implements ItemListener
public void itemStateChanged (ItemEvent e)
{
- System.out.println (cursorChoice.getSelectedIndex());
cursorCanvas.setCursor (Cursor.getPredefinedCursor (cursorChoice.getSelectedIndex()));
}
}
@@ -550,5 +545,3 @@ class RadioWindow extends SubFrame
setSize (85, 167);
}
}
-
-
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);
View Lorry Controller Status