glom r1758 - in branches/glom-1-8: . glom/mode_design/print_layouts glom/utility_widgets/canvas

[murrayc svn gnome org]

Author: murrayc
Date: Wed Nov 26 08:34:09 2008
New Revision: 1758
URL: http://svn.gnome.org/viewvc/glom?rev=1758&view=rev

Log:
2008-11-25  Murray Cumming  <murrayc murrayc com>

* glom/mode_design/print_layouts/canvas_layout_item.cc:
* glom/mode_design/print_layouts/canvas_print_layout.cc:
* glom/utility_widgets/canvas/canvas_group_resizable.cc:
Revert back to the old goocanvasmm enum names to avoid the need for a 
new goocanvasmm release.

Modified:
   branches/glom-1-8/ChangeLog
   branches/glom-1-8/glom/mode_design/print_layouts/canvas_layout_item.cc
   branches/glom-1-8/glom/mode_design/print_layouts/canvas_print_layout.cc
   branches/glom-1-8/glom/utility_widgets/canvas/canvas_group_resizable.cc

Modified: branches/glom-1-8/glom/mode_design/print_layouts/canvas_layout_item.cc
==============================================================================
--- branches/glom-1-8/glom/mode_design/print_layouts/canvas_layout_item.cc	(original)
+++ branches/glom-1-8/glom/mode_design/print_layouts/canvas_layout_item.cc	Wed Nov 26 08:34:09 2008
@@ -120,7 +120,7 @@
   if(child_item)
   {
     //child_item->property_pointer_events() = 
-    //  (Goocanvas::PointerEvents)(Goocanvas::EVENTS_VISIBLE_FILL & GOO_CANVAS_EVENTS_VISIBLE_STROKE);
+    //  (Goocanvas::PointerEvents)(Goocanvas::CANVAS_EVENTS_VISIBLE_FILL & GOO_CANVAS_EVENTS_VISIBLE_STROKE);
       
     //Set the position and dimensions of this group to match the child:
     double x = 0;
@@ -330,7 +330,7 @@
   if(child && child_item)
   {
     //child_item->property_pointer_events() = 
-    //  (Goocanvas::PointerEvents)(Goocanvas::EVENTS_VISIBLE_FILL & GOO_CANVAS_EVENTS_VISIBLE_STROKE);
+    //  (Goocanvas::PointerEvents)(Goocanvas::CANVAS_EVENTS_VISIBLE_FILL & GOO_CANVAS_EVENTS_VISIBLE_STROKE);
       
     //Set the position and dimensions of this group to match the child:
     double x = 0;

Modified: branches/glom-1-8/glom/mode_design/print_layouts/canvas_print_layout.cc
==============================================================================
--- branches/glom-1-8/glom/mode_design/print_layouts/canvas_print_layout.cc	(original)
+++ branches/glom-1-8/glom/mode_design/print_layouts/canvas_print_layout.cc	Wed Nov 26 08:34:09 2008
@@ -56,7 +56,7 @@
 
   m_items_group = Goocanvas::Group::create();
   //m_items_group->signal_button_press_event().connect( sigc::ptr_fun(&on_group_button_press_event), false );
-  //TODO: How does this have any effect?: m_items_group->property_pointer_events() = Goocanvas::EVENTS_NONE;
+  //TODO: How does this have any effect?: m_items_group->property_pointer_events() = Goocanvas::CANVAS_EVENTS_NONE;
   Glib::RefPtr<Goocanvas::Item> root = get_root_item();
   if(root)
     root->add_child(m_items_group);
@@ -785,7 +785,7 @@
 
 void Canvas_PrintLayout::hide_page_bounds()
 {
-  m_bounds_group->property_visibility() = Goocanvas::ITEM_HIDDEN;
+  m_bounds_group->property_visibility() = Goocanvas::CANVAS_ITEM_HIDDEN;
 }
 
 void Canvas_PrintLayout::set_grid_gap(double gap)

Modified: branches/glom-1-8/glom/utility_widgets/canvas/canvas_group_resizable.cc
==============================================================================
--- branches/glom-1-8/glom/utility_widgets/canvas/canvas_group_resizable.cc	(original)
+++ branches/glom-1-8/glom/utility_widgets/canvas/canvas_group_resizable.cc	Wed Nov 26 08:34:09 2008
@@ -39,7 +39,7 @@
   m_x(0), m_y(0), m_width(0), m_height(0)
 {
   //property_pointer_events() = 
-  //    (Goocanvas::PointerEvents)(Goocanvas::EVENTS_VISIBLE_FILL & GOO_CANVAS_EVENTS_VISIBLE_STROKE);  
+  //    (Goocanvas::PointerEvents)(Goocanvas::CANVAS_EVENTS_VISIBLE_FILL & GOO_CANVAS_EVENTS_VISIBLE_STROKE);  
 
 
   set_drag_cursor(Gdk::FLEUR);
@@ -73,7 +73,7 @@
   m_rect->signal_button_release_event().connect(sigc::mem_fun(*this, &CanvasGroupResizable::on_child_button_release_event));
 
   //m_rect->property_pointer_events() = 
-  //    (Goocanvas::PointerEvents)(Goocanvas::EVENTS_VISIBLE_FILL & GOO_CANVAS_EVENTS_VISIBLE_STROKE);
+  //    (Goocanvas::PointerEvents)(Goocanvas::CANVAS_EVENTS_VISIBLE_FILL & GOO_CANVAS_EVENTS_VISIBLE_STROKE);
    
   m_rect->signal_enter_notify_event().connect(sigc::mem_fun(*this, &CanvasGroupResizable::on_rect_enter_notify_event), false);
   m_rect->signal_leave_notify_event().connect(sigc::mem_fun(*this, &CanvasGroupResizable::on_rect_leave_notify_event), false);
@@ -299,7 +299,7 @@
   set_width_height(width, height);
 
   position_manipulators();
-  set_manipulators_visibility(Goocanvas::ITEM_INVISIBLE);
+  set_manipulators_visibility(Goocanvas::CANVAS_ITEM_INVISIBLE);
 }
 
 Glib::RefPtr<CanvasItemMovable> CanvasGroupResizable::get_child()
@@ -402,7 +402,7 @@
 {
   //Make sure that the manipulator is still visibile.
   //(if the user moves too fast then we get a leave-notify-event on the manipulator, rect, or item):
-  set_manipulators_visibility(Goocanvas::ITEM_VISIBLE);
+  set_manipulators_visibility(Goocanvas::CANVAS_ITEM_VISIBLE);
 
   Glib::RefPtr<CanvasItemMovable> manipulator_base = get_manipulator(manipulator_id);
   Glib::RefPtr<CanvasRectMovable> manipulator = Glib::RefPtr<CanvasRectMovable>::cast_dynamic(manipulator_base);
@@ -478,7 +478,7 @@
 {
   //Make sure that the manipulator is still visibile.
   //(if the user moves too fast then we get a leave-notify-event on the manipulator, rect, or item):
-  set_manipulators_visibility(Goocanvas::ITEM_VISIBLE);
+  set_manipulators_visibility(Goocanvas::CANVAS_ITEM_VISIBLE);
 
   Glib::RefPtr<CanvasItemMovable> manipulator_base = get_manipulator(manipulator_id);
   Glib::RefPtr<CanvasRectMovable> manipulator = Glib::RefPtr<CanvasRectMovable>::cast_dynamic(manipulator_base);
@@ -512,14 +512,14 @@
 bool CanvasGroupResizable::on_manipulator_enter_notify_event(const Glib::RefPtr<Goocanvas::Item>& /* target */, GdkEventCrossing* /* event */)
 {
   m_in_manipulator = true;
-  set_manipulators_visibility(Goocanvas::ITEM_VISIBLE);
+  set_manipulators_visibility(Goocanvas::CANVAS_ITEM_VISIBLE);
   return false;
 }
 
 bool CanvasGroupResizable::on_manipulator_leave_notify_event(const Glib::RefPtr<Goocanvas::Item>& /* target */, GdkEventCrossing* /* event */t)
 {
   m_in_manipulator = false;
-  set_manipulators_visibility(Goocanvas::ITEM_INVISIBLE);
+  set_manipulators_visibility(Goocanvas::CANVAS_ITEM_INVISIBLE);
   return false;
 }
 
@@ -527,7 +527,7 @@
 {
   //Make sure that the manipulator is still visibile.
   //(if the user moves too fast then we get a leave-notify-event on the manipulator, rect, or item):
-  set_manipulators_visibility(Goocanvas::ITEM_VISIBLE);
+  set_manipulators_visibility(Goocanvas::CANVAS_ITEM_VISIBLE);
 
   Glib::RefPtr<CanvasItemMovable> manipulator_base = get_manipulator(manipulator_id);
   Glib::RefPtr<CanvasLineMovable> manipulator = Glib::RefPtr<CanvasLineMovable>::cast_dynamic(manipulator_base);
@@ -643,14 +643,14 @@
   if(!m_group_manipulators)
     return;
 
-  //For testing: visibility = Goocanvas::ITEM_VISIBLE;
+  //For testing: visibility = Goocanvas::CANVAS_ITEM_VISIBLE;
 
   m_group_manipulators->property_visibility() = visibility;
 }
 
 bool CanvasGroupResizable::on_rect_enter_notify_event(const Glib::RefPtr<Goocanvas::Item>& target, GdkEventCrossing* event)
 {
-  set_manipulators_visibility(Goocanvas::ITEM_VISIBLE);
+  set_manipulators_visibility(Goocanvas::CANVAS_ITEM_VISIBLE);
 
   return true;
 }
@@ -663,7 +663,7 @@
   //Hide the manipulators if we are outside of the main area,
   //but not just because we are instead inside the manipulator itself:
   //Doesn't seem useful: if(!m_in_manipulator && (target_movable == m_child))
-  set_manipulators_visibility(Goocanvas::ITEM_INVISIBLE);
+  set_manipulators_visibility(Goocanvas::CANVAS_ITEM_INVISIBLE);
 
 
   return false;
@@ -673,7 +673,7 @@
 {
   CanvasItemMovable::on_enter_notify_event(target, event);
 
-  set_manipulators_visibility(Goocanvas::ITEM_VISIBLE);
+  set_manipulators_visibility(Goocanvas::CANVAS_ITEM_VISIBLE);
 
   return true;
 }
@@ -686,7 +686,7 @@
   //Hide the manipulators if we are outside of the main area,
   //but not just because we are instead inside the manipulator itself:
   //Doesn't seem useful: if(!m_in_manipulator && (target_movable == m_child))
-  set_manipulators_visibility(Goocanvas::ITEM_INVISIBLE);
+  set_manipulators_visibility(Goocanvas::CANVAS_ITEM_INVISIBLE);
 
   return false;
 }