X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fselcue.cpp;h=6d365659206749a1101673d513b85ae1bad81f81;hb=129958c3b0e17dc15a5a4722ee83a89a780f9a57;hp=845561d1876a3388215eff4de41d492c25c80ffb;hpb=6b15695578f07a3f72c4c9475c1a261a3021472a;p=inkscape.git

diff --git a/src/selcue.cpp b/src/selcue.cpp
index 845561d18..6d3656592 100644
--- a/src/selcue.cpp
+++ b/src/selcue.cpp
@@ -27,7 +27,7 @@
 Inkscape::SelCue::SelCue(SPDesktop *desktop)
     : _desktop(desktop)
 {
-    _selection = SP_DT_SELECTION(_desktop);
+    _selection = sp_desktop_selection(_desktop);
 
     _sel_changed_connection = _selection->connectChanged(
         sigc::hide(sigc::mem_fun(*this, &Inkscape::SelCue::_updateItemBboxes))
@@ -83,7 +83,7 @@ void Inkscape::SelCue::_updateItemBboxes()
         SPCanvasItem* box = NULL;
 
         if (mode == MARK) {
-            box = sp_canvas_item_new(SP_DT_CONTROLS(_desktop),
+            box = sp_canvas_item_new(sp_desktop_controls(_desktop),
                                       SP_TYPE_CTRL,
                                       "mode", SP_CTRL_MODE_XOR,
                                       "shape", SP_CTRL_SHAPE_DIAMOND,
@@ -95,23 +95,23 @@ void Inkscape::SelCue::_updateItemBboxes()
                                       NULL);
             sp_canvas_item_show(box);
             SP_CTRL(box)->moveto(NR::Point(b.min()[NR::X], b.max()[NR::Y]));
-            
+
             sp_canvas_item_move_to_z(box, 0); // just low enough to not get in the way of other draggable knots
 
         } else if (mode == BBOX) {
             box = sp_canvas_item_new(
-                SP_DT_CONTROLS(_desktop),
+                sp_desktop_controls(_desktop),
                 SP_TYPE_CTRLRECT,
                 NULL
                 );
-            
+
             SP_CTRLRECT(box)->setRectangle(b);
             SP_CTRLRECT(box)->setColor(0x000000a0, 0, 0);
             SP_CTRLRECT(box)->setDashed(true);
-            
+
             sp_canvas_item_move_to_z(box, 0);
         }
-                
+
         if (box) {
             _item_bboxes.push_back(box);
         }
@@ -121,20 +121,20 @@ void Inkscape::SelCue::_updateItemBboxes()
             Inkscape::Text::Layout const *layout = te_get_layout(item);
             if (layout != NULL) {
                 NR::Point a = layout->characterAnchorPoint(layout->begin()) * sp_item_i2d_affine(item);
-                baseline_point = sp_canvas_item_new(SP_DT_CONTROLS(_desktop), SP_TYPE_CTRL,
+                baseline_point = sp_canvas_item_new(sp_desktop_controls(_desktop), SP_TYPE_CTRL,
                                                     "mode", SP_CTRL_MODE_XOR,
                                                     "size", 4.0,
                                                     "filled", 0,
                                                     "stroked", 1,
                                                     "stroke_color", 0x000000ff,
                                                     NULL);
-                
+
                 sp_canvas_item_show(baseline_point);
                 SP_CTRL(baseline_point)->moveto(a);
                 sp_canvas_item_move_to_z(baseline_point, 0);
             }
         }
-        
+
         if (baseline_point) {
                _text_baselines.push_back(baseline_point);
         }