diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-09-18 19:17:32 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-09-18 19:17:32 +0000 |
| commit | 3d1240ae397d1637be6887815221bc17112ad4ce (patch) | |
| tree | 1d71eb13e526ac0b3a19b2aaba0610160976c81e /pango/pangoxft.h | |
| parent | d3d211a0e8ce537da876ddce7c442b2d4a6197a6 (diff) | |
| parent | e023cf0d66b323359740c453481507ab91005a34 (diff) | |
| download | pango-3d1240ae397d1637be6887815221bc17112ad4ce.tar.gz | |
Merge branch 'ch/83' into 'master'
Add pango_fc_font_map_set_default_substitute
Closes #83
See merge request GNOME/pango!191
Diffstat (limited to 'pango/pangoxft.h')
| -rw-r--r-- | pango/pangoxft.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pango/pangoxft.h b/pango/pangoxft.h index f14b89c9..708629cc 100644 --- a/pango/pangoxft.h +++ b/pango/pangoxft.h @@ -23,6 +23,7 @@ #ifndef __PANGOXFT_H__ #define __PANGOXFT_H__ +#include <pango/pangofc-fontmap.h> #include <pango/pango-context.h> #include <pango/pango-ot.h> #include <pango/pangofc-font.h> @@ -84,8 +85,7 @@ typedef struct _PangoXftFont PangoXftFont; * * Function type for doing final config tweaking on prepared FcPatterns. */ -typedef void (*PangoXftSubstituteFunc) (FcPattern *pattern, - gpointer data); +typedef PangoFcSubstituteFunc PangoXftSubstituteFunc; /* Calls for applications */ @@ -101,6 +101,7 @@ PANGO_AVAILABLE_IN_1_2 void pango_xft_shutdown_display (Display *display, int screen); +#ifndef PANGO_DISABLE_DEPRECATED PANGO_AVAILABLE_IN_1_2 void pango_xft_set_default_substitute (Display *display, int screen, @@ -110,6 +111,7 @@ void pango_xft_set_default_substitute (Display *display, PANGO_AVAILABLE_IN_1_2 void pango_xft_substitute_changed (Display *display, int screen); +#endif PANGO_AVAILABLE_IN_ALL GType pango_xft_font_map_get_type (void) G_GNUC_CONST; |