[gtkglext] [GB#604333] Remove the gdk_gl_font_use_pango_font(_for_display) API functions.

[Braden McDaniel <bradenmcd src gnome org>]

commit df7a7b35b80b395d7ba411c7f727970a46fb0588
Author: Braden McDaniel <braden endoframe com>
Date:   Mon Apr 26 00:16:15 2010 -0400

    [GB#604333] Remove the gdk_gl_font_use_pango_font(_for_display) API functions.
    
    This change eliminates GtkGLExt's reliance on the deprecated pangox interfaces.

 configure.ac                                  |   12 -
 docs/reference/gtkglext/gtkglext-docs.sgml    |    2 -
 docs/reference/gtkglext/gtkglext-sections.txt |    6 -
 examples/Makefile.am                          |    3 -
 examples/font.c                               |  357 -------------------------
 gdk/Makefile.am                               |    1 -
 gdk/gdkgl.h                                   |    1 -
 gdk/gdkglfont.h                               |   42 ---
 gdk/win32/Makefile.am                         |    1 -
 gdk/win32/gdkglfont-win32.c                   |  107 --------
 gdk/x11/Makefile.am                           |    4 +-
 gdk/x11/gdkglfont-x11.c                       |  202 --------------
 12 files changed, 1 insertions(+), 737 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0134ee7..4be9fcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -226,18 +226,6 @@ PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.8], ,
 PKG_CHECK_MODULES([GDK], [gdk-2.0], ,
                   [AS_IF([test -z "${GDK_LIBS+x}"],
                          [AC_MSG_FAILURE([GDK is required.])])])
-
-case $gdktarget in
-x11)
-  PKG_CHECK_MODULES([PANGOX],[pangox], ,
-                  [AC_MSG_FAILURE([pangox font support is required.])])
-  ;;
-win32)
-  PKG_CHECK_MODULES([PANGOWIN32],[pangowin32], ,
-                      [AC_MSG_FAILURE([pangowin32 font support is required.])])
-  ;;
-esac
-
 PKG_CHECK_MODULES([PANGOFT2], [pangoft2], ,
                   [AS_IF([test -z "${PANGOFT2_LIBS+x}"],
                          [AC_MSG_WARN([Pango Freetype support is required to build some of the examples.])])])
diff --git a/docs/reference/gtkglext/gtkglext-docs.sgml b/docs/reference/gtkglext/gtkglext-docs.sgml
index 600a4ab..73e25a4 100644
--- a/docs/reference/gtkglext/gtkglext-docs.sgml
+++ b/docs/reference/gtkglext/gtkglext-docs.sgml
@@ -14,7 +14,6 @@
 <!ENTITY gtkglext-gdkgldrawable SYSTEM "xml/gdkgldrawable.xml">
 <!ENTITY gtkglext-gdkglpixmap SYSTEM "xml/gdkglpixmap.xml">
 <!ENTITY gtkglext-gdkglwindow SYSTEM "xml/gdkglwindow.xml">
-<!ENTITY gtkglext-gdkglfont SYSTEM "xml/gdkglfont.xml">
 <!ENTITY gtkglext-gdkglx SYSTEM "xml/gdkglx.xml">
 
 <!ENTITY gtkglext-gtkgldefs SYSTEM "xml/gtkgldefs.xml">
@@ -48,7 +47,6 @@
     &gtkglext-gdkgldrawable;
     &gtkglext-gdkglpixmap;
     &gtkglext-gdkglwindow;
-    &gtkglext-gdkglfont;
     &gtkglext-gdkgltokens;
     &gtkglext-gdkglx;
     &gtkglext-gdkglversion;
diff --git a/docs/reference/gtkglext/gtkglext-sections.txt b/docs/reference/gtkglext/gtkglext-sections.txt
index c5a9ff8..ca47adb 100644
--- a/docs/reference/gtkglext/gtkglext-sections.txt
+++ b/docs/reference/gtkglext/gtkglext-sections.txt
@@ -186,12 +186,6 @@ gdk_gl_window_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gdkglfont</FILE>
-gdk_gl_font_use_pango_font
-gdk_gl_font_use_pango_font_for_display
-</SECTION>
-
-<SECTION>
 <FILE>gdkgltokens</FILE>
 GDK_GL_SUCCESS
 GDK_GL_ATTRIB_LIST_NONE
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 44c908f..b7bb072 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -77,9 +77,6 @@ endif
 noinst_PROGRAMS += color
 color_SOURCES = color.c
 
-noinst_PROGRAMS += font
-font_SOURCES = font.c
-
 if GLU
 noinst_PROGRAMS += button
 button_SOURCES = button.c
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index c787019..5b321b1 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -66,7 +66,6 @@ gdkglext_public_h_sources = \
 	gdkgldrawable.h		\
 	gdkglpixmap.h		\
 	gdkglwindow.h		\
-	gdkglfont.h		\
 	gdkglglext.h
 
 gdkglext_private_h_sources = \
diff --git a/gdk/gdkgl.h b/gdk/gdkgl.h
index c88a0ae..2c107b5 100644
--- a/gdk/gdkgl.h
+++ b/gdk/gdkgl.h
@@ -33,6 +33,5 @@
 #include <gdk/gdkgldrawable.h>
 #include <gdk/gdkglpixmap.h>
 #include <gdk/gdkglwindow.h>
-#include <gdk/gdkglfont.h>
 
 #endif /* __GDK_GL_H__ */
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 65e4c48..c8d706f 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -35,7 +35,6 @@ gdkglext_win32_c_sources = \
 	gdkgldrawable-win32.c	\
 	gdkglpixmap-win32.c	\
 	gdkglwindow-win32.c	\
-	gdkglfont-win32.c	\
 	gdkglwglext.c
 
 gdkglext_win32_headers = \
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index d311713..15bb7e1 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS = \
 	$(GDK_CFLAGS)			\
 	$(GL_CFLAGS)			\
 	$(GDKGLEXT_WIN_CFLAGS)		\
-	$(PANGOX_CFLAGS)		\
 	-DG_DISABLE_DEPRECATED		\
 	-DGDK_DISABLE_DEPRECATED	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED
@@ -37,7 +36,6 @@ gdkglext_x11_c_sources = \
 	gdkgldrawable-x11.c	\
 	gdkglpixmap-x11.c	\
 	gdkglwindow-x11.c	\
-	gdkglfont-x11.c		\
 	gdkglglxext.c
 
 gdkglext_x11_headers = \
@@ -53,5 +51,5 @@ gdkglextx11include_HEADERS = $(gdkglext_x11_headers)
 noinst_LTLIBRARIES = libgdkglext-x11.la
 
 libgdkglext_x11_la_SOURCES = $(gdkglext_x11_sources)
-libgdkglext_x11_la_LDFLAGS = $(GDK_LIBS) $(GL_LIBS) $(GDKGLEXT_WIN_LIBS) $(PANGOX_LIBS)
+libgdkglext_x11_la_LDFLAGS = $(GDK_LIBS) $(GL_LIBS) $(GDKGLEXT_WIN_LIBS)