diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-12-21 20:30:50 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-12-21 20:30:50 +0000 |
| commit | cd6c365d228dedc64989b0e943f15a04cf3ef128 (patch) | |
| tree | d4dba7786d04703937f4de9f21fd16d6aee16d15 /src | |
| parent | Purge sp_desktop_drawing (diff) | |
| download | inkscape-cd6c365d228dedc64989b0e943f15a04cf3ef128.tar.gz inkscape-cd6c365d228dedc64989b0e943f15a04cf3ef128.zip | |
Purge sp_desktop_gridgroup
(bzr r13814)
Diffstat (limited to 'src')
| -rw-r--r-- | src/desktop-handles.cpp | 8 | ||||
| -rw-r--r-- | src/desktop-handles.h | 1 | ||||
| -rw-r--r-- | src/display/canvas-grid.cpp | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/src/desktop-handles.cpp b/src/desktop-handles.cpp index 3a9bc757e..588d54f53 100644 --- a/src/desktop-handles.cpp +++ b/src/desktop-handles.cpp @@ -32,14 +32,6 @@ sp_desktop_main (SPDesktop const * desktop) } SPCanvasGroup * -sp_desktop_gridgroup (SPDesktop const * desktop) -{ - g_return_val_if_fail (desktop != NULL, NULL); - - return desktop->gridgroup; -} - -SPCanvasGroup * sp_desktop_guides (SPDesktop const * desktop) { g_return_val_if_fail (desktop != NULL, NULL); diff --git a/src/desktop-handles.h b/src/desktop-handles.h index 4f561bbd9..57689b3a0 100644 --- a/src/desktop-handles.h +++ b/src/desktop-handles.h @@ -46,7 +46,6 @@ namespace Inkscape { SPDocument * sp_desktop_document (SPDesktop const * desktop); SPCanvasGroup * sp_desktop_main (SPDesktop const * desktop); -SPCanvasGroup * sp_desktop_gridgroup (SPDesktop const * desktop); SPCanvasGroup * sp_desktop_guides (SPDesktop const * desktop); SPCanvasGroup * sp_desktop_sketch (SPDesktop const * desktop); SPCanvasGroup * sp_desktop_controls (SPDesktop const * desktop); diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 0bcb6c375..fe8d2d98c 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -285,12 +285,12 @@ CanvasGrid::createCanvasItem(SPDesktop * desktop) // check if there is already a canvasitem on this desktop linking to this grid for (GSList *l = canvasitems; l != NULL; l = l->next) { - if ( sp_desktop_gridgroup(desktop) == SP_CANVAS_GROUP(SP_CANVAS_ITEM(l->data)->parent) ) { + if ( desktop->getGridGroup() == SP_CANVAS_GROUP(SP_CANVAS_ITEM(l->data)->parent) ) { return NULL; } } - GridCanvasItem * item = INKSCAPE_GRID_CANVASITEM( sp_canvas_item_new(sp_desktop_gridgroup(desktop), INKSCAPE_TYPE_GRID_CANVASITEM, NULL) ); + GridCanvasItem * item = INKSCAPE_GRID_CANVASITEM( sp_canvas_item_new(desktop->getGridGroup(), INKSCAPE_TYPE_GRID_CANVASITEM, NULL) ); item->grid = this; sp_canvas_item_show(SP_CANVAS_ITEM(item)); |