Initial C++ification of SPCanvas.

(bzr r10873)

3 files changed, 10 insertions, 7 deletions

diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index 79d70d453..3c4ce25fe 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -4,6 +4,7 @@
  */
 /* Authors:
  *   Krzysztof Kosiński <tweenk.pl@gmail.com>
+ *   Jon A. Cruz <jon@joncruz.org>
  *
  * Copyright (C) 2009 Authors
  * Released under GNU GPL, read the file 'COPYING' for more information
@@ -355,7 +356,7 @@ bool ControlPoint::_eventHandler(GdkEvent *event)
                 // _drag_initiated might change during the above virtual call
                 if (!_drag_initiated) {
                     // this guarantees smooth redraws while dragging
-                    sp_canvas_force_full_redraw_after_interruptions(_desktop->canvas, 5);
+                    _desktop->canvas->forceFullRedrawAfterInterruptions(5);
                     _drag_initiated = true;
                 }
             }
@@ -395,7 +396,7 @@ bool ControlPoint::_eventHandler(GdkEvent *event)
             _event_grab = false;
 
             if (_drag_initiated) {
-                sp_canvas_end_forced_full_redraws(_desktop->canvas);
+                _desktop->canvas->endForcedFullRedraws();
             }
 
             if (_drag_initiated) {
@@ -426,7 +427,7 @@ bool ControlPoint::_eventHandler(GdkEvent *event)
             {
                 ungrabbed(NULL);
                 if (_drag_initiated)
-                    sp_canvas_end_forced_full_redraws(_desktop->canvas);
+                    _desktop->canvas->endForcedFullRedraws();
             }
             _setState(STATE_NORMAL);
             _event_grab = false;
@@ -556,7 +557,7 @@ void ControlPoint::transferGrab(ControlPoint *prev_point, GdkEventMotion *event)
     sp_canvas_item_grab(_canvas_item, _grab_event_mask, NULL, event->time);
 
     if (!_drag_initiated) {
-        sp_canvas_force_full_redraw_after_interruptions(_desktop->canvas, 5);
+        _desktop->canvas->forceFullRedrawAfterInterruptions(5);
         _drag_initiated = true;
     }
 
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index afbb52e05..40dbbc962 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -2,6 +2,7 @@
  * Author:
  *   buliabyak@gmail.com
  *   Abhishek Sharma
+ *   Jon A. Cruz <jon@joncruz.org>
  *
  * Copyright (C) 2005 author
  *
@@ -1150,13 +1151,13 @@ void SelectedStyle::on_opacity_changed () {
     // me. As a result, scrolling the spinbutton once results in runaway change until it hits 1.0
     // or 0.0. (And no, this is not a race with ::update, I checked that.)
     // Sigh. So we disable interruptibility while we're setting the new value.
-    sp_canvas_force_full_redraw_after_interruptions(sp_desktop_canvas(_desktop), 0);
+    sp_desktop_canvas(_desktop)->forceFullRedrawAfterInterruptions(0);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
     DocumentUndo::maybeDone(sp_desktop_document(_desktop), "fillstroke:opacity", SP_VERB_DIALOG_FILL_STROKE,
                             _("Change opacity"));
     // resume interruptibility
-    sp_canvas_end_forced_full_redraws(sp_desktop_canvas(_desktop));
+    sp_desktop_canvas(_desktop)->endForcedFullRedraws();
     spinbutton_defocus(GTK_OBJECT(_opacity_sb.gobj()));
     _opacity_blocked = false;
 }
diff --git a/src/ui/widget/svg-canvas.cpp b/src/ui/widget/svg-canvas.cpp
index d3d9f70f2..a0d5e1215 100644
--- a/src/ui/widget/svg-canvas.cpp
+++ b/src/ui/widget/svg-canvas.cpp
@@ -1,6 +1,7 @@
 /*
  * Authors:
  *   Ralf Stephan <ralf@ark.in-berlin.de>
+ *   Jon A. Cruz <jon@joncruz.org>
  *
  * Copyright (C) 2005 The Authors
  *
@@ -20,7 +21,7 @@ namespace Widget {
 
 SVGCanvas::SVGCanvas()
 {
-    void *canvas = g_object_new (sp_canvas_get_type (), NULL);
+    void *canvas = g_object_new(SPCanvas::getType(), NULL);
     _spcanvas = static_cast<SPCanvas*>(canvas);
     _widget = Glib::wrap (static_cast<GtkWidget*> (canvas));
     _dt = 0;