summaryrefslogtreecommitdiffstats
path: root/src/widgets/stroke-marker-selector.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-12-21 21:58:32 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-12-21 21:58:32 +0000
commit3dbf9a08680c6d7252c79397dbf12082ead61bd7 (patch)
tree565cc1093ba3ec7110971e641d2f1c94b77c45a0 /src/widgets/stroke-marker-selector.cpp
parentPurge sp_desktop_controls (diff)
downloadinkscape-3dbf9a08680c6d7252c79397dbf12082ead61bd7.tar.gz
inkscape-3dbf9a08680c6d7252c79397dbf12082ead61bd7.zip
Remove sp_desktop_document and finish cleanup of desktop-handles.h
(bzr r13820)
Diffstat (limited to 'src/widgets/stroke-marker-selector.cpp')
-rw-r--r--src/widgets/stroke-marker-selector.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp
index c62262e81..d5b43d132 100644
--- a/src/widgets/stroke-marker-selector.cpp
+++ b/src/widgets/stroke-marker-selector.cpp
@@ -26,7 +26,7 @@
#include "style.h"
#include "ui/dialog-events.h"
-#include "desktop-handles.h"
+
#include "desktop-style.h"
#include "preferences.h"
#include "path-prefix.h"
@@ -65,7 +65,7 @@ MarkerComboBox::MarkerComboBox(gchar const *id, int l) :
sandbox = ink_markers_preview_doc ();
desktop = SP_ACTIVE_DESKTOP;
- doc = sp_desktop_document(desktop);
+ doc = desktop->getDocument();
modified_connection = doc->getDefs()->connectModified( sigc::hide(sigc::hide(sigc::bind(sigc::ptr_fun(&MarkerComboBox::handleDefsModified), this))) );
@@ -92,7 +92,7 @@ void MarkerComboBox::setDesktop(SPDesktop *desktop)
}
this->desktop = desktop;
- doc = sp_desktop_document(desktop);
+ doc = desktop->getDocument();
if (doc) {
modified_connection = doc->getDefs()->connectModified( sigc::hide(sigc::hide(sigc::bind(sigc::ptr_fun(&MarkerComboBox::handleDefsModified), this))) );