[pangomm] Wrap pango_font_map_create_context()



commit a7c6955ce3ef112454d29147b35f4e9fff83ccae
Author: Daniel Elstner <danielk openismus com>
Date:   Tue Aug 11 20:05:50 2009 +0200

    Wrap pango_font_map_create_context()
    
    * pango/src/fontmap.hg (FontMap::create_context): Wrap new
    pango_font_map_create_context() method.
    * pango/src/cairofontmap.{ccg,hg} (CairoFontMap::create_context):
    Wrap method manually in terms of pango_font_map_create_context(),
    so that it longer uses deprecated API.  The wrapper method should
    be removed altogether when we can break API and ABI.

 ChangeLog                  |   11 +++++++++++
 pango/src/cairofontmap.ccg |   12 ++++++------
 pango/src/cairofontmap.hg  |   10 ++++++----
 pango/src/fontmap.hg       |    2 ++
 4 files changed, 25 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c0ac9e7..71af0b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-08-11  Daniel Elstner  <danielk openismus com>
 
+	Wrap pango_font_map_create_context()
+
+	* pango/src/fontmap.hg (FontMap::create_context): Wrap new
+	pango_font_map_create_context() method.
+	* pango/src/cairofontmap.{ccg,hg} (CairoFontMap::create_context):
+	Wrap method manually in terms of pango_font_map_create_context(),
+	so that it longer uses deprecated API.  The wrapper method should
+	be removed altogether when we can break API and ABI.
+
+2009-08-11  Daniel Elstner  <danielk openismus com>
+
 	Fix typo in tools/m4/convert_pango.m4
 
 2009-08-11  Daniel Elstner  <danielk openismus com>
diff --git a/pango/src/cairofontmap.ccg b/pango/src/cairofontmap.ccg
index 25518db..ba5bdf8 100644
--- a/pango/src/cairofontmap.ccg
+++ b/pango/src/cairofontmap.ccg
@@ -1,8 +1,4 @@
-// -*- c++ -*-
-/* $Id: cairofontmap.ccg,v 1.1 2006/05/30 17:14:21 murrayc Exp $ */
-
-/* 
- *
+/*
  * Copyright 2001      The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -26,5 +22,9 @@
 namespace Pango
 {
 
-} /* namespace Pango */
+Glib::RefPtr<Context> CairoFontMap::create_context()
+{
+  return Glib::wrap(pango_font_map_create_context(PANGO_FONT_MAP(gobj())), false);
+}
 
+} // namespace Pango
diff --git a/pango/src/cairofontmap.hg b/pango/src/cairofontmap.hg
index 58eff05..d56fced 100644
--- a/pango/src/cairofontmap.hg
+++ b/pango/src/cairofontmap.hg
@@ -28,7 +28,7 @@ _PINCLUDE(glibmm/private/interface_p.h)
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 typedef struct _PangoCairoFontMapIface PangoCairoFontMapIface;
-#endif //DOXYGEN_SHOULD_SKIP_THIS
+#endif
 
 namespace Pango
 {
@@ -50,8 +50,10 @@ public:
 
   _WRAP_METHOD(void set_resolution(double dpi), pango_cairo_font_map_set_resolution)
   _WRAP_METHOD(double get_resolution() const, pango_cairo_font_map_get_resolution)
-  _WRAP_METHOD(Glib::RefPtr<Context> create_context(), pango_cairo_font_map_create_context)
-};
 
-} /* namespace Pango */
+  // TODO: Remove this when we can break ABI.
+  _WRAP_METHOD_DOCS_ONLY(pango_cairo_font_map_create_context)
+  Glib::RefPtr<Context> create_context();
+};
 
+} // namespace Pango
diff --git a/pango/src/fontmap.hg b/pango/src/fontmap.hg
index a340252..bcdbf3d 100644
--- a/pango/src/fontmap.hg
+++ b/pango/src/fontmap.hg
@@ -46,6 +46,8 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Font> load_font(const Glib::RefPtr<Context>& context, const FontDescription& desc) const, pango_font_map_load_font)
   _WRAP_METHOD(Glib::RefPtr<Fontset> load_fontset(const Glib::RefPtr<Context>& context, const FontDescription& desc, const Language& language) const, pango_font_map_load_fontset)
 
+  _WRAP_METHOD(Glib::RefPtr<Context> create_context(), pango_font_map_create_context)
+
   /** List all families for the fontmap.
    * @return an array of pointers to Pango::FontFamily objects.
    */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]