diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-12-21 20:11:39 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-12-21 20:11:39 +0000 |
| commit | 3e5209fe7e0dbeb9e7d8908141788c9fab22e948 (patch) | |
| tree | 6e82287a7281989ad55f2499cb2c05e343ba45ad /src/widgets | |
| parent | Purge sp_desktop_namedview in favor of SPDesktop::getNamedView (diff) | |
| download | inkscape-3e5209fe7e0dbeb9e7d8908141788c9fab22e948.tar.gz inkscape-3e5209fe7e0dbeb9e7d8908141788c9fab22e948.zip | |
Purge sp_desktop_canvas
(bzr r13811)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/fill-style.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/select-toolbar.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp index ead88ddf6..820a20126 100644 --- a/src/widgets/fill-style.cpp +++ b/src/widgets/fill-style.cpp @@ -516,7 +516,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_desktop_canvas(desktop)->forceFullRedrawAfterInterruptions(0); + desktop->getCanvas()->forceFullRedrawAfterInterruptions(0); } psel->setFlatColor( desktop, @@ -527,7 +527,7 @@ void FillNStroke::updateFromPaint() if (kind == FILL) { // resume interruptibility - sp_desktop_canvas(desktop)->endForcedFullRedraws(); + desktop->getCanvas()->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 efc205f6d..881de2e36 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_desktop_canvas(desktop)->forceFullRedrawAfterInterruptions(0); + desktop->getCanvas()->forceFullRedrawAfterInterruptions(0); bool transform_stroke = prefs->getBool("/options/transform/stroke", true); bool preserve = prefs->getBool("/options/preservetransform/value", false); @@ -262,7 +262,7 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) _("Transform by toolbar")); // resume interruptibility - sp_desktop_canvas(desktop)->endForcedFullRedraws(); + desktop->getCanvas()->endForcedFullRedraws(); } g_object_set_data(G_OBJECT(spw), "update", GINT_TO_POINTER(FALSE)); @@ -473,7 +473,7 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb GtkWidget *spw = sp_widget_new_global(); // Remember the desktop's canvas widget, to be used for defocusing. - g_object_set_data(G_OBJECT(spw), "dtw", sp_desktop_canvas(desktop)); + g_object_set_data(G_OBJECT(spw), "dtw", desktop->getCanvas()); // The vb frame holds all other widgets and is used to set sensitivity depending on selection state. #if GTK_CHECK_VERSION(3,0,0) |