Activate the renderer.

Fri Sep 24 15:05:02 2004  Owen Taylor  <otaylor@redhat.com>

        * pango/pango-renderer.c (pango_renderer_draw_glyphs):
        Activate the renderer.

        * pango/pango-renderer.c (pango_renderer_get_color,
        pango_renderer_draw_rectangle, pango_renderer_draw_trapezoid,
        pango_renderer_draw_error_underline, pango_renderer_draw_glyph):
        Require the renderer to be active.

4 files changed, 42 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 2dcb4eb4..bcb6c59e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Sep 24 15:05:02 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-renderer.c (pango_renderer_draw_glyphs): 
+	Activate the renderer.
+
+	* pango/pango-renderer.c (pango_renderer_get_color,
+	pango_renderer_draw_rectangle, pango_renderer_draw_trapezoid,
+	pango_renderer_draw_error_underline, pango_renderer_draw_glyph): 
+	Require the renderer to be active.
+
 Fri Sep 24 12:59:22 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Up version to 1.7.0.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 2dcb4eb4..bcb6c59e 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,13 @@
+Fri Sep 24 15:05:02 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-renderer.c (pango_renderer_draw_glyphs): 
+	Activate the renderer.
+
+	* pango/pango-renderer.c (pango_renderer_get_color,
+	pango_renderer_draw_rectangle, pango_renderer_draw_trapezoid,
+	pango_renderer_draw_error_underline, pango_renderer_draw_glyph): 
+	Require the renderer to be active.
+
 Fri Sep 24 12:59:22 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Up version to 1.7.0.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 2dcb4eb4..bcb6c59e 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,13 @@
+Fri Sep 24 15:05:02 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pango-renderer.c (pango_renderer_draw_glyphs): 
+	Activate the renderer.
+
+	* pango/pango-renderer.c (pango_renderer_get_color,
+	pango_renderer_draw_rectangle, pango_renderer_draw_trapezoid,
+	pango_renderer_draw_error_underline, pango_renderer_draw_glyph): 
+	Require the renderer to be active.
+
 Fri Sep 24 12:59:22 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Up version to 1.7.0.
diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c
index 620685d1..252a8d79 100644
--- a/pango/pango-renderer.c
+++ b/pango/pango-renderer.c
@@ -577,7 +577,11 @@ pango_renderer_draw_glyphs (PangoRenderer    *renderer,
 {
   g_return_if_fail (PANGO_IS_RENDERER (renderer));
   
+  pango_renderer_activate (renderer);
+
   PANGO_RENDERER_GET_CLASS (renderer)->draw_glyphs (renderer, font, glyphs, x, y);
+  
+  pango_renderer_deactivate (renderer);
 }
 
 static void
@@ -630,6 +634,7 @@ pango_renderer_draw_rectangle (PangoRenderer   *renderer,
 {
   g_return_if_fail (PANGO_IS_RENDERER (renderer));
   g_return_if_fail (IS_VALID_PART (part));
+  g_return_if_fail (renderer->active_count > 0);
   
   PANGO_RENDERER_GET_CLASS (renderer)->draw_rectangle (renderer, part, x, y, width, height);
 }
@@ -765,6 +770,7 @@ pango_renderer_draw_error_underline (PangoRenderer *renderer,
 				     int            height)
 {
   g_return_if_fail (PANGO_IS_RENDERER (renderer));
+  g_return_if_fail (renderer->active_count > 0);
   
   PANGO_RENDERER_GET_CLASS (renderer)->draw_error_underline (renderer, x, y, width, height);
 }
@@ -913,6 +919,7 @@ pango_renderer_draw_trapezoid (PangoRenderer  *renderer,
 			       double          x22)
 {
   g_return_if_fail (PANGO_IS_RENDERER (renderer));
+  g_return_if_fail (renderer->active_count > 0);
   
   PANGO_RENDERER_GET_CLASS (renderer)->draw_trapezoid (renderer, part,
 						       y1, x11, x21,
@@ -939,7 +946,8 @@ pango_renderer_draw_glyph (PangoRenderer *renderer,
 			   double         y)
 {
   g_return_if_fail (PANGO_IS_RENDERER (renderer));
-
+  g_return_if_fail (renderer->active_count > 0);
+	  
   if (glyph == 0)		/* glyph 0 never renders */
     return;
   
@@ -1056,7 +1064,7 @@ pango_renderer_get_color (PangoRenderer   *renderer,
 {
   g_return_val_if_fail (PANGO_IS_RENDERER (renderer), NULL);
   g_return_val_if_fail (IS_VALID_PART (part), NULL);
-
+  
   if (renderer->priv->color_set[part])
     return &renderer->priv->color[part];
   else
@@ -1090,7 +1098,8 @@ pango_renderer_part_changed (PangoRenderer    *renderer,
 {
   g_return_if_fail (PANGO_IS_RENDERER (renderer));
   g_return_if_fail (IS_VALID_PART (part));
-
+  g_return_if_fail (renderer->active_count > 0);
+  
   handle_line_state_change (renderer, part);
 
   if (PANGO_RENDERER_GET_CLASS (renderer)->part_changed)