Make the following API public:

2008-08-05  Behdad Esfahbod  <behdad@gnome.org>

        * pango/pango-context.c:
        * pango/pango-context.h:
        Make the following API public:

                pango_context_new()
                pango_context_set_font_map()

        * pango/pango-fontmap.c (pango_font_map_create_context):
        * pango/pango-fontmap.h:
        New public API:

                pango_font_map_create_context()

        * pango/pangocairo-context.c (pango_cairo_create_context):
        * pango/pangocairo-font.c (_pango_cairo_font_get_metrics),
        (_pango_cairo_font_private_get_hex_box_info):
        * pango/pangocairo-fontmap.c (pango_cairo_font_map_create_context):
        * pango/pangocairo.h:
        Deprecate pango_cairo_font_map_create_context().

        * pango/pangofc-font.c (pango_fc_font_get_metrics):
        * pango/pangofc-fontmap.c (pango_fc_font_map_create_context):
        * pango/pangofc-fontmap.h:
        Deprecate pango_fc_font_map_create_context().

        * pango/pangoft2-fontmap.c (pango_ft2_font_map_create_context),
        (pango_ft2_get_context):
        * pango/pangoft2.h:
        Deprecate pango_ft2_font_map_create_context().

        * pango/pangowin32.c (pango_win32_get_context),
        (pango_win32_font_get_metrics):
        * pango/pangowin32.h:
        Deprecate pango_win32_get_context().

        * pango/pangoxft-font.c (_pango_xft_font_get_mini_font):
        * pango/pangoxft-fontmap.c (pango_xft_get_context):
        * pango/pangoxft.h:
        Deprecate pango_xft_get_context().

        * pango/pangox-fontmap.c (pango_x_font_map_for_display):
        * pango/pangox.c (get_context_info), (pango_x_get_context),
        (pango_x_context_set_funcs), (pango_x_render_layout_line):
        Deprecate pango_x_get_context(), again.

        * docs/pango-sections.txt:
        * docs/tmpl/fonts.sgml:
        * pango-view/viewer-pangocairo.c (pangocairo_view_get_context):
        * pango-view/viewer-pangoft2.c (pangoft2_view_get_context):
        * pango-view/viewer-pangox.c (pangox_view_get_context):
        * pango-view/viewer-pangoxft.c (pangoxft_view_get_context):
        * pango/check.defs:
        * pango/pango.def:
        Update.

svn path=/trunk/; revision=2675

1 files changed, 6 insertions, 7 deletions

diff --git a/pango/pangowin32.c b/pango/pangowin32.c
index ca441626..889472b5 100644
--- a/pango/pangowin32.c
+++ b/pango/pangowin32.c
@@ -122,17 +122,16 @@ pango_win32_get_hfont (PangoFont *font)
  *
  * Retrieves a #PangoContext appropriate for rendering with Windows fonts.
   *
+ * As of Pango 1.20 this function is deprecated.
+ * Use pango_win32_font_map_for_display() followed by
+ * pango_font_map_create_context() instead.
+ *
  * Return value: the new #PangoContext
  **/
 PangoContext *
 pango_win32_get_context (void)
 {
-  PangoContext *result;
-
-  result = pango_context_new ();
-  pango_context_set_font_map (result, pango_win32_font_map_for_display ());
-
-  return result;
+  return pango_font_map_create_context (pango_win32_font_map_for_display ());
 }
 
 G_DEFINE_TYPE (PangoWin32Font, _pango_win32_font, PANGO_TYPE_FONT)
@@ -586,7 +585,7 @@ pango_win32_font_get_metrics (PangoFont     *font,
 	      PangoLayout *layout;
 
 	      /*  Get the average width of the chars in "0123456789" */
-	      context = pango_win32_get_context ();
+	      context = pango_font_map_create_context (pango_win32_font_map_for_display ());
 	      pango_context_set_language (context, language);
 	      font_desc = pango_font_describe_with_absolute_size (font);
 	      pango_context_set_font_description (context, font_desc);