summaryrefslogtreecommitdiffstats
path: root/src/svg-view.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2011-07-06 01:59:32 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2011-07-06 01:59:32 +0000
commite65a02ed32b78534739aba24929ece7c44dd967f (patch)
tree13cf022f18f6b5bae46aad4bc339e512f069a514 /src/svg-view.cpp
parentPull 2Geom revision 2013 (extra constructors for Rect). (diff)
parentText edit dialog: Apply button should grab default only after adding to window (diff)
downloadinkscape-e65a02ed32b78534739aba24929ece7c44dd967f.tar.gz
inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.zip
Merge from trunk
(bzr r10347.1.5)
Diffstat (limited to 'src/svg-view.cpp')
-rw-r--r--src/svg-view.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/svg-view.cpp b/src/svg-view.cpp
index 44c874150..03056de2e 100644
--- a/src/svg-view.cpp
+++ b/src/svg-view.cpp
@@ -199,6 +199,8 @@ SPSVGView::setDocument (SPDocument *document)
g_signal_connect (G_OBJECT (_drawing), "arena_event", G_CALLBACK (arena_handler), this);
}
+ View::setDocument (document);
+
if (document) {
NRArenaItem *ai = SP_ITEM( document->getRoot() )->invoke_show(
SP_CANVAS_ARENA (_drawing)->arena,
@@ -211,8 +213,6 @@ SPSVGView::setDocument (SPDocument *document)
doRescale (!_rescale);
}
-
- View::setDocument (document);
}
/**