2003-11-04 Michael Koch <konqueror@gmx.de>

	* gnu/java/awt/ClasspathToolkit.java: New file.
	* gnu/java/awt/Makefile.am
	(EXTRA_DIST): Added ClasspathToolkit.java.
	* gnu/java/awt/image/GdkPixbufDecoder.java,
	gnu/java/awt/image/GtkOffScreenDecoder.java: Removed.
	* gnu/java/awt/image/ImageDecoder.java
	(produce): Made public.
	* gnu/java/awt/image/Makefile.am
	(EXTRA_DIST): Removed GdkPixbufDecoder.java and
	GtkOffScreenDecoder.java.
	* gnu/java/awt/peer/ClasspathFontPeer.java,
	gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java,
	gnu/java/awt/peer/gtk/GdkGlyphVector.java,
	gnu/java/awt/peer/gtk/GdkGraphics2D.java,
	gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: New files.
	* gnu/java/awt/peer/Makefile.am
	(EXTRA_DIST): Added ClasspathFontPeer.java.
	* gnu/java/awt/peer/gtk/Makefile.am
	(EXTRA_DIST): Added GdkClasspathFontPeer.java, GdkGlyphVector.java,
	GdkGraphics2D.java and GdkPixbufDecoder.java.
	* gnu/java/awt/peer/gtk/GtkToolkit.java:
	Import gnu.java.awt.peer.gtk.GdkPixbufDecoder.
	* include/Makefile.am: Generate and install new file
	gnu_java_awt_peer_gtk_GdkPixbufDecoder.h.
	* include/gnu_java_awt_image_GdkPixbufDecoder.h: Removed.
	* include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h: New file.
	* native/jni/gtk-peer/gnu_java_awt_image_GdkPixbufDecoder.c: Removed.

1 files changed, 0 insertions, 112 deletions

diff --git a/gnu/java/awt/image/GdkPixbufDecoder.java b/gnu/java/awt/image/GdkPixbufDecoder.java
deleted file mode 100644
index a4e40c9f4..000000000
--- a/gnu/java/awt/image/GdkPixbufDecoder.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/* GdkPixbufDecoder.java
-   Copyright (C) 1999 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.awt.image;
-
-import java.awt.image.ColorModel;
-import java.awt.image.DirectColorModel;
-import java.awt.image.ImageConsumer;
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Vector;
-import gnu.classpath.Configuration;
-
-public class GdkPixbufDecoder extends ImageDecoder
-{
-  native static void initState ();
-
-  static 
-  {
-    if (Configuration.INIT_LOAD_LIBRARY)
-      {
-	System.loadLibrary ("cpgdkpixbuf");
-	initState ();
-      }
-  }
-
-  /* gdk-pixbuf provids data in RGBA format */
-  static final ColorModel cm = new DirectColorModel (32, 0xff000000, 
-						         0x00ff0000, 
-				          		 0x0000ff00, 
-                                                         0x000000ff);
-  public GdkPixbufDecoder (String filename)
-  {
-    super (filename);
-  }
-
-  public GdkPixbufDecoder (URL url)
-  {
-    super (url);
-  }
-
-  void areaPrepared (Vector v, int width, int height)
-  {
-    for (int i = 0; i < v.size (); i++)
-      {
-	ImageConsumer ic = (ImageConsumer) v.elementAt (i);
-	ic.setDimensions (width, height);
-	ic.setColorModel (cm);
-	ic.setHints (ImageConsumer.RANDOMPIXELORDER);
-      }
-  }
-
-  void areaUpdated (Vector v, int x, int y, int width, int height, 
-		    int pixels[], int scansize)
-  {
-    for (int i = 0; i < v.size (); i++)
-      {
-	ImageConsumer ic = (ImageConsumer) v.elementAt (i);
-	ic.setPixels (x, y, width, height, cm, pixels, 0, scansize);
-      }
-  }
-
-  native void loaderWrite (Vector v, FileDescriptor fd);
-
-  void produce (Vector v, FileInputStream is) throws IOException
-  {
-    loaderWrite (v, is.getFD ());
-
-    for (int i = 0; i < v.size (); i++)
-      {
-	ImageConsumer ic = (ImageConsumer) v.elementAt (i);
-	ic.imageComplete (ImageConsumer.STATICIMAGEDONE);
-      }
-  }
-}