Typedef PangoWin32FontMapClass.

2004-08-06  Tor Lillqvist  <tml@iki.fi>

	* pango/pangowin32-fontmap.c: Typedef PangoWin32FontMapClass.

	(pango_win32_font_map_class_init): Match what G_DEFINE_TYPE
	generates.

5 files changed, 34 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 2db31119..21f477c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-06  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pangowin32-fontmap.c: Typedef PangoWin32FontMapClass.
+
+	(pango_win32_font_map_class_init): Match what G_DEFINE_TYPE
+	generates.
+
 2004-08-05  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangoft2.def: Add pango_ot_buffer_set_zero_width_marks.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 2db31119..21f477c1 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+2004-08-06  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pangowin32-fontmap.c: Typedef PangoWin32FontMapClass.
+
+	(pango_win32_font_map_class_init): Match what G_DEFINE_TYPE
+	generates.
+
 2004-08-05  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangoft2.def: Add pango_ot_buffer_set_zero_width_marks.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 2db31119..21f477c1 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+2004-08-06  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pangowin32-fontmap.c: Typedef PangoWin32FontMapClass.
+
+	(pango_win32_font_map_class_init): Match what G_DEFINE_TYPE
+	generates.
+
 2004-08-05  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangoft2.def: Add pango_ot_buffer_set_zero_width_marks.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 2db31119..21f477c1 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+2004-08-06  Tor Lillqvist  <tml@iki.fi>
+
+	* pango/pangowin32-fontmap.c: Typedef PangoWin32FontMapClass.
+
+	(pango_win32_font_map_class_init): Match what G_DEFINE_TYPE
+	generates.
+
 2004-08-05  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangoft2.def: Add pango_ot_buffer_set_zero_width_marks.
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 8d462ad0..09be6be0 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -38,6 +38,7 @@
 #define PANGO_WIN32_IS_FONT_MAP(object)     (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_WIN32_FONT_MAP))
 
 typedef struct _PangoWin32FontMap      PangoWin32FontMap;
+typedef struct _PangoWin32FontMapClass PangoWin32FontMapClass;
 typedef struct _PangoWin32Family       PangoWin32Family;
 typedef struct _PangoWin32SizeInfo     PangoWin32SizeInfo;
 
@@ -153,14 +154,15 @@ pango_win32_font_map_init (PangoWin32FontMap *win32fontmap)
 }
 
 static void
-pango_win32_font_map_class_init (PangoFontMapClass *class)
+pango_win32_font_map_class_init (PangoWin32FontMapClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
+  PangoFontMapClass *fontmap_class = PANGO_FONT_MAP_CLASS (class);
   
   object_class->finalize = pango_win32_font_map_finalize;
-  class->load_font = pango_win32_font_map_load_font;
-  class->list_families = pango_win32_font_map_list_families;
-  class->shape_engine_type = PANGO_RENDER_TYPE_WIN32;
+  fontmap_class->load_font = pango_win32_font_map_load_font;
+  fontmap_class->list_families = pango_win32_font_map_list_families;
+  fontmap_class->shape_engine_type = PANGO_RENDER_TYPE_WIN32;
   
   pango_win32_get_dc ();
 }