diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-11-26 01:35:57 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-11-26 01:35:57 +0000 |
| commit | 8edb6edfedc2665a4fa72045ae7faedd0aaed958 (patch) | |
| tree | 642742ca3a222d2e7749c1b27ded549325a2f19e /src/widgets | |
| parent | Merge inkscape-cppify branch (diff) | |
| download | inkscape-8edb6edfedc2665a4fa72045ae7faedd0aaed958.tar.gz inkscape-8edb6edfedc2665a4fa72045ae7faedd0aaed958.zip | |
Replace INKSCAPE.active_desktop() by SP_ACTIVE_DESKTOP for easier grepability
(bzr r13768)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/box3d-toolbar.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/stroke-marker-selector.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/box3d-toolbar.cpp b/src/widgets/box3d-toolbar.cpp index e0fa591f4..4cc2976f8 100644 --- a/src/widgets/box3d-toolbar.cpp +++ b/src/widgets/box3d-toolbar.cpp @@ -255,7 +255,7 @@ static void box3d_angle_z_value_changed(GtkAdjustment *adj, GObject *dataKludge) static void box3d_vp_state_changed( GtkToggleAction *act, GtkAction * /*box3d_angle*/, Proj::Axis axis ) { // TODO: Take all selected perspectives into account - std::list<Persp3D *> sel_persps = sp_desktop_selection(INKSCAPE.active_desktop())->perspList(); + std::list<Persp3D *> sel_persps = sp_desktop_selection(SP_ACTIVE_DESKTOP)->perspList(); if (sel_persps.empty()) { // this can happen when the document is created; we silently ignore it return; diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index 24288299f..c62262e81 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -64,7 +64,7 @@ MarkerComboBox::MarkerComboBox(gchar const *id, int l) : sp_pixbuf_new( Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_ICON("no-marker") ) ) ); sandbox = ink_markers_preview_doc (); - desktop = INKSCAPE.active_desktop(); + desktop = SP_ACTIVE_DESKTOP; doc = sp_desktop_document(desktop); modified_connection = doc->getDefs()->connectModified( sigc::hide(sigc::hide(sigc::bind(sigc::ptr_fun(&MarkerComboBox::handleDefsModified), this))) ); |