GNOME.org
 

[gtk+] Remove deprecated GdkFont

commit 655dcff09622777765f32d84549a7779c78147a5
Author: Christian Dywan <christian lanedo com>
Date:   Wed Apr 28 21:28:06 2010 +0200

    Remove deprecated GdkFont
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=604196
    
    Signed-off-by: Javier Jardón <jjardon gnome org>

 docs/reference/gdk/gdk3-sections.txt |   23 -
 docs/reference/gdk/tmpl/fonts.sgml   |  334 --------
 gdk/Makefile.am                      |    2 -
 gdk/directfb/Makefile.am             |    1 -
 gdk/directfb/TODO                    |    1 -
 gdk/directfb/gdkfont-directfb.c      |  176 ----
 gdk/gdk.h                            |    1 -
 gdk/gdk.symbols                      |   21 -
 gdk/gdkfont.c                        |   90 ---
 gdk/gdkfont.h                        |   81 --
 gdk/gdkinternals.h                   |   14 -
 gdk/gdktypes.h                       |    1 -
 gdk/makefile.msc                     |    2 -
 gdk/quartz/Makefile.am               |    1 -
 gdk/quartz/gdkfont-quartz.c          |   74 --
 gdk/win32/Makefile.am                |    1 -
 gdk/win32/gdkfont-win32.c            | 1461 ----------------------------------
 gdk/win32/gdkprivate-win32.h         |   21 -
 gdk/win32/makefile.msc               |    1 -
 gdk/x11/Makefile.am                  |    1 -
 gdk/x11/gdkfont-x11.c                |  407 ----------
 gdk/x11/gdkxid.c                     |    4 +-
 22 files changed, 2 insertions(+), 2716 deletions(-)
---
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index 35b29e1..2e062f2 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -74,7 +74,6 @@ gdk_extension_mode_get_type
 gdk_fill_get_type
 gdk_fill_rule_get_type
 gdk_filter_return_get_type
-gdk_font_type_get_type
 gdk_function_get_type
 gdk_gc_values_mask_get_type
 gdk_grab_ownership_get_type
@@ -395,28 +394,6 @@ gdk_color_get_type
 </SECTION>
 
 <SECTION>
-<TITLE>Fonts</TITLE>
-<FILE>fonts</FILE>
-GdkFont
-GdkFontType
-gdk_font_load
-gdk_fontset_load
-gdk_fontset_load_for_display
-gdk_font_get_display
-gdk_font_ref
-gdk_font_unref
-gdk_font_id
-gdk_font_equal
-
-<SUBSECTION Standard>
-GDK_TYPE_FONT
-GDK_TYPE_FONT_TYPE
-
-<SUBSECTION Private>
-gdk_font_get_type
-</SECTION>
-
-<SECTION>
 <TITLE>Drawing Primitives</TITLE>
 <FILE>drawing</FILE>
 GdkDrawable
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index b4fbbc7..4073d95 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -82,7 +82,6 @@ gdk_public_h_sources =				\
 	gdkdnd.h				\
 	gdkdrawable.h				\
 	gdkevents.h				\
-	gdkfont.h				\
 	gdkgc.h					\
 	gdkimage.h				\
 	gdkinput.h				\
@@ -130,7 +129,6 @@ gdk_c_sources =                 \
 	gdkdnd.c		\
 	gdkdraw.c		\
 	gdkevents.c     	\
-	gdkfont.c		\
 	gdkgc.c			\
 	gdkglobals.c		\
 	gdkimage.c		\
diff --git a/gdk/directfb/Makefile.am b/gdk/directfb/Makefile.am
index be2bf25..57d3fed 100644
--- a/gdk/directfb/Makefile.am
+++ b/gdk/directfb/Makefile.am
@@ -27,7 +27,6 @@ libgdk_directfb_la_SOURCES =	\
 	gdkdisplay-directfb.h   \
 	gdkdrawable-directfb.c	\
 	gdkevents-directfb.c	\
-	gdkfont-directfb.c	\
 	gdkgc-directfb.c	\
 	gdkgeometry-directfb.c	\
 	gdkglobals-directfb.c	\
diff --git a/gdk/directfb/TODO b/gdk/directfb/TODO
index db0eb77..10215d3 100644
--- a/gdk/directfb/TODO
+++ b/gdk/directfb/TODO
@@ -31,7 +31,6 @@ gdkdisplay-directfb.c
 gdkdnd-directfb.c
 gdkdrawable-directfb.c
 gdkevents-directfb.c
-gdkfont-directfb.c
 gdkgc-directfb.c
 gdkgeometry-directfb.c
 gdkglobals-directfb.c
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 199e567..62c2e89 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -41,7 +41,6 @@
 #include <gdk/gdkdrawable.h>
 #include <gdk/gdkenumtypes.h>
 #include <gdk/gdkevents.h>
-#include <gdk/gdkfont.h>
 #include <gdk/gdkgc.h>
 #include <gdk/gdkimage.h>
 #include <gdk/gdkinput.h>
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index bfb1d76..81626e8 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -279,7 +279,6 @@ gdk_subwindow_mode_get_type G_GNUC_CONST
 gdk_visibility_state_get_type G_GNUC_CONST
 gdk_wm_decoration_get_type G_GNUC_CONST
 gdk_wm_function_get_type G_GNUC_CONST
-gdk_font_type_get_type G_GNUC_CONST
 gdk_cursor_type_get_type G_GNUC_CONST
 gdk_drag_action_get_type G_GNUC_CONST
 gdk_gc_values_mask_get_type G_GNUC_CONST
@@ -295,26 +294,6 @@ gdk_visual_type_get_type G_GNUC_CONST
 #endif
 #endif
 
-#if IN_HEADER(__GDK_FONT_H__)
-#if IN_FILE(__GDK_FONT_C__)
-gdk_font_get_type G_GNUC_CONST
-gdk_font_ref
-gdk_font_unref
-#endif
-#endif
-
-#if IN_HEADER(__GDK_FONT_H__)
-#if IN_FILE(__GDK_FONT_X11_C__)
-#ifndef GDK_DISABLE_DEPRECATED
-gdk_font_get_display
-gdk_fontset_load
-#endif
-gdk_font_id
-gdk_font_equal
-gdk_fontset_load_for_display
-#endif
-#endif
-
 #if IN_HEADER(__GDK_CAIRO_H__)
 #if IN_FILE(__GDK_CAIRO_C__)
 gdk_cairo_create
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 01d3f88..4ddd327 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -89,18 +89,6 @@ typedef enum {
   GDK_DEBUG_EVENTLOOP     = 1 <<15
 } GdkDebugFlag;
 
-#ifndef GDK_DISABLE_DEPRECATED
-
-typedef struct _GdkFontPrivate	       GdkFontPrivate;
-
-struct _GdkFontPrivate
-{
-  GdkFont font;
-  guint ref_count;
-};
-
-#endif /* GDK_DISABLE_DEPRECATED */
-
 extern GList            *_gdk_default_filters;
 extern GdkWindow  	*_gdk_parent_root;
 extern gint		 _gdk_error_code;
@@ -452,8 +440,6 @@ void         _gdk_drawable_end_direct_draw (gpointer priv_data);
  *****************************************/
 
 /* Font/string functions implemented in module-specific code */
-gint _gdk_font_strlen (GdkFont *font, const char *str);
-void _gdk_font_destroy (GdkFont *font);
 
 void _gdk_colormap_real_destroy (GdkColormap *colormap);
 
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index c82c9f3..d33e6e7 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -102,7 +102,6 @@ typedef guint32 GdkNativeWindow;
 typedef struct _GdkColor	      GdkColor;
 typedef struct _GdkColormap	      GdkColormap;
 typedef struct _GdkCursor	      GdkCursor;
-typedef struct _GdkFont		      GdkFont;
 typedef struct _GdkGC                 GdkGC;
 typedef struct _GdkImage              GdkImage;
 typedef struct _GdkRegion             GdkRegion;
diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index 4599fb9..73b181f 100644
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -75,7 +75,6 @@ gdk_OBJECTS = \
 	gdkdraw.obj \
 	gdkenumtypes.obj \
 	gdkevents.obj \
-	gdkfont.obj \
 	gdkgc.obj \
 	gdkglobals.obj \
 	gdkimage.obj \
@@ -105,7 +104,6 @@ gdk_public_h_sources = \
 	gdkdnd.h	\
 	gdkdrawable.h	\
 	gdkevents.h	\
-	gdkfont.h	\
 	gdkgc.h		\
 	gdkkeysyms.h	\
 	gdkimage.h	\
diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 363090b..6a45b48 100644
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -32,7 +32,6 @@ libgdk_quartz_la_SOURCES =    	\
 	gdkdrawable-quartz.h	\
 	gdkevents-quartz.c	\
 	gdkeventloop-quartz.c	\
-	gdkfont-quartz.c	\
 	gdkgc-quartz.c		\
 	gdkgeometry-quartz.c	\
 	gdkglobals-quartz.c	\
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 0772dbe..0992473 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -40,7 +40,6 @@ libgdk_win32_la_SOURCES = \
 	gdkdrawable-win32.c \
 	gdkdrawable-win32.h \
 	gdkevents-win32.c \
-	gdkfont-win32.c \
 	gdkgc-win32.c \
 	gdkgeometry-win32.c \
 	gdkglobals-win32.c \
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index a4de788..031ef72 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -120,7 +120,6 @@ GdkScreen *GDK_WINDOW_SCREEN(GObject *win);
 typedef struct _GdkColormapPrivateWin32 GdkColormapPrivateWin32;
 typedef struct _GdkCursorPrivate        GdkCursorPrivate;
 typedef struct _GdkWin32SingleFont      GdkWin32SingleFont;
-typedef struct _GdkFontPrivateWin32     GdkFontPrivateWin32;
 typedef struct _GdkGCWin32		GdkGCWin32;
 typedef struct _GdkGCWin32Class		GdkGCWin32Class;
 
@@ -138,17 +137,6 @@ struct _GdkWin32SingleFont
   FONTSIGNATURE fs;
 };
 
-#ifndef GDK_DISABLE_DEPRECATED
-
-struct _GdkFontPrivateWin32
-{
-  GdkFontPrivate base;
-  GSList *fonts;		/* List of GdkWin32SingleFonts */
-  GSList *names;
-};
-
-#endif /* GDK_DISABLE_DEPRECATED */
-
 struct _GdkVisualClass
 {
   GObjectClass parent_class;
@@ -292,15 +280,6 @@ void    _gdk_selection_property_delete (GdkWindow *);
 
 void    _gdk_dropfiles_store (gchar *data);
 
-void    _gdk_wchar_text_handle    (GdkFont       *font,
-				   const wchar_t *wcstr,
-				   int            wclen,
-				   void         (*handler)(GdkWin32SingleFont *,
-							   const wchar_t *,
-							   int,
-							   void *),
-				   void          *arg);
-
 void       _gdk_push_modal_window   (GdkWindow *window);
 void       _gdk_remove_modal_window (GdkWindow *window);
 GdkWindow *_gdk_modal_current       (void);
diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc
index 5a4fa41..1b3a993 100644
--- a/gdk/win32/makefile.msc
+++ b/gdk/win32/makefile.msc
@@ -38,7 +38,6 @@ gdk_win32_OBJECTS = \
 	gdkdisplay-win32.obj \
 	gdkdrawable-win32.obj \
 	gdkevents-win32.obj \
-	gdkfont-win32.obj \
 	gdkgc-win32.obj \
 	gdkgeometry-win32.obj \
 	gdkglobals-win32.obj \
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 394da95..31d61a6 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -37,7 +37,6 @@ libgdk_x11_la_SOURCES =    	\
 	gdkeventsource.h	\
 	gdkeventtranslator.c	\
 	gdkeventtranslator.h	\
-	gdkfont-x11.c	   	\
 	gdkgc-x11.c 	   	\
 	gdkgeometry-x11.c  	\
 	gdkglobals-x11.c   	\
diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index c53ee38..85c82bb 100644
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -85,7 +85,7 @@ _gdk_xid_table_remove (GdkDisplay *display,
  * Returns the GDK object associated with the given X id.
  *
  * Return value: the associated Gdk object, which may be a #GdkPixmap,
- *     a #GdkWindow or a #GdkFont or %NULL if no object is associated
+ *     a #GdkWindow or %NULL if no object is associated
  *     with the X id.
  *
  * Since: 2.2
@@ -116,7 +116,7 @@ gdk_xid_table_lookup_for_display (GdkDisplay  *display,
  * display.
  *
  * Return value: the associated Gdk object, which may be a #GdkPixmap,
- *     a #GdkWindow or a #GdkFont or %NULL if no object is associated
+ *     a #GdkWindow or %NULL if no object is associated
  *     with the X id.
  */
 gpointer
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]