diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/sp-root.h | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/sp-root.h')
| -rw-r--r-- | src/sp-root.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/sp-root.h b/src/sp-root.h index ab379fb50..e2bad917b 100644 --- a/src/sp-root.h +++ b/src/sp-root.h @@ -1,6 +1,3 @@ -#ifndef SP_ROOT_H_SEEN -#define SP_ROOT_H_SEEN - /** \file * SPRoot: SVG \<svg\> implementation. */ @@ -14,16 +11,21 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifndef SP_ROOT_H_SEEN +#define SP_ROOT_H_SEEN + +#include "version.h" +#include "svg/svg-length.h" +#include "enums.h" +#include "sp-item-group.h" + #define SP_TYPE_ROOT (sp_root_get_type()) #define SP_ROOT(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_ROOT, SPRoot)) #define SP_ROOT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SP_TYPE_ROOT, SPRootClass)) #define SP_IS_ROOT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_ROOT)) #define SP_IS_ROOT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), SP_TYPE_ROOT)) -#include "version.h" -#include "svg/svg-length.h" -#include "enums.h" -#include "sp-item-group.h" +class SPDefs; /** \<svg\> element */ struct SPRoot : public SPGroup { @@ -39,7 +41,7 @@ struct SPRoot : public SPGroup { /* viewBox; */ unsigned int viewBox_set : 1; - NRRect viewBox; + Geom::Rect viewBox; /* preserveAspectRatio */ unsigned int aspect_set : 1; |