diff options
author | Matthias Clasen <mclasen@redhat.com> | 2022-01-10 11:42:56 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2022-02-17 14:01:09 -0600 |
commit | e5642d5d52f00184390acba0b0089b8c9fbc7783 (patch) | |
tree | fdf6a212997992068ec0a0b27a79b618333f4aba | |
parent | 6199fca80806a54ed4af3f9d533babc26af64c07 (diff) | |
download | pango-e5642d5d52f00184390acba0b0089b8c9fbc7783.tar.gz |
Drop deprecated win32 api
-rw-r--r-- | pango/pangowin32.c | 70 | ||||
-rw-r--r-- | pango/pangowin32.h | 31 |
2 files changed, 0 insertions, 101 deletions
diff --git a/pango/pangowin32.c b/pango/pangowin32.c index eed92dde..d26e9aa2 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -97,22 +97,6 @@ _pango_win32_font_get_hfont (PangoFont *font) return win32font->hfont; } -/** - * pango_win32_get_context: - * - * Retrieves a `PangoContext` appropriate for rendering with Windows fonts. - * - * Return value: the new `PangoContext` - * - * Deprecated: 1.22: Use [func@Pango.Win32FontMap.for_display] followed by - * [method@Pango.FontMap.create_context] instead. - */ -PangoContext * -pango_win32_get_context (void) -{ - return pango_font_map_create_context (pango_win32_font_map_for_display ()); -} - G_DEFINE_TYPE (PangoWin32Font, _pango_win32_font, PANGO_TYPE_FONT) static void @@ -155,19 +139,6 @@ _pango_win32_get_display_dc (void) } /** - * pango_win32_get_dc: - * - * Obtains a handle to the Windows device context that is used by Pango. - * - * Return value: A handle to the Windows device context that is used by Pango. - **/ -HDC -pango_win32_get_dc (void) -{ - return _pango_win32_get_display_dc (); -} - -/** * pango_win32_get_debug_flag: * * Returns whether debugging is turned on. @@ -894,25 +865,6 @@ pango_win32_font_get_coverage (PangoFont *font, /* Utility functions */ /** - * pango_win32_get_unknown_glyph: - * @font: a `PangoFont` - * @wc: the Unicode character for which a glyph is needed - * - * Returns the index of a glyph suitable for drawing @wc as an - * unknown character. - * - * Use PANGO_GET_UNKNOWN_GLYPH() instead. - * - * Return value: a glyph index into @font - */ -PangoGlyph -pango_win32_get_unknown_glyph (PangoFont *font, - gunichar wc) -{ - return PANGO_GET_UNKNOWN_GLYPH (wc); -} - -/** * pango_win32_render_layout_line: * @hdc: DC to use for drawing * @line: a `PangoLayoutLine` @@ -1175,28 +1127,6 @@ pango_win32_get_item_properties (PangoItem *item, } } -/** - * pango_win32_font_get_glyph_index: - * @font: a `PangoFont` - * @wc: a Unicode character - * - * Obtains the index of the glyph for @wc in @font, or 0, if not - * covered. - * - * Return value: the glyph index for @wc. - */ -gint -pango_win32_font_get_glyph_index (PangoFont *font, - gunichar wc) -{ - hb_font_t *hb_font = pango_font_get_hb_font (font); - hb_codepoint_t glyph = 0; - - hb_font_get_nominal_glyph (hb_font, wc, &glyph); - - return glyph; -} - /* * Swap HarfBuzz-style tags to tags that GetFontData() understands, * adapted from https://github.com/harfbuzz/harfbuzz/pull/1832, diff --git a/pango/pangowin32.h b/pango/pangowin32.h index a2045f0f..4c36b280 100644 --- a/pango/pangowin32.h +++ b/pango/pangowin32.h @@ -39,10 +39,6 @@ G_BEGIN_DECLS /* Calls for applications */ -#ifndef PANGO_DISABLE_DEPRECATED -PANGO_DEPRECATED_FOR(pango_font_map_create_context) -PangoContext * pango_win32_get_context (void); -#endif PANGO_AVAILABLE_IN_ALL void pango_win32_render (HDC hdc, @@ -69,33 +65,6 @@ void pango_win32_render_transformed (HDC hdc, int x, int y); -#ifndef PANGO_DISABLE_DEPRECATED - -/* For shape engines - */ - -PANGO_DEPRECATED_FOR(PANGO_GET_UNKNOWN_GLYPH) -PangoGlyph pango_win32_get_unknown_glyph (PangoFont *font, - gunichar wc); -PANGO_DEPRECATED -gint pango_win32_font_get_glyph_index(PangoFont *font, - gunichar wc); - -PANGO_DEPRECATED -HDC pango_win32_get_dc (void); - -PANGO_DEPRECATED -gboolean pango_win32_get_debug_flag (void); - -PANGO_DEPRECATED -gboolean pango_win32_font_select_font (PangoFont *font, - HDC hdc); -PANGO_DEPRECATED -void pango_win32_font_done_font (PangoFont *font); -PANGO_DEPRECATED -double pango_win32_font_get_metrics_factor (PangoFont *font); - -#endif /* API for libraries that want to use PangoWin32 mixed with classic * Win32 fonts. |