diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-03-21 21:27:36 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-03-21 21:27:36 +0000 |
| commit | 9d988ddaffebc520b9a781236d112bbba392f714 (patch) | |
| tree | ddbd0257f97ebf153830628cc9b54706651745e2 /src | |
| parent | Fixed bug whith maps (diff) | |
| parent | Fix a bug in multi-path-manipulator and finish bspline refactor (diff) | |
| download | inkscape-9d988ddaffebc520b9a781236d112bbba392f714.tar.gz inkscape-9d988ddaffebc520b9a781236d112bbba392f714.zip | |
update to trunk
(bzr r13645.1.50)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/tool/path-manipulator.cpp | 3 | ||||
| -rw-r--r-- | src/ui/widget/page-sizer.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index 00e18dd3f..49991c75f 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -21,7 +21,7 @@ #include <2geom/bezier-curve.h> #include <2geom/bezier-utils.h> #include <2geom/path-sink.h> - +#include <glibmm/i18n.h> #include "ui/tool/path-manipulator.h" #include "desktop.h" @@ -45,7 +45,6 @@ #include "ui/tool/multi-path-manipulator.h" #include "xml/node.h" #include "xml/node-observer.h" -#include <glibmm/i18n.h> namespace Inkscape { namespace UI { diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index 8c86daea0..0a5697661 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -495,7 +495,7 @@ PageSizer::PageSizer(Registry & _wr) _viewboxW.set_hexpand(); _viewboxW.set_vexpand(); - _viewboxTable.attach(_viewbox, 0, 1, 1, 1); + _viewboxTable.attach(_viewboxW, 0, 1, 1, 1); _viewboxH.set_hexpand(); _viewboxH.set_vexpand(); |