summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2000-12-15 01:45:01 +0000
committerOwen Taylor <otaylor@src.gnome.org>2000-12-15 01:45:01 +0000
commit04b813f8baea7bb0da71b132bfd1fbf90e730cfd (patch)
tree4420de781fb043a87ad1211bee33978e3fd01ac3
parentf2bb9b92d5cebe5594e73e2eeea8a1a606da9005 (diff)
downloadpango-04b813f8baea7bb0da71b132bfd1fbf90e730cfd.tar.gz
Add PANGO_XFT_IS_FONT to the public header.
Thu Dec 14 20:34:18 2000 Owen Taylor <otaylor@redhat.com> * pango/pangoxft.h pango/pangoxft-font.c: (PANGO_TYPE_XFT_FONT): Add PANGO_XFT_IS_FONT to the public header.
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-05
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-25
-rw-r--r--ChangeLog.pre-1-45
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--pango/pangoxft-font.c4
-rw-r--r--pango/pangoxft.h5
9 files changed, 41 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 167c9a80..9992fd79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 14 20:34:18 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoxft.h pango/pangoxft-font.c: (PANGO_TYPE_XFT_FONT): Add
+ PANGO_XFT_IS_FONT to the public header.
+
Thu Dec 14 19:00:46 2000 Owen Taylor <otaylor@redhat.com>
* modules/indic/pango-indic-script.h: Fix macro breakage.
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 167c9a80..9992fd79 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,8 @@
+Thu Dec 14 20:34:18 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoxft.h pango/pangoxft-font.c: (PANGO_TYPE_XFT_FONT): Add
+ PANGO_XFT_IS_FONT to the public header.
+
Thu Dec 14 19:00:46 2000 Owen Taylor <otaylor@redhat.com>
* modules/indic/pango-indic-script.h: Fix macro breakage.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 167c9a80..9992fd79 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Thu Dec 14 20:34:18 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoxft.h pango/pangoxft-font.c: (PANGO_TYPE_XFT_FONT): Add
+ PANGO_XFT_IS_FONT to the public header.
+
Thu Dec 14 19:00:46 2000 Owen Taylor <otaylor@redhat.com>
* modules/indic/pango-indic-script.h: Fix macro breakage.
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 167c9a80..9992fd79 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+Thu Dec 14 20:34:18 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoxft.h pango/pangoxft-font.c: (PANGO_TYPE_XFT_FONT): Add
+ PANGO_XFT_IS_FONT to the public header.
+
Thu Dec 14 19:00:46 2000 Owen Taylor <otaylor@redhat.com>
* modules/indic/pango-indic-script.h: Fix macro breakage.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 167c9a80..9992fd79 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+Thu Dec 14 20:34:18 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoxft.h pango/pangoxft-font.c: (PANGO_TYPE_XFT_FONT): Add
+ PANGO_XFT_IS_FONT to the public header.
+
Thu Dec 14 19:00:46 2000 Owen Taylor <otaylor@redhat.com>
* modules/indic/pango-indic-script.h: Fix macro breakage.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 167c9a80..9992fd79 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Thu Dec 14 20:34:18 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoxft.h pango/pangoxft-font.c: (PANGO_TYPE_XFT_FONT): Add
+ PANGO_XFT_IS_FONT to the public header.
+
Thu Dec 14 19:00:46 2000 Owen Taylor <otaylor@redhat.com>
* modules/indic/pango-indic-script.h: Fix macro breakage.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 167c9a80..9992fd79 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Thu Dec 14 20:34:18 2000 Owen Taylor <otaylor@redhat.com>
+
+ * pango/pangoxft.h pango/pangoxft-font.c: (PANGO_TYPE_XFT_FONT): Add
+ PANGO_XFT_IS_FONT to the public header.
+
Thu Dec 14 19:00:46 2000 Owen Taylor <otaylor@redhat.com>
* modules/indic/pango-indic-script.h: Fix macro breakage.
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index 66a3d356..1c9330bb 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -23,10 +23,8 @@
#include "X11/Xft/XftFreetype.h"
#include "modules.h"
-#define PANGO_TYPE_XFT_FONT (pango_xft_font_get_type ())
#define PANGO_XFT_FONT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT, PangoXftFont))
#define PANGO_XFT_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_XFT_FONT, PangoXftFontClass))
-#define PANGO_XFT_IS_FONT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT))
#define PANGO_XFT_IS_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_XFT_FONT))
#define PANGO_XFT_FONT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_XFT_FONT, PangoXftFontClass))
@@ -61,7 +59,7 @@ static void pango_xft_font_get_metrics (PangoFont
PangoFontMetrics *metrics);
-static GType
+GType
pango_xft_font_get_type (void)
{
static GType object_type = 0;
diff --git a/pango/pangoxft.h b/pango/pangoxft.h
index b7636ee4..c9f32404 100644
--- a/pango/pangoxft.h
+++ b/pango/pangoxft.h
@@ -45,6 +45,11 @@ void pango_xft_render (XftDraw *draw,
gint x,
gint y);
+#define PANGO_TYPE_XFT_FONT (pango_xft_font_get_type ())
+#define PANGO_XFT_IS_FONT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT))
+
+GType pango_xft_font_get_type (void);
+
/* For shape engines
*/