diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2011-02-20 10:37:24 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2011-02-20 10:37:24 +0000 |
| commit | 60119035d8b8cf1f32cce97a4a4b9b181ba91cf8 (patch) | |
| tree | 8550482cf2bd66a77d3266e2b0135aa685eb6ce5 /src/desktop.cpp | |
| parent | Fix the zoom changed signal to no longer be sent out before the values have f... (diff) | |
| download | inkscape-60119035d8b8cf1f32cce97a4a4b9b181ba91cf8.tar.gz inkscape-60119035d8b8cf1f32cce97a4a4b9b181ba91cf8.zip | |
Pass removing some outdated C-macro use.
(bzr r10059)
Diffstat (limited to 'src/desktop.cpp')
| -rw-r--r-- | src/desktop.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp index 8a4122e78..b5e7cdd33 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -185,7 +185,7 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid namedview = nv; canvas = aCanvas; - SPDocument *document = SP_OBJECT_DOCUMENT (namedview); + SPDocument *document = namedview->document; /* Kill flicker */ document->ensureUpToDate(); @@ -532,9 +532,9 @@ SPObject *SPDesktop::layerForObject(SPObject *object) { g_return_val_if_fail(object != NULL, NULL); SPObject *root=currentRoot(); - object = SP_OBJECT_PARENT(object); + object = object->parent; while ( object && object != root && !isLayer(object) ) { - object = SP_OBJECT_PARENT(object); + object = object->parent; } return object; } @@ -1686,7 +1686,7 @@ _reconstruction_finish (SPDesktop * desktop) if (desktop->_reconstruction_old_layer_id == NULL) return; - SPObject * newLayer = SP_OBJECT_DOCUMENT(desktop->namedview)->getObjectById(desktop->_reconstruction_old_layer_id); + SPObject * newLayer = desktop->namedview->document->getObjectById(desktop->_reconstruction_old_layer_id); if (newLayer != NULL) desktop->setCurrentLayer(newLayer); |