summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-11-01 13:43:04 -0400
committerMatthias Clasen <mclasen@redhat.com>2019-11-01 13:49:04 -0400
commit91d02f6a9e5e354c6d1fd18ed0395702cd349771 (patch)
tree8215fd9ea3815fb4fdfbd6fa4b058d1d2e19f565
parent6267114d48036c2dbbece893b97ae7bc5ed85762 (diff)
downloadpango-91d02f6a9e5e354c6d1fd18ed0395702cd349771.tar.gz
Undo fontset deprecations
PangoFontsetSimple is used by the win32 fontmap implementation, so deprecating it is impractical.
-rw-r--r--pango/pango-fontset.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/pango/pango-fontset.h b/pango/pango-fontset.h
index 4f2590b5..ce7d4107 100644
--- a/pango/pango-fontset.h
+++ b/pango/pango-fontset.h
@@ -69,8 +69,6 @@ typedef gboolean (*PangoFontsetForeachFunc) (PangoFontset *fontset,
PangoFont *font,
gpointer user_data);
-#ifndef PANGO_DISABLE_DEPRECATED
-
/**
* PangoFontset:
*
@@ -145,19 +143,17 @@ typedef struct _PangoFontsetSimple PangoFontsetSimple;
typedef struct _PangoFontsetSimpleClass PangoFontsetSimpleClass;
-PANGO_DEPRECATED_IN_1_44
+PANGO_AVAILABLE_IN_ALL
GType pango_fontset_simple_get_type (void) G_GNUC_CONST;
-PANGO_DEPRECATED_IN_1_44
+PANGO_AVAILABLE_IN_ALL
PangoFontsetSimple * pango_fontset_simple_new (PangoLanguage *language);
-PANGO_DEPRECATED_IN_1_44
+PANGO_AVAILABLE_IN_ALL
void pango_fontset_simple_append (PangoFontsetSimple *fontset,
PangoFont *font);
-PANGO_DEPRECATED_IN_1_44
+PANGO_AVAILABLE_IN_ALL
int pango_fontset_simple_size (PangoFontsetSimple *fontset);
-#endif /* PANGO_DISABLE_DEPRECATED */
-
PANGO_AVAILABLE_IN_ALL
PangoFont * pango_fontset_get_font (PangoFontset *fontset,