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

4 files changed, 4 insertions, 4 deletions

diff --git a/pango-view/viewer-pangocairo.c b/pango-view/viewer-pangocairo.c
index e3d63fed..de3fc89b 100644
--- a/pango-view/viewer-pangocairo.c
+++ b/pango-view/viewer-pangocairo.c
@@ -84,7 +84,7 @@ pangocairo_view_get_context (gpointer instance)
   CairoViewer *c = (CairoViewer *) instance;
   PangoContext *context;
 
-  context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (c->fontmap));
+  context = pango_font_map_create_context (c->fontmap);
   pango_cairo_context_set_font_options (context, c->font_options);
 
   return context;
diff --git a/pango-view/viewer-pangoft2.c b/pango-view/viewer-pangoft2.c
index a419e089..f991ad15 100644
--- a/pango-view/viewer-pangoft2.c
+++ b/pango-view/viewer-pangoft2.c
@@ -65,7 +65,7 @@ pangoft2_view_destroy (gpointer instance)
 static PangoContext *
 pangoft2_view_get_context (gpointer instance)
 {
-  return pango_ft2_font_map_create_context (PANGO_FT2_FONT_MAP (instance));
+  return pango_font_map_create_context (PANGO_FONT_MAP (instance));
 }
 
 static gpointer
diff --git a/pango-view/viewer-pangox.c b/pango-view/viewer-pangox.c
index f4ea9d29..f48081a7 100644
--- a/pango-view/viewer-pangox.c
+++ b/pango-view/viewer-pangox.c
@@ -42,7 +42,7 @@ pangox_view_get_context (gpointer instance)
   PangoContext *context;
   PangoMatrix matrix = {0., 0., 0., 0., 0., 0.};
 
-  context = pango_x_get_context (x->display);
+  context = pango_font_map_create_context (pango_x_font_map_for_display (x->display));
 
   /* We set an all-zero matrix on the context, to negotiate that
    * this backend doesn't support transformations.
diff --git a/pango-view/viewer-pangoxft.c b/pango-view/viewer-pangoxft.c
index 815aa887..1a10f5c4 100644
--- a/pango-view/viewer-pangoxft.c
+++ b/pango-view/viewer-pangoxft.c
@@ -72,7 +72,7 @@ pangoxft_view_get_context (gpointer instance)
 {
   XViewer *x = (XViewer *) instance;
 
-  return pango_xft_get_context (x->display, x->screen);
+  return pango_font_map_create_context (pango_xft_get_font_map (x->display, x->screen));
 }
 
 typedef struct