[gtkglarea/jjardon/gtk3: 4/9] Remove GdkFont related API
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkglarea/jjardon/gtk3: 4/9] Remove GdkFont related API
- Date: Thu, 20 Mar 2014 02:41:21 +0000 (UTC)
commit 17f30c9e96a63eb63c4497fbc7f9058233952f69
Author: Javier Jardón <jjardon gnome org>
Date: Wed Mar 19 22:47:15 2014 +0000
Remove GdkFont related API
docs/gdkgl.txt | 38 -----------
examples/README | 9 ---
examples/gdkfont.c | 182 ----------------------------------------------------
gtkgl/gdkgl.c | 22 ------
gtkgl/gdkgl.h | 4 -
5 files changed, 0 insertions(+), 255 deletions(-)
---
diff --git a/docs/gdkgl.txt b/docs/gdkgl.txt
index 342127c..ea23439 100644
--- a/docs/gdkgl.txt
+++ b/docs/gdkgl.txt
@@ -340,41 +340,3 @@ DESCRIPTION
SEE ALSO
glXMakeCurrent
gdk_gl_make_current
-
-
-
----------------------------------------------------------------
-
-NAME
- gdk_gl_use_gdk_font
-
-C SPECIFICATION
- void gdk_gl_use_gdk_font( GdkFont *font,
- int first,
- int count,
- int list_base )
-
-
-PARAMETERS
-
-font
- Pointer to GdkFont structure, font type must be GDK_FONT_FONT.
-
-first
- Specifies the index of the first font glyph to be taken
-
-count
- Specifies the number of glyphs to be taken.
-
-list_base
- Specifies the index of the first display list to be generated.
-
-DESCRIPTION
- gdk_gl_use_gdk_font generates count display lists, named list_base
- through list_base+count-1, each containing a single glBitmap command.
-
- gdk_gl_use_gdk_font is ignored if there is no current context.
-
-
-SEE ALSO
- glXUseXFont
diff --git a/examples/README b/examples/README
index 9502c3e..f6585e8 100644
--- a/examples/README
+++ b/examples/README
@@ -12,15 +12,6 @@ Even better example than simple.
-gdkfont
--------
-
-Usage: gdkfont [fontname]
-
-Shows how to turn GdkFont to display lists using gdk_gl_use_gdk_font
-function.
-
-
glpixmap
--------
diff --git a/gtkgl/gdkgl.c b/gtkgl/gdkgl.c
index b5d5ebd..6e8613e 100644
--- a/gtkgl/gdkgl.c
+++ b/gtkgl/gdkgl.c
@@ -672,28 +672,6 @@ gint gdk_gl_pixmap_make_current(GdkGLPixmap *glpixmap, GdkGLContext *context)
#endif
}
-/*
- * Font support
- */
-
-void gdk_gl_use_gdk_font(GdkFont *font, int first, int count, int list_base)
-{
-#if defined GDK_WINDOWING_WIN32
- HDC dc = CreateCompatibleDC (NULL);
- HFONT old_font = SelectObject (dc, (void *)gdk_font_id (font));
-
- wglUseFontBitmaps (dc, first, count, list_base);
-
- SelectObject (dc, old_font);
- DeleteDC (dc);
-#elif defined GDK_WINDOWING_X11
- g_return_if_fail(font != NULL);
- glXUseXFont(gdk_font_id(font), first, count, list_base);
-#else
- g_warning ("gdk_gl_use_gdk_font not implemented on " PLATFORM);
-#endif
-}
-
/*
* Helper functions
diff --git a/gtkgl/gdkgl.h b/gtkgl/gdkgl.h
index 29068fa..ad20bb8 100644
--- a/gtkgl/gdkgl.h
+++ b/gtkgl/gdkgl.h
@@ -115,10 +115,6 @@ GdkGLPixmap *gdk_gl_pixmap_new(GdkVisual *visual, GdkPixmap *pixmap);
gint gdk_gl_pixmap_make_current(GdkGLPixmap *glpixmap, GdkGLContext *context);
-/* fonts */
-void gdk_gl_use_gdk_font(GdkFont *font, int first, int count, int list_base);
-
-
#ifndef GTKGL_DISABLE_DEPRECATED
# define gdk_gl_context_ref(context) g_object_ref(context)
# define gdk_gl_context_unref(context) g_object_unref(context)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]