[goocanvas/goocanvas-1.0] 2010-06-30 Damon Chaplin <damon gnome org>

[Damon Chaplin <damon src gnome org>]

commit 5e7f63fe9d430635b0c80d082bd24a8f805bfbd3
Author: Damon Chaplin <damon gnome org>
Date:   Wed Jun 30 21:29:19 2010 +0100

    2010-06-30  Damon Chaplin  <damon gnome org>
    
    	    * docs: added empty internal subset "[]" to the DOCTYPEs to keep
    	    gtk-doc happy.
    
    	    * src/goocanvas.c (goo_canvas_expose_event): do a cairo_save()/restore()
    	    around painting the main items, so the static items don't get clipped.

 ChangeLog                  |    8 ++++++++
 docs/architecture.xml      |    2 +-
 docs/coordinates.xml       |    2 +-
 docs/creating-items.xml    |    2 +-
 docs/model-view-canvas.xml |    2 +-
 docs/overview.xml          |    2 +-
 docs/simple-canvas.xml     |    2 +-
 docs/wysiwyg.xml           |    2 +-
 src/goocanvas.c            |    4 ++++
 9 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 586ca60..5cd373d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-30  Damon Chaplin  <damon gnome org>
+
+	* docs: added empty internal subset "[]" to the DOCTYPEs to keep
+	gtk-doc happy.
+
+	* src/goocanvas.c (goo_canvas_expose_event): do a cairo_save()/restore()
+	around painting the main items, so the static items don't get clipped.
+
 2010-06-29  Damon Chaplin  <damon gnome org>
 
 	* src/goocanvasitemsimple.c (goo_canvas_item_simple_set_property):
diff --git a/docs/architecture.xml b/docs/architecture.xml
index 75ce44e..2de573a 100644
--- a/docs/architecture.xml
+++ b/docs/architecture.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; []>
 <refentry id="goocanvas-architecture">
   <refmeta>
     <refentrytitle>Underlying Architecture</refentrytitle>
diff --git a/docs/coordinates.xml b/docs/coordinates.xml
index 4a7e5a6..7a9c509 100644
--- a/docs/coordinates.xml
+++ b/docs/coordinates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; []>
 <refentry id="goocanvas-coordinates">
   <refmeta>
     <refentrytitle>Coordinate Spaces and Limits</refentrytitle>
diff --git a/docs/creating-items.xml b/docs/creating-items.xml
index 2eb7921..a199557 100644
--- a/docs/creating-items.xml
+++ b/docs/creating-items.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; []>
 <refentry id="goocanvas-creating-items">
   <refmeta>
     <refentrytitle>Creating New Items</refentrytitle>
diff --git a/docs/model-view-canvas.xml b/docs/model-view-canvas.xml
index e87637e..18b7617 100644
--- a/docs/model-view-canvas.xml
+++ b/docs/model-view-canvas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; []>
 <refentry id="goocanvas-model-view-canvas">
   <refmeta>
     <refentrytitle>Model/View Canvas Example</refentrytitle>
diff --git a/docs/overview.xml b/docs/overview.xml
index 08846f8..6dd35ef 100644
--- a/docs/overview.xml
+++ b/docs/overview.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; []>
 <refentry id="goocanvas-overview">
   <refmeta>
     <refentrytitle>Overview</refentrytitle>
diff --git a/docs/simple-canvas.xml b/docs/simple-canvas.xml
index f737056..6551901 100644
--- a/docs/simple-canvas.xml
+++ b/docs/simple-canvas.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; []>
 <refentry id="goocanvas-simple-canvas">
   <refmeta>
     <refentrytitle>Simple Canvas Example</refentrytitle>
diff --git a/docs/wysiwyg.xml b/docs/wysiwyg.xml
index 249ede6..92bf57e 100644
--- a/docs/wysiwyg.xml
+++ b/docs/wysiwyg.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; []>
 <refentry id="goocanvas-wysiwyg">
   <refmeta>
     <refentrytitle>WYSIWYG Printing</refentrytitle>
diff --git a/src/goocanvas.c b/src/goocanvas.c
index 77779ef..bf134d1 100644
--- a/src/goocanvas.c
+++ b/src/goocanvas.c
@@ -2743,6 +2743,8 @@ goo_canvas_expose_event (GtkWidget      *widget,
 
   cr = goo_canvas_create_cairo_context (canvas);
 
+  cairo_save (cr);
+
   if (canvas->need_update)
     goo_canvas_update_internal (canvas, cr);
 
@@ -2794,6 +2796,8 @@ goo_canvas_expose_event (GtkWidget      *widget,
 
   goo_canvas_item_paint (canvas->root_item, cr, &bounds, canvas->scale);
 
+  cairo_restore (cr);
+
   paint_static_items (canvas, event, cr);
 
   cairo_destroy (cr);