summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@src.gnome.org>2006-02-02 12:07:17 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-02-02 12:07:17 +0000
commit12bf8f730fe3083800ae5296ddac725b285721be (patch)
tree0bd44b97499a72fa851157a28d51dbd945c213ed
parentd071090cb8b83d07a251fdae73589265e685809e (diff)
downloadpango-12bf8f730fe3083800ae5296ddac725b285721be.tar.gz
Move PANGO_UNKNOWN_GLYPH_WIDTH/HEIGHT to pango-font.h, which makes
more sense.
-rw-r--r--pango/fonts.c1
-rw-r--r--pango/pango-engine-private.h6
-rw-r--r--pango/pango-font.h6
-rw-r--r--pango/pangocairo-render.c1
-rw-r--r--pango/pangoxft-render.c1
5 files changed, 6 insertions, 9 deletions
diff --git a/pango/fonts.c b/pango/fonts.c
index 778366af..e030d6b5 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -29,7 +29,6 @@
#include "pango-font.h"
#include "pango-fontmap.h"
#include "pango-utils.h"
-#include "pango-engine-private.h"
struct _PangoFontDescription
{
diff --git a/pango/pango-engine-private.h b/pango/pango-engine-private.h
index 676f2b11..d56a092f 100644
--- a/pango/pango-engine-private.h
+++ b/pango/pango-engine-private.h
@@ -40,12 +40,6 @@ PangoCoverageLevel _pango_engine_shape_covers (PangoEngineShape *engine,
PangoEngineShape *_pango_get_fallback_shaper (void);
-/* used for very rare and miserable situtations that we cannot even
- * draw a hexbox
- */
-#define PANGO_UNKNOWN_GLYPH_WIDTH 10
-#define PANGO_UNKNOWN_GLYPH_HEIGHT 14
-
G_END_DECLS
#endif /* __PANGO_ENGINE_PRIVATE_H__ */
diff --git a/pango/pango-font.h b/pango/pango-font.h
index 8717e3ee..f75add6a 100644
--- a/pango/pango-font.h
+++ b/pango/pango-font.h
@@ -357,6 +357,12 @@ struct _PangoFontClass
void (*_pango_reserved3) (void);
};
+/* used for very rare and miserable situtations that we cannot even
+ * draw a hexbox
+ */
+#define PANGO_UNKNOWN_GLYPH_WIDTH 10
+#define PANGO_UNKNOWN_GLYPH_HEIGHT 14
+
#endif /* PANGO_ENABLE_BACKEND */
G_END_DECLS
diff --git a/pango/pangocairo-render.c b/pango/pangocairo-render.c
index ae2d853e..0e0a2132 100644
--- a/pango/pangocairo-render.c
+++ b/pango/pangocairo-render.c
@@ -21,7 +21,6 @@
#include <config.h>
-#include "pango-engine-private.h"
#include "pangocairo-private.h"
typedef struct _PangoCairoRendererClass PangoCairoRendererClass;
diff --git a/pango/pangoxft-render.c b/pango/pangoxft-render.c
index d95bce65..7d85008b 100644
--- a/pango/pangoxft-render.c
+++ b/pango/pangoxft-render.c
@@ -22,7 +22,6 @@
#include <config.h>
#include <math.h>
-#include "pango-engine-private.h"
#include "pangoxft-render.h"
#include "pangoxft-private.h"