diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-11-01 17:46:42 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-11-01 17:46:42 +0000 |
| commit | 7936665fccec5ad2cd832e6a4d0c0675e925734b (patch) | |
| tree | d56f6c0357effa76e13d9295f6b486d7c956ffb3 | |
| parent | b65bfd50da64dc207d9936a0a53abcd8462a87f8 (diff) | |
| parent | b146c2154c174c6ec3f504cb741339386fe655ba (diff) | |
| download | pango-7936665fccec5ad2cd832e6a4d0c0675e925734b.tar.gz | |
Merge branch 'fontset-revive' into 'master'
Undo fontset deprecations
See merge request GNOME/pango!156
| -rw-r--r-- | pango/pango-fontset.h | 12 |
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, |