* include/Makefile.am: Remove

       include/gnu_java_awt_peer_gtk_GdkTextLayout.h.
       * include/gnu_java_awt_peer_gtk_GdkTextLayout.h: Removed.
       * native/jni/gtk-peer/Makefile.am: Remove
       gnu_java_awt_peer_gtk_GdkTextLayout.c
       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c:
       Removed.

       * include/gnu_java_awt_peer_gtk_GtkWindowPeer.h: Regenerated.

2 files changed, 0 insertions, 548 deletions

diff --git a/native/jni/gtk-peer/Makefile.am b/native/jni/gtk-peer/Makefile.am
index 397240270..1e0c97156 100644
--- a/native/jni/gtk-peer/Makefile.am
+++ b/native/jni/gtk-peer/Makefile.am
@@ -12,7 +12,6 @@ libgtkpeer_la_SOURCES = gnu_java_awt_peer_gtk_CairoSurface.c \
 			gnu_java_awt_peer_gtk_GdkPixbufDecoder.c \
 			gnu_java_awt_peer_gtk_GdkRobotPeer.c \
 			gnu_java_awt_peer_gtk_GdkScreenGraphicsDevice.c \
-			gnu_java_awt_peer_gtk_GdkTextLayout.c \
 			gnu_java_awt_peer_gtk_GtkButtonPeer.c \
 			gnu_java_awt_peer_gtk_GtkCanvasPeer.c \
 			gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c \
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
deleted file mode 100644
index 849998791..000000000
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/* gnu_java_awt_GdkTextLayout.c
-   Copyright (C) 2004, 2005, 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301 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. */
-
-
-#include <jni.h>
-#include <gtk/gtk.h>
-#include <string.h>
-#include <pango/pango.h>
-#include <pango/pangoft2.h>
-#include <pango/pangofc-font.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include "jcl.h"
-#include "native_state.h"
-#include "gdkfont.h"
-#include "gnu_java_awt_peer_gtk_GdkTextLayout.h"
-#include "cairographics2d.h"
-
-struct state_table *cp_gtk_native_text_layout_state_table;
-
-typedef struct gp
-{
-  JNIEnv *env;
-  jobject obj;
-  double px;
-  double py;
-  double sx;
-  double sy;
-} generalpath ;
-
-static void paint_glyph_run(cairo_t *cr, cairo_glyph_t **glyphs,
-			    gint *n_glyphs, PangoLayoutRun *run);
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkTextLayout_initStaticState 
-  (JNIEnv *env, jclass clazz)
-{
-  NSA_TEXT_LAYOUT_INIT (env, clazz);
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkTextLayout_initState
-  (JNIEnv *env, jobject self)
-{
-  struct textlayout *tl;
-
-  gdk_threads_enter ();
-
-  g_assert(self != NULL);
-  tl = g_malloc0 (sizeof (struct textlayout));
-  g_assert(tl != NULL);
-  tl->pango_layout = pango_layout_new(gdk_pango_context_get());
-  g_assert(tl->pango_layout != NULL);
-  NSA_SET_TEXT_LAYOUT_PTR (env, self, tl);
-
-  gdk_threads_leave ();
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkTextLayout_setText
-  (JNIEnv *env, jobject self, jstring text)
-{
-  struct textlayout *tl;
-  gchar *str = NULL;
-  gint len = 0;
-
-  g_assert(self != NULL);
-  g_assert(text != NULL);
-
-  tl = (struct textlayout *)NSA_GET_TEXT_LAYOUT_PTR (env, self);
-  g_assert(tl != NULL);
-  g_assert(tl->pango_layout != NULL);
-  
-  len = (*env)->GetStringUTFLength (env, text);
-  str = (gchar *)(*env)->GetStringUTFChars (env, text, NULL);
-  g_assert (str != NULL);
-
-  gdk_threads_enter ();
-
-  pango_layout_set_text (tl->pango_layout, str, len);
-
-  (*env)->ReleaseStringUTFChars (env, text, str);
-
-  gdk_threads_leave ();  
-}
-
-JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GdkTextLayout_setFont (JNIEnv *env, jobject obj, jobject font)
-{
-  struct textlayout *tl;
-  struct peerfont *pf;
-
-  g_assert(obj != NULL);
-  g_assert(font != NULL);
-
-  tl = (struct textlayout *)NSA_GET_TEXT_LAYOUT_PTR (env, obj);
-  g_assert(tl != NULL);
-  g_assert(tl->pango_layout != NULL);
-  pf = (struct peerfont *)NSA_GET_FONT_PTR (env, font);
-  g_assert(pf != NULL);
-  
-  gdk_threads_enter ();
-
-  pango_layout_set_font_description(tl->pango_layout, pf->desc);
-
-  gdk_threads_leave ();  
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkTextLayout_indexToPos
-  (JNIEnv *env, jobject self, jint idx, jdoubleArray javaPos)
-{
-  struct textlayout *tl;
-  PangoRectangle pangoPos;
-  jdouble *nativePos;
-
-  gdk_threads_enter ();
-
-  g_assert(self != NULL);
-  g_assert(javaPos != NULL);
-
-  tl = (struct textlayout *)NSA_GET_TEXT_LAYOUT_PTR (env, self);
-  g_assert(tl != NULL);
-  g_assert(tl->pango_layout != NULL);
-  
-  g_assert((*env)->GetArrayLength (env, javaPos) == 4);
-
-  nativePos = (*env)->GetDoubleArrayElements (env, javaPos, NULL);    
-
-  pango_layout_index_to_pos (tl->pango_layout, idx, &pangoPos);
-
-  nativePos[0] = (jdouble) pangoPos.x;
-  nativePos[1] = (jdouble) pangoPos.y;
-  nativePos[2] = (jdouble) pangoPos.width;
-  nativePos[3] = (jdouble) pangoPos.height;
-
-  (*env)->ReleaseDoubleArrayElements (env, javaPos, nativePos, 0);
-
-  gdk_threads_leave ();  
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkTextLayout_getExtents
-  (JNIEnv *env, jobject self, jdoubleArray javaInkExtents, jdoubleArray javaLogExtents)
-{
-  struct textlayout *tl;
-  PangoRectangle pangoInkExtents, pangoLogExtents;
-  jdouble *nativeInkExtents, *nativeLogExtents;
-
-  gdk_threads_enter ();
-
-  g_assert(self != NULL);
-  g_assert(javaInkExtents != NULL);
-  g_assert(javaLogExtents != NULL);
-
-  tl = (struct textlayout *)NSA_GET_TEXT_LAYOUT_PTR (env, self);
-  g_assert(tl != NULL);
-  g_assert(tl->pango_layout != NULL);
-  
-  g_assert((*env)->GetArrayLength (env, javaInkExtents) == 4);
-  g_assert((*env)->GetArrayLength (env, javaLogExtents) == 4);
-
-  nativeInkExtents = (*env)->GetDoubleArrayElements (env, javaInkExtents, NULL);    
-  nativeLogExtents = (*env)->GetDoubleArrayElements (env, javaLogExtents, NULL);  
-
-  pango_layout_get_extents (tl->pango_layout, 
-			    &pangoInkExtents, &pangoLogExtents);
-
-  nativeInkExtents[0] = (jdouble) pangoInkExtents.x;
-  nativeInkExtents[1] = (jdouble) pangoInkExtents.y;
-  nativeInkExtents[2] = (jdouble) pangoInkExtents.width;
-  nativeInkExtents[3] = (jdouble) pangoInkExtents.height;
-
-  nativeLogExtents[0] = (jdouble) pangoLogExtents.x;
-  nativeLogExtents[1] = (jdouble) pangoLogExtents.y;
-  nativeLogExtents[2] = (jdouble) pangoLogExtents.width;
-  nativeLogExtents[3] = (jdouble) pangoLogExtents.height;
-
-  (*env)->ReleaseDoubleArrayElements (env, javaInkExtents, nativeInkExtents, 0);
-  (*env)->ReleaseDoubleArrayElements (env, javaLogExtents, nativeLogExtents, 0);
-
-  gdk_threads_leave ();    
-}
-
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkTextLayout_dispose
-  (JNIEnv *env, jobject self)
-{
-  struct textlayout *tl;
-
-  gdk_threads_enter ();
-
-  g_assert(self != NULL);
-  tl = (struct textlayout *) NSA_DEL_TEXT_LAYOUT_PTR (env, self);
-  g_assert(tl != NULL);
-  if (tl->pango_layout != NULL)
-    g_object_unref (tl->pango_layout);
-  g_free(tl);
-
-  gdk_threads_leave ();
-}
-
-/**
- * Draw this textlayout on a cairo surface
- * FIXME: Seems completely broken.
- */
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout
-   (JNIEnv *env, jobject obj, jlong cg2d, jfloat x, jfloat y)
-{
-  /* 
-   * FIXME: Some day we expect either cairo or pango will know how to make
-   * a pango layout paint to a cairo surface. that day is not yet here.
-   */
-
-  struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, cg2d);
-  cairo_t *cr = gr->cr;
-  struct textlayout *tl = NULL;
-  PangoLayoutIter *i = NULL;
-  PangoLayoutRun *run = NULL;
-  cairo_glyph_t *glyphs = NULL;
-  gint n_glyphs = 0;
-
-  tl = (struct textlayout *)NSA_GET_TEXT_LAYOUT_PTR (env, obj);
-
-  g_assert (cr != NULL);
-  g_assert (tl != NULL);
-  g_assert (tl->pango_layout != NULL);
-
-  gdk_threads_enter ();
-
-  i = pango_layout_get_iter (tl->pango_layout);
-  g_assert (i != NULL);
-
-  cairo_translate (cr, x, y);
-
-  do 
-    {
-      run = pango_layout_iter_get_run (i);
-      if (run != NULL)
-	paint_glyph_run (cr, &glyphs, &n_glyphs, run);
-    } 
-  while (pango_layout_iter_next_run (i));
-  
-  if (glyphs != NULL)
-    g_free (glyphs);
-
-  cairo_translate (cr, -x, -y);
-  
-  pango_layout_iter_free (i);
-
-  gdk_threads_leave ();
-}
-
-static void
-paint_glyph_run(cairo_t *cr,
-		cairo_glyph_t **glyphs,
-		gint *n_glyphs,
-		PangoLayoutRun *run)
-{
-  gint i = 0;
-  gint x = 0, y = 0;
-
-  g_assert (cr != NULL);
-  g_assert (glyphs != NULL);
-  g_assert (n_glyphs != NULL);
-  g_assert (run != NULL);
-
-  if (run->glyphs != NULL && run->glyphs->num_glyphs > 0)
-    {
-      if (*n_glyphs < run->glyphs->num_glyphs)
-	{
-	  *glyphs = g_realloc(*glyphs, 
-			      (sizeof(cairo_glyph_t) 
-			       * run->glyphs->num_glyphs));
-	  *n_glyphs = run->glyphs->num_glyphs;
-	}
-      
-      g_assert (*glyphs != NULL);
-
-      for (i = 0; i < run->glyphs->num_glyphs; ++i)
-	{	  
-	  (*glyphs)[i].index = run->glyphs->glyphs[i].glyph;
-
-	  (*glyphs)[i].x =
-	    ((double) (x + run->glyphs->glyphs[i].geometry.x_offset)) 
-	    / ((double) PANGO_SCALE);
-
-	  (*glyphs)[i].y =
-	    ((double) (y + run->glyphs->glyphs[i].geometry.y_offset)) 
-	    / ((double) PANGO_SCALE);
-	  
-	  x += run->glyphs->glyphs[i].geometry.width;
-	}
-      cairo_show_glyphs (cr, *glyphs, run->glyphs->num_glyphs);
-    }
-}
-
-/* GetOutline code follows ****************************/
-/********* Freetype callback functions *****************************/
-
-static int _moveTo( const FT_Vector* to,
-		    void *p)
-{
-  JNIEnv *env;
-  jobject obj;
-  jclass cls;
-  jmethodID method;
-  jvalue values[2];
-  generalpath *path = (generalpath *) p;
-
-  env = path->env;
-  obj = path->obj;
-
-  values[0].f = (jfloat)(to->x * path->sx + path->px);
-  values[1].f = (jfloat)(to->y * path->sy + path->py);
-
-  cls = (*env)->FindClass (env, "java/awt/geom/GeneralPath");
-  method = (*env)->GetMethodID (env, cls, "moveTo", "(FF)V");
-  (*env)->CallVoidMethodA(env, obj, method, values );
-
-  return 0;
-}
-
-static int _lineTo( const FT_Vector*  to,
-		    void *p)
-{
-  JNIEnv *env;
-  jobject obj;
-  jclass cls;
-  jmethodID method;
-  jvalue values[2];
-  generalpath *path = (generalpath *) p;
-
-  env = path->env;
-  obj = path->obj; 
-  values[0].f = (jfloat)(to->x * path->sx + path->px);
-  values[1].f = (jfloat)(to->y * path->sy + path->py);
-
-  cls = (*env)->FindClass (env, "java/awt/geom/GeneralPath");
-  method = (*env)->GetMethodID (env, cls, "lineTo", "(FF)V");
-  (*env)->CallVoidMethodA(env, obj, method, values );
-
-  return 0;
-}
-
-static int _quadTo( const FT_Vector*  cp,
-		    const FT_Vector*  to,
-		    void *p)
-{
-  JNIEnv *env;
-  jobject obj;
-  jclass cls;
-  jmethodID method;
-  jvalue values[4];
-  generalpath *path = (generalpath *) p;
-
-  env = path->env;
-  obj = path->obj;
-  values[0].f = (jfloat)(cp->x * path->sx + path->px);
-  values[1].f = (jfloat)(cp->y * path->sy + path->py);
-  values[2].f = (jfloat)(to->x * path->sx + path->px);
-  values[3].f = (jfloat)(to->y * path->sy + path->py);
-
-  cls = (*env)->FindClass (env, "java/awt/geom/GeneralPath");
-  method = (*env)->GetMethodID (env, cls, "quadTo", "(FFFF)V");
-  (*env)->CallVoidMethodA(env, obj, method, values );
-
-  return 0;
-}
-
-static int _curveTo( const FT_Vector*  cp1,
-		     const FT_Vector*  cp2,
-		     const FT_Vector*  to,
-		     void *p)
-{
-  JNIEnv *env;
-  jobject obj;
-  jclass cls;
-  jmethodID method;
-  jvalue values[6];
-  generalpath *path = (generalpath *) p;
-
-  env = path->env;
-  obj = path->obj;
-  values[0].f = (jfloat)(cp1->x * path->sx + path->px);
-  values[1].f = (jfloat)(cp1->y * path->sy + path->py);
-  values[2].f = (jfloat)(cp2->x * path->sx + path->px);
-  values[3].f = (jfloat)(cp2->y * path->sy + path->py);
-  values[4].f = (jfloat)(to->x * path->sx + path->px);
-  values[5].f = (jfloat)(to->y * path->sy + path->py);
-
-  cls = (*env)->FindClass (env, "java/awt/geom/GeneralPath");
-  method = (*env)->GetMethodID (env, cls, "curveTo", "(FFFFFF)V");
-  (*env)->CallVoidMethodA(env, obj, method, values );
-
-  return 0;
-}
-
-
-JNIEXPORT jobject JNICALL 
-Java_gnu_java_awt_peer_gtk_GdkTextLayout_getOutline
- (JNIEnv *env, jobject obj, jobject transform)
-{
-  struct textlayout *tl;
-  generalpath *path;
-  jobject gp;
-  GSList *current_run;
-  PangoLayoutLine *current_line;
-  FT_Outline_Funcs ftCallbacks = 
-    {
-      (FT_Outline_MoveToFunc) _moveTo,
-      (FT_Outline_LineToFunc) _lineTo,
-      (FT_Outline_ConicToFunc) _quadTo,
-      (FT_Outline_CubicToFunc) _curveTo,
-      0,
-      0
-    };
-  PangoLayoutIter* layoutIterator;
-
-  gdk_threads_enter ();
-
-  tl = (struct textlayout *)NSA_GET_TEXT_LAYOUT_PTR (env, obj);
-  g_assert(tl != NULL);
-  g_assert(tl->pango_layout != NULL);
-
-  path = g_malloc0 (sizeof (generalpath));
-  g_assert(path != NULL);
-  path->env = env;
-
-  /* Scaling factors */
-  path->sx = PANGO_SCALE/65536.0;
-  path->sy = -PANGO_SCALE/65536.0;	      
-
-  {  /* create a GeneralPath instance */
-    jclass cls;
-    jmethodID method;
-    
-    cls = (*env)->FindClass (env, "java/awt/geom/GeneralPath");
-    method = (*env)->GetMethodID (env, cls, "<init>", "()V");
-    gp = path->obj = (*env)->NewObject (env, cls, method);
-  }
-
-  layoutIterator = pango_layout_get_iter (tl->pango_layout);
-  g_assert (layoutIterator != NULL);
-
-  if (pango_layout_iter_get_line (layoutIterator))
-    do 
-      {
-	PangoRectangle line_logical_rect;
-	current_line = pango_layout_iter_get_line (layoutIterator);
-	pango_layout_iter_get_line_extents (layoutIterator,
-					    NULL,
-					    &line_logical_rect);
-      
-	path->px = line_logical_rect.x/(double)PANGO_SCALE;
-	path->py = line_logical_rect.y/(double)PANGO_SCALE;
-
-	current_run = current_line->runs;
-	while (current_run)
-	  {
-	    FT_Face ft_face;
-	    int index;
-	    PangoGlyphItem *run = current_run->data;
-	    PangoGlyphString *glyphs = run->glyphs;
-	  
-	    PangoAnalysis *analysis = &run->item->analysis;
-	    g_assert (analysis != NULL);
-	    g_assert (analysis->font != NULL);
-	  
-	    ft_face = pango_fc_font_lock_face ((PangoFcFont *)analysis->font);
-	    g_assert (ft_face != NULL);
-
-	    for (index = 0; index < glyphs->num_glyphs; index++)
-	      {
-		FT_Glyph glyph;
-		FT_Error fterror;
-		PangoGlyphGeometry pgg = glyphs->glyphs[index].geometry;
-	      
-		fterror = FT_Load_Glyph(ft_face, 
-					(FT_UInt)(glyphs->glyphs[index].glyph), 
-					FT_LOAD_DEFAULT | FT_LOAD_NO_BITMAP);
-		g_assert(fterror == 0);
-
-		FT_Get_Glyph (ft_face->glyph, &glyph);
-		FT_Outline_Decompose (&(((FT_OutlineGlyph)glyph)->outline),
-				      &ftCallbacks, path);
-		FT_Done_Glyph (glyph);
-
-		path->px += pgg.width/(double)PANGO_SCALE;
-	      }
-
-	    pango_fc_font_unlock_face ((PangoFcFont *)analysis->font);
-	    current_run = current_run->next;
-	  }
-      } while (pango_layout_iter_next_line (layoutIterator));
-
-  g_free(path);
-  gdk_threads_leave ();
-
-  if (transform != NULL)
-    {
-      jclass cls;
-      jmethodID method;
-
-      cls = (*env)->FindClass (env, "java/awt/geom/GeneralPath");
-      method = (*env)->GetMethodID (env, cls, "transform", 
-				    "(Ljava/awt/geom/AffineTransform;)V");
-      (*env)->CallVoidMethod(env, gp, method, transform );
-    }
-
-  return gp;
-}