[pangomm] Added conversions used by gtkmm.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pangomm] Added conversions used by gtkmm.
- Date: Fri, 7 Jan 2011 23:11:47 +0000 (UTC)
commit 59d95584e18b8cd986d9c4916f2c3c66588203d1
Author: Murray Cumming <murrayc murrayc com>
Date: Sat Jan 8 00:07:46 2011 +0100
Added conversions used by gtkmm.
* tools/m4/convert_pango.m4: Added the extra conversions that were in the
gtkmm copy of this file. They will probably be needed by other modules so
it makes sense to keep them to here to avoid duplication.
ChangeLog | 8 ++++++++
tools/m4/convert_pango.m4 | 6 ++++++
2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 559d72d..ecb3155 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-08 Murray Cumming <murrayc murrayc com>
+
+ Added conversions used by gtkmm.
+
+ * tools/m4/convert_pango.m4: Added the extra conversions that were in the
+ gtkmm copy of this file. They will probably be needed by other modules so
+ it makes sense to keep them to here to avoid duplication.
+
2011-01-07 Murray Cumming <murrayc murrayc com>
Allow other modules to use the m4 files.
diff --git a/tools/m4/convert_pango.m4 b/tools/m4/convert_pango.m4
index 9b30df1..a1b72d1 100644
--- a/tools/m4/convert_pango.m4
+++ b/tools/m4/convert_pango.m4
@@ -44,6 +44,7 @@ _CONVERSION(`const PangoFontDescription*',`FontDescription',`FontDescription(con
_CONVERSION(`Pango::FontDescription&',`PangoFontDescription*',`($3).gobj()')
_CONVERSION(`FontDescription&',`PangoFontDescription*',`($3).gobj()')
_CONVERSION(`const FontDescription&',`const PangoFontDescription*',`($3).gobj()')
+_CONVERSION(`const Pango::FontDescription&',`const PangoFontDescription*',`($3).gobj()')
_CONVERSION(`const Pango::FontDescription&',`PangoFontDescription*',`const_cast<PangoFontDescription*>(`($3).gobj()')')
_CONVERSION(`const FontDescription&',`PangoFontDescription*',`const_cast<PangoFontDescription*>(`($3).gobj()')')
@@ -99,6 +100,11 @@ _CONVERSION(`const Glib::RefPtr<const Font>&',`PangoFont*',__CONVERT_CONST_REFPT
#_CONVERSION(`const Glib::RefPtr<const Font>&',`PangoFont*',__CONVERT_CONST_REFPTR_TO_P)
_CONVERSION(`const Glib::RefPtr<const Pango::Font>&',`PangoFont*',__CONVERT_CONST_REFPTR_TO_P_SUN(Pango::Font))
+_CONVERSION(`PangoFontFace*',`Glib::RefPtr<Pango::FontFace>',Glib::wrap($3))
+_CONVERSION(`PangoFontFace*',`Glib::RefPtr<const Pango::FontFace>',Glib::wrap($3))
+_CONVERSION(`PangoFontFamily*',`Glib::RefPtr<Pango::FontFamily>',Glib::wrap($3))
+_CONVERSION(`PangoFontFamily*',`Glib::RefPtr<const Pango::FontFamily>',Glib::wrap($3))
+
_CONVERSION(`PangoFontMap*',`Glib::RefPtr<FontMap>',Glib::wrap($3))
_CONVERSION(`PangoFontMap*',`Glib::RefPtr<const FontMap>',Glib::wrap($3))
_CONVERSION(`const Glib::RefPtr<FontMap>&',`PangoFontMap*',__CONVERT_REFPTR_TO_P)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]