diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2011-06-04 02:45:55 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2011-06-04 02:45:55 +0000 |
| commit | 3638efba5bec8a6afc9211aa6bbe289767d20b38 (patch) | |
| tree | cbf344e828109b1c37e2feee53cddd0c68a8cf83 /src/dialogs | |
| parent | german translation update (diff) | |
| download | inkscape-3638efba5bec8a6afc9211aa6bbe289767d20b38.tar.gz inkscape-3638efba5bec8a6afc9211aa6bbe289767d20b38.zip | |
Removed outdated/unsafe SP_DOCUMENT_DEFS macro and reduced usage of SP_ROOT() gtk type function/macro.
(bzr r10254)
Diffstat (limited to 'src/dialogs')
| -rw-r--r-- | src/dialogs/clonetiler.cpp | 1 | ||||
| -rw-r--r-- | src/dialogs/export.cpp | 7 | ||||
| -rw-r--r-- | src/dialogs/find.cpp | 1 | ||||
| -rw-r--r-- | src/dialogs/spellcheck.cpp | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp index 40b5f601e..7ad0eaa14 100644 --- a/src/dialogs/clonetiler.cpp +++ b/src/dialogs/clonetiler.cpp @@ -46,6 +46,7 @@ #include "../verbs.h" #include "widgets/icon.h" #include "xml/repr.h" +#include "sp-root.h" using Inkscape::DocumentUndo; diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp index b05f6589a..4c1ad4af1 100644 --- a/src/dialogs/export.cpp +++ b/src/dialogs/export.cpp @@ -54,6 +54,7 @@ #include "preferences.h" #include "verbs.h" #include "interface.h" +#include "sp-root.h" #include "extension/output.h" #include "extension/db.h" @@ -784,7 +785,7 @@ sp_export_selection_modified ( Inkscape::Application */*inkscape*/, if ( SP_ACTIVE_DESKTOP ) { SPDocument *doc; doc = sp_desktop_document (SP_ACTIVE_DESKTOP); - Geom::OptRect bbox = SP_ITEM(doc->root)->getBboxDesktop(SPItem::RENDERING_BBOX); + Geom::OptRect bbox = doc->getRoot()->getBboxDesktop(SPItem::RENDERING_BBOX); if (bbox) { sp_export_set_area (base, bbox->min()[Geom::X], bbox->min()[Geom::Y], @@ -865,7 +866,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base) /** \todo * This returns wrong values if the document has a viewBox. */ - bbox = SP_ITEM(doc->root)->getBboxDesktop(SPItem::RENDERING_BBOX); + bbox = doc->getRoot()->getBboxDesktop(SPItem::RENDERING_BBOX); /* If the drawing is valid, then we'll use it and break otherwise we drop through to the page settings */ if (bbox) { @@ -1501,7 +1502,7 @@ sp_export_detect_size(GtkObject * base) { case SELECTION_DRAWING: { SPDocument *doc = sp_desktop_document (SP_ACTIVE_DESKTOP); - Geom::OptRect bbox = SP_ITEM(doc->root)->getBboxDesktop(SPItem::RENDERING_BBOX); + Geom::OptRect bbox = doc->getRoot()->getBboxDesktop(SPItem::RENDERING_BBOX); // std::cout << "Drawing " << bbox2; if ( bbox && sp_export_bbox_equal(*bbox,current_bbox) ) { diff --git a/src/dialogs/find.cpp b/src/dialogs/find.cpp index c112b3531..4d392a316 100644 --- a/src/dialogs/find.cpp +++ b/src/dialogs/find.cpp @@ -60,6 +60,7 @@ sp_find_dialog(){ #include "../sp-image.h" #include "../sp-offset.h" #include <xml/repr.h> +#include "sp-root.h" #define MIN_ONSCREEN_DISTANCE 50 diff --git a/src/dialogs/spellcheck.cpp b/src/dialogs/spellcheck.cpp index f72612420..ecdc0e0ca 100644 --- a/src/dialogs/spellcheck.cpp +++ b/src/dialogs/spellcheck.cpp @@ -40,6 +40,7 @@ #include "display/canvas-bpath.h" #include "display/curve.h" #include "document-undo.h" +#include "sp-root.h" #ifdef HAVE_ASPELL #include <aspell.h> |