summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2011-04-30 03:19:10 +0100
committerJavier Jardón <jjardon@gnome.org>2011-04-30 12:48:07 +0100
commit9a2a18ddd107370adbe4194e19cda136c1e507f4 (patch)
tree4e3475f1e0da41461aeb955a6da71cb4d7b78259
parentf646ce13531b046a7c2530df2253e6b61362f0fb (diff)
downloadpango-9a2a18ddd107370adbe4194e19cda136c1e507f4.tar.gz
Use G_DEFINE_INTERFACE in PangoCairoFont
-rw-r--r--pango/pangocairo-font.c34
1 files changed, 6 insertions, 28 deletions
diff --git a/pango/pangocairo-font.c b/pango/pangocairo-font.c
index df0a7777..8dc8df04 100644
--- a/pango/pangocairo-font.c
+++ b/pango/pangocairo-font.c
@@ -34,37 +34,15 @@
G_STRUCT_MEMBER_P (font, \
PANGO_CAIRO_FONT_GET_IFACE(PANGO_CAIRO_FONT(font))->cf_priv_offset)))
-GType
-pango_cairo_font_get_type (void)
-{
- static GType cairo_font_type = 0;
-
- if (! cairo_font_type)
- {
- const GTypeInfo cairo_font_info =
- {
- sizeof (PangoCairoFontIface), /* class_size */
- NULL, /* base_init */
- NULL, /* base_finalize */
- NULL,
- NULL, /* class_finalize */
- NULL, /* class_data */
- 0,
- 0,
- NULL,
- NULL
- };
-
- cairo_font_type =
- g_type_register_static (G_TYPE_INTERFACE, I_("PangoCairoFont"),
- &cairo_font_info, 0);
-
- g_type_interface_add_prerequisite (cairo_font_type, PANGO_TYPE_FONT);
- }
+typedef PangoCairoFontIface PangoCairoFontInterface;
+G_DEFINE_INTERFACE (PangoCairoFont, pango_cairo_font, PANGO_TYPE_FONT)
- return cairo_font_type;
+static void
+pango_cairo_font_default_init (PangoCairoFontIface *iface)
+{
}
+
static PangoCairoFontPrivateScaledFontData *
_pango_cairo_font_private_scaled_font_data_create (void)
{