Commit 218aad0f authored by Matthias Clasen's avatar Matthias Clasen

Merge branch 'matthiasc/for-master' into 'master'

Matthiasc/for master

See merge request !243
parents 3d1240ae e8181138
Pipeline #214896 passed with stages
in 1 minute and 19 seconds
......@@ -128,9 +128,9 @@ typedef void (*PangoFcSubstituteFunc) (FcPattern *pattern,
* the font. This function can be used to do things like set
* hinting and antialiasing options.
*
* Since: 1.46
* Since: 1.48
*/
PANGO_AVAILABLE_IN_1_46
PANGO_AVAILABLE_IN_1_48
void pango_fc_font_map_set_default_substitute (PangoFcFontMap *fontmap,
PangoFcSubstituteFunc func,
gpointer data,
......@@ -146,9 +146,9 @@ void pango_fc_font_map_set_default_substitute (PangoFcFontMap *fontmap,
* That is, if your substitution function will return different
* results for the same input pattern, you must call this function.
*
* Since: 1.46
* Since: 1.48
*/
PANGO_AVAILABLE_IN_1_46
PANGO_AVAILABLE_IN_1_48
void pango_fc_font_map_substitute_changed (PangoFcFontMap *fontmap);
/**
......
......@@ -116,12 +116,12 @@ void pango_ft2_font_map_set_resolution (PangoFT2FontMap
double dpi_x,
double dpi_y);
#ifndef PANGO_DISABLE_DEPRECATED
PANGO_AVAILABLE_IN_1_2
PANGO_DEPRECATED_IN_1_48_FOR(pango_fc_font_map_set_default_substitute)
void pango_ft2_font_map_set_default_substitute (PangoFT2FontMap *fontmap,
PangoFT2SubstituteFunc func,
gpointer data,
GDestroyNotify notify);
PANGO_AVAILABLE_IN_1_2
PANGO_DEPRECATED_IN_1_48_FOR(pango_fc_font_map_substitute_changed)
void pango_ft2_font_map_substitute_changed (PangoFT2FontMap *fontmap);
PANGO_DEPRECATED_IN_1_22_FOR(pango_font_map_create_context)
PangoContext *pango_ft2_font_map_create_context (PangoFT2FontMap *fontmap);
......
......@@ -102,13 +102,13 @@ void pango_xft_shutdown_display (Display *display,
int screen);
#ifndef PANGO_DISABLE_DEPRECATED
PANGO_AVAILABLE_IN_1_2
PANGO_DEPRECATED_IN_1_48_FOR(pango_fc_font_map_set_default_substitute)
void pango_xft_set_default_substitute (Display *display,
int screen,
PangoXftSubstituteFunc func,
gpointer data,
GDestroyNotify notify);
PANGO_AVAILABLE_IN_1_2
PANGO_DEPRECATED_IN_1_48_FOR(pango_fc_font_map_substitute_changed)
void pango_xft_substitute_changed (Display *display,
int screen);
#endif
......
......@@ -51,7 +51,7 @@ pangoft2_view_create (const PangoViewer *klass G_GNUC_UNUSED)
fontmap = pango_ft2_font_map_new ();
pango_ft2_font_map_set_resolution (PANGO_FT2_FONT_MAP (fontmap), opt_dpi, opt_dpi);
pango_ft2_font_map_set_default_substitute (PANGO_FT2_FONT_MAP (fontmap), substitute_func, NULL, NULL);
pango_fc_font_map_set_default_substitute (PANGO_FC_FONT_MAP (fontmap), substitute_func, NULL, NULL);
return fontmap;
}
......
......@@ -51,8 +51,8 @@ pangoxft_view_create (const PangoViewer *klass)
XftInit (NULL);
pango_xft_set_default_substitute (instance->display, instance->screen,
default_substitute, NULL, NULL);
pango_fc_font_map_set_default_substitute (PANGO_FC_FONT_MAP (pango_xft_get_font_map (instance->display, instance->screen)),
default_substitute, NULL, NULL);
return instance;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment