diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-12-21 15:39:39 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-12-21 15:39:39 +0000 |
| commit | 30b6a43219b66aba1a9ebade8aca50910f2c25cc (patch) | |
| tree | a34e3ffe54acd7ea8ff80b808c5995d71e255dae /src/ui/widget | |
| parent | Add arrow that demonstates 'auto-start-reverse' and 'context-stroke'/'context... (diff) | |
| download | inkscape-30b6a43219b66aba1a9ebade8aca50910f2c25cc.tar.gz inkscape-30b6a43219b66aba1a9ebade8aca50910f2c25cc.zip | |
Deprecate and remove sp_desktop_selection in favor of SPDesktop::getSelection
(bzr r13809)
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/panel.cpp | 3 | ||||
| -rw-r--r-- | src/ui/widget/selected-style.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/style-subject.cpp | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index c96eac838..39aa6c584 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -33,6 +33,7 @@ #include "panel.h" #include "icon-size.h" #include "preferences.h" +#include "desktop.h" #include "desktop-handles.h" #include "inkscape.h" #include "widgets/eek-preview.h" @@ -667,7 +668,7 @@ void Panel::_handleResponse(int response_id) Inkscape::Selection *Panel::_getSelection() { - return sp_desktop_selection(_desktop); + return _desktop->getSelection(); } } // namespace Widget diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index aebef2c4e..ec3194478 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -480,7 +480,7 @@ SelectedStyle::setDesktop(SPDesktop *desktop) _desktop = desktop; g_object_set_data (G_OBJECT(_opacity_sb.gobj()), "dtw", _desktop->canvas); - Inkscape::Selection *selection = sp_desktop_selection (desktop); + Inkscape::Selection *selection = desktop->getSelection(); selection_changed_connection = new sigc::connection (selection->connectChanged( sigc::bind ( diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp index d9bf7e2aa..1646b0fed 100644 --- a/src/ui/widget/style-subject.cpp +++ b/src/ui/widget/style-subject.cpp @@ -49,7 +49,7 @@ StyleSubject::Selection::~Selection() { Inkscape::Selection *StyleSubject::Selection::_getSelection() const { SPDesktop *desktop = getDesktop(); if (desktop) { - return sp_desktop_selection(desktop); + return desktop->getSelection(); } else { return NULL; } @@ -88,7 +88,7 @@ void StyleSubject::Selection::_afterDesktopSwitch(SPDesktop *desktop) { _sel_modified.disconnect(); if (desktop) { _subsel_changed = desktop->connectToolSubselectionChanged(sigc::hide(sigc::mem_fun(*this, &Selection::_emitChanged))); - Inkscape::Selection *selection = sp_desktop_selection(desktop); + Inkscape::Selection *selection = desktop->getSelection(); if (selection) { _sel_changed = selection->connectChanged(sigc::hide(sigc::mem_fun(*this, &Selection::_emitChanged))); _sel_modified = selection->connectModified(sigc::hide(sigc::hide(sigc::mem_fun(*this, &Selection::_emitChanged)))); |