diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-07-10 21:41:37 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-07-10 21:41:37 +0000 |
| commit | 0835f598fcfbf6667a4be9cd9e7f6f16663dcb6a (patch) | |
| tree | ff38ab996514339ab0ad7b2be560b525a6537655 /pango/pangowin32.c | |
| parent | 5bf0c1d04b6ed75ad2c88fbed1e1eaecf0dcbfa2 (diff) | |
| download | pango-0835f598fcfbf6667a4be9cd9e7f6f16663dcb6a.tar.gz | |
Make PangoMatrix arguments const where appropriate.
Sat Jul 10 17:33:38 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangoft2-private.h pango/pangoft2-render.c
pango/pango-context.[ch] pango/pangoft2.[ch] pango/pango-utils.
pango/pango-types.h pango/pangofc-fontmap.c: Make PangoMatrix
arguments const where appropriate.
* pango/pango-context.c pango/fonts.c pango/pangofc-font.c
pangofc-fontmap.c pango/pangoft2.c pango/pangoft2-fontmap.c
pango/pangoxft-font.c pango/pangoxft-fontmap.c
pango/pangowin32-fontmap.c: Use G_DEFINE_TYPE comprehensively.
* pango/pangoft2-private.h pangoft2.c: Un-staticify
pango_ft2_font_get_type.
Diffstat (limited to 'pango/pangowin32.c')
| -rw-r--r-- | pango/pangowin32.c | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/pango/pangowin32.c b/pango/pangowin32.c index 1a7f3f5c..9ecadeb0 100644 --- a/pango/pangowin32.c +++ b/pango/pangowin32.c @@ -52,10 +52,6 @@ struct _PangoWin32FontClass PangoFontClass parent_class; }; -static PangoFontClass *parent_class; /* Parent class structure for PangoWin32Font */ - -static void pango_win32_font_class_init (PangoWin32FontClass *class); -static void pango_win32_font_init (PangoWin32Font *win32font); static void pango_win32_font_dispose (GObject *object); static void pango_win32_font_finalize (GObject *object); @@ -142,33 +138,7 @@ pango_win32_get_context (void) return result; } -static GType -pango_win32_font_get_type (void) -{ - static GType object_type = 0; - - if (!object_type) - { - static const GTypeInfo object_info = - { - sizeof (PangoWin32FontClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) pango_win32_font_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PangoWin32Font), - 0, /* n_preallocs */ - (GInstanceInitFunc) pango_win32_font_init, - }; - - object_type = g_type_register_static (PANGO_TYPE_FONT, - "PangoWin32Font", - &object_info, 0); - } - - return object_type; -} +G_DEFINE_TYPE (PangoWin32Font, pango_win32_font, PANGO_TYPE_FONT) static void pango_win32_font_init (PangoWin32Font *win32font) @@ -231,8 +201,6 @@ pango_win32_font_class_init (PangoWin32FontClass *class) GObjectClass *object_class = G_OBJECT_CLASS (class); PangoFontClass *font_class = PANGO_FONT_CLASS (class); - parent_class = g_type_class_peek_parent (class); - object_class->finalize = pango_win32_font_finalize; object_class->dispose = pango_win32_font_dispose; @@ -245,6 +213,11 @@ pango_win32_font_class_init (PangoWin32FontClass *class) pango_win32_get_dc (); } +static void +pango_win32_font_init (PangoWin32Font *win32font) +{ +} + PangoWin32Font * pango_win32_font_new (PangoFontMap *fontmap, const LOGFONT *lfp, |