Initial C++ification of SPCanvas.

(bzr r10873)

3 files changed, 7 insertions, 7 deletions

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 4d76fbe1a..5b07cddf5 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -444,7 +444,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     }
 
     /* Canvas */
-    dtw->canvas = SP_CANVAS (sp_canvas_new_aa ());
+    dtw->canvas = SP_CANVAS(SPCanvas::createAA());
 #if ENABLE_LCMS
     dtw->canvas->enable_cms_display_adj = prefs->getBool("/options/displayprofile/enable");
 #endif // ENABLE_LCMS
@@ -1617,8 +1617,8 @@ sp_desktop_widget_adjustment_value_changed (GtkAdjustment */*adj*/, SPDesktopWid
 
     dtw->update = 1;
 
-    sp_canvas_scroll_to (dtw->canvas, gtk_adjustment_get_value(dtw->hadj), 
-		    gtk_adjustment_get_value(dtw->vadj), FALSE);
+    dtw->canvas->scrollTo(gtk_adjustment_get_value(dtw->hadj), 
+                          gtk_adjustment_get_value(dtw->vadj), FALSE);
     sp_desktop_widget_update_rulers (dtw);
 
     /*  update perspective lines if we are in the 3D box tool (so that infinite ones are shown correctly) */
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index 6f076b4c4..425ee1f5e 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -492,7 +492,7 @@ void FillNStroke::updateFromPaint()
         {
             if (kind == FILL) {
                 // FIXME: fix for GTK breakage, see comment in SelectedStyle::on_opacity_changed; here it results in losing release events
-                sp_canvas_force_full_redraw_after_interruptions(sp_desktop_canvas(desktop), 0);
+                sp_desktop_canvas(desktop)->forceFullRedrawAfterInterruptions(0);
             }
 
             psel->setFlatColor( desktop,
@@ -503,7 +503,7 @@ void FillNStroke::updateFromPaint()
 
             if (kind == FILL) {
                 // resume interruptibility
-                sp_canvas_end_forced_full_redraws(sp_desktop_canvas(desktop));
+                sp_desktop_canvas(desktop)->endForcedFullRedraws();
             }
 
             // on release, toggle undo_label so that the next drag will not be lumped with this one
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 83cbe98ff..7659b1688 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -241,7 +241,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw)
     if (actionkey != NULL) {
 
         // FIXME: fix for GTK breakage, see comment in SelectedStyle::on_opacity_changed
-        sp_canvas_force_full_redraw_after_interruptions(sp_desktop_canvas(desktop), 0);
+        sp_desktop_canvas(desktop)->forceFullRedrawAfterInterruptions(0);
 
         gdouble strokewidth = stroke_average_width (selection->itemList());
         int transform_stroke = prefs->getBool("/options/transform/stroke", true) ? 1 : 0;
@@ -262,7 +262,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw)
                                 _("Transform by toolbar"));
 
         // resume interruptibility
-        sp_canvas_end_forced_full_redraws(sp_desktop_canvas(desktop));
+        sp_desktop_canvas(desktop)->endForcedFullRedraws();
     }
 
     g_object_set_data(G_OBJECT(spw), "update", GINT_TO_POINTER(FALSE));