[glom] Print Layout: Another expansion fixes.

[Murray Cumming <murrayc src gnome org>]

commit 0bf04d6872811efd585f6c290294058880ea254d
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Oct 14 02:57:15 2011 +0200

    Print Layout: Another expansion fixes.
    
    	* glom/print_layout/print_layout_utils.[h|cc]: move_fully_to_page():
    	Move generic CanvasItemMovables instead of just CanvasLayoutItems.
    	* glom/print_layout/canvas_print_layout.cc: move_items_below_item():
    	Likewise.

 ChangeLog                                |    9 +++++++++
 glom/print_layout/canvas_print_layout.cc |    4 ++--
 glom/print_layout/print_layout_utils.cc  |    2 +-
 glom/print_layout/print_layout_utils.h   |    2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 79fa92b..b76377d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-10-14  Murray Cumming  <murrayc murrayc com>
 
+	Print Layout: Another expansion fixes.
+
+	* glom/print_layout/print_layout_utils.[h|cc]: move_fully_to_page():
+	Move generic CanvasItemMovables instead of just CanvasLayoutItems.
+	* glom/print_layout/canvas_print_layout.cc: move_items_below_item():
+	Likewise.
+
+2011-10-14  Murray Cumming  <murrayc murrayc com>
+
 	Print Layout: Increase page count correctly when expanding portals.
 
 	* glom/print_layout/canvas_print_layout.cc: move_items_below_item():
diff --git a/glom/print_layout/canvas_print_layout.cc b/glom/print_layout/canvas_print_layout.cc
index c5e0876..6741083 100644
--- a/glom/print_layout/canvas_print_layout.cc
+++ b/glom/print_layout/canvas_print_layout.cc
@@ -1209,8 +1209,8 @@ void Canvas_PrintLayout::move_items_below_item(const Glib::RefPtr<CanvasLayoutIt
   for(int i = 0; i < count; ++i)
   {
     Glib::RefPtr<Goocanvas::Item> child = root->get_child(i);
-    Glib::RefPtr<CanvasLayoutItem> derived =
-      Glib::RefPtr<CanvasLayoutItem>::cast_dynamic(child);
+    Glib::RefPtr<CanvasItemMovable> derived =
+      CanvasItemMovable::cast_to_movable(child);
     if(!derived)
       continue;
 
diff --git a/glom/print_layout/print_layout_utils.cc b/glom/print_layout/print_layout_utils.cc
index 4b15f4e..57a17fb 100644
--- a/glom/print_layout/print_layout_utils.cc
+++ b/glom/print_layout/print_layout_utils.cc
@@ -121,7 +121,7 @@ static double move_fully_to_page(const Glib::RefPtr<const Gtk::PageSetup>& page_
   return y;
 }
 
-double move_fully_to_page(const Glib::RefPtr<const Gtk::PageSetup>& page_setup, Gtk::Unit units, const Glib::RefPtr<CanvasLayoutItem>& item)
+double move_fully_to_page(const Glib::RefPtr<const Gtk::PageSetup>& page_setup, Gtk::Unit units, const Glib::RefPtr<CanvasItemMovable>& item)
 {
   double x = 0;
   double y = 0;
diff --git a/glom/print_layout/print_layout_utils.h b/glom/print_layout/print_layout_utils.h
index 5fe6009..be2101e 100644
--- a/glom/print_layout/print_layout_utils.h
+++ b/glom/print_layout/print_layout_utils.h
@@ -58,7 +58,7 @@ guint get_page_for_y(const Glib::RefPtr<const Gtk::PageSetup>& page_setup, Gtk::
  *
  * @result The new y position of the item.
  */
-double move_fully_to_page(const Glib::RefPtr<const Gtk::PageSetup>& page_setup, Gtk::Unit units, const Glib::RefPtr<CanvasLayoutItem>& item);
+double move_fully_to_page(const Glib::RefPtr<const Gtk::PageSetup>& page_setup, Gtk::Unit units, const Glib::RefPtr<CanvasItemMovable>& item);
 
 } //namespace PrintLayoutUtils