summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog11
-rw-r--r--ChangeLog.pre-1-011
-rw-r--r--ChangeLog.pre-1-1011
-rw-r--r--ChangeLog.pre-1-211
-rw-r--r--ChangeLog.pre-1-411
-rw-r--r--ChangeLog.pre-1-611
-rw-r--r--ChangeLog.pre-1-811
-rw-r--r--pango/Makefile.am4
-rw-r--r--pango/fonts.c14
-rw-r--r--pango/pango-font.h3
10 files changed, 96 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 75dcf64e..545d19ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-09-20 James Henstridge <james@daa.com.au>
+
+ * pango/Makefile.am (s-enum-types-c): fix rule so that flags get
+ registered as flags and rather than enums (enums still get
+ registered as enums).
+
+ * pango/pango-font.h: add get_type routine to header.
+
+ * pango/fonts.c (pango_font_metrics_get_type): add get_type()
+ routine.
+
Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-fontmap.c: Remove pango_font_map_free_families,
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 75dcf64e..545d19ae 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,14 @@
+2001-09-20 James Henstridge <james@daa.com.au>
+
+ * pango/Makefile.am (s-enum-types-c): fix rule so that flags get
+ registered as flags and rather than enums (enums still get
+ registered as enums).
+
+ * pango/pango-font.h: add get_type routine to header.
+
+ * pango/fonts.c (pango_font_metrics_get_type): add get_type()
+ routine.
+
Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-fontmap.c: Remove pango_font_map_free_families,
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 75dcf64e..545d19ae 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,14 @@
+2001-09-20 James Henstridge <james@daa.com.au>
+
+ * pango/Makefile.am (s-enum-types-c): fix rule so that flags get
+ registered as flags and rather than enums (enums still get
+ registered as enums).
+
+ * pango/pango-font.h: add get_type routine to header.
+
+ * pango/fonts.c (pango_font_metrics_get_type): add get_type()
+ routine.
+
Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-fontmap.c: Remove pango_font_map_free_families,
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 75dcf64e..545d19ae 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,14 @@
+2001-09-20 James Henstridge <james@daa.com.au>
+
+ * pango/Makefile.am (s-enum-types-c): fix rule so that flags get
+ registered as flags and rather than enums (enums still get
+ registered as enums).
+
+ * pango/pango-font.h: add get_type routine to header.
+
+ * pango/fonts.c (pango_font_metrics_get_type): add get_type()
+ routine.
+
Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-fontmap.c: Remove pango_font_map_free_families,
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 75dcf64e..545d19ae 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,14 @@
+2001-09-20 James Henstridge <james@daa.com.au>
+
+ * pango/Makefile.am (s-enum-types-c): fix rule so that flags get
+ registered as flags and rather than enums (enums still get
+ registered as enums).
+
+ * pango/pango-font.h: add get_type routine to header.
+
+ * pango/fonts.c (pango_font_metrics_get_type): add get_type()
+ routine.
+
Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-fontmap.c: Remove pango_font_map_free_families,
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 75dcf64e..545d19ae 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,14 @@
+2001-09-20 James Henstridge <james@daa.com.au>
+
+ * pango/Makefile.am (s-enum-types-c): fix rule so that flags get
+ registered as flags and rather than enums (enums still get
+ registered as enums).
+
+ * pango/pango-font.h: add get_type routine to header.
+
+ * pango/fonts.c (pango_font_metrics_get_type): add get_type()
+ routine.
+
Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-fontmap.c: Remove pango_font_map_free_families,
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 75dcf64e..545d19ae 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,14 @@
+2001-09-20 James Henstridge <james@daa.com.au>
+
+ * pango/Makefile.am (s-enum-types-c): fix rule so that flags get
+ registered as flags and rather than enums (enums still get
+ registered as enums).
+
+ * pango/pango-font.h: add get_type routine to header.
+
+ * pango/fonts.c (pango_font_metrics_get_type): add get_type()
+ routine.
+
Wed Sep 19 19:28:52 2001 Owen Taylor <otaylor@redhat.com>
* pango/pango-fontmap.c: Remove pango_font_map_free_families,
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 503d6514..d00dac0f 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -175,9 +175,9 @@ s-enum-types-c: @REBUILD@ $(pango_headers) Makefile
( cd $(srcdir) && glib-mkenums \
--fhead "#include <pango.h>" \
--fprod "\n/* enumerations from \"@filename@\" */" \
- --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const GEnumValue values[] = {" \
+ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n };\n etype = g_enum_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
+ --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
$(pango_headers) ) > tmp-pango-enum-types.c \
&& (cmp -s tmp-pango-enum-types.c $(srcdir)/pango-enum-types.c || cp tmp-pango-enum-types.c $(srcdir)/pango-enum-types.c ) \
&& rm -f tmp-pango-enum-types.c \
diff --git a/pango/fonts.c b/pango/fonts.c
index bc0c9847..0d0569ef 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -1121,6 +1121,20 @@ pango_font_get_metrics (PangoFont *font,
return PANGO_FONT_GET_CLASS (font)->get_metrics (font, language);
}
+GType
+pango_font_metrics_get_type (void)
+{
+ static GType our_type = 0;
+
+ if (our_type == 0)
+ our_type = g_boxed_type_register_static ("PangoFontMetrics",
+ (GBoxedCopyFunc)pango_font_metrics_ref,
+ (GBoxedFreeFunc)pango_font_metrics_unref);
+
+ return our_type;
+}
+
+
/**
* pango_font_metrics_new:
*
diff --git a/pango/pango-font.h b/pango/pango-font.h
index e6d1cc0d..fc6b9b4b 100644
--- a/pango/pango-font.h
+++ b/pango/pango-font.h
@@ -150,6 +150,9 @@ char * pango_font_description_to_filename (const PangoFontDescrip
/*
* PangoFontMetrics
*/
+
+#define PANGO_TYPE_FONT_METRICS (pango_font_metrics_get_type ())
+GType pango_font_metrics_get_type (void);
PangoFontMetrics *pango_font_metrics_ref (PangoFontMetrics *metrics);
void pango_font_metrics_unref (PangoFontMetrics *metrics);
int pango_font_metrics_get_ascent (PangoFontMetrics *metrics);
View Lorry Controller Status