diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-04-01 23:41:30 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-04-01 23:41:30 +0000 |
| commit | 69f3b6f1abb2bb422935d43262e1e99aab359954 (patch) | |
| tree | e1e2d2b0504d22e81b04501155995f5694a4cd7b /src/sp-namedview.cpp | |
| parent | Added experimental constructor to SPRect. Memory leaks because of non-virtual... (diff) | |
| download | inkscape-69f3b6f1abb2bb422935d43262e1e99aab359954.tar.gz inkscape-69f3b6f1abb2bb422935d43262e1e99aab359954.zip | |
Added constructors to SP classes.
(bzr r11608.1.67)
Diffstat (limited to 'src/sp-namedview.cpp')
| -rw-r--r-- | src/sp-namedview.cpp | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index 56e278b78..0387e45bf 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -55,7 +55,7 @@ static void sp_namedview_show_single_guide(SPGuide* guide, bool show); static gboolean sp_str_to_bool(const gchar *str); static gboolean sp_nv_read_opacity(const gchar *str, guint32 *color); -G_DEFINE_TYPE(SPNamedView, sp_namedview, SP_TYPE_OBJECTGROUP); +G_DEFINE_TYPE(SPNamedView, sp_namedview, G_TYPE_OBJECT); static void sp_namedview_class_init(SPNamedViewClass * klass) { @@ -68,8 +68,9 @@ CNamedView::CNamedView(SPNamedView* view) : CObjectGroup(view) { CNamedView::~CNamedView() { } -static void sp_namedview_init(SPNamedView *nv) -{ +SPNamedView::SPNamedView() : SPObjectGroup(), snap_manager(this) { + SPNamedView* nv = this; + nv->cnamedview = new CNamedView(nv); nv->typeHierarchy.insert(typeid(SPNamedView)); @@ -77,6 +78,24 @@ static void sp_namedview_init(SPNamedView *nv) nv->cobjectgroup = nv->cnamedview; nv->cobject = nv->cnamedview; + nv->zoom = 0; + nv->guidecolor = 0; + nv->guidehicolor = 0; + nv->views = NULL; + nv->borderlayer = 0; + nv->units = NULL; + nv->window_x = 0; + nv->cy = 0; + nv->window_y = 0; + nv->doc_units = NULL; + nv->pagecolor = 0; + nv->cx = 0; + nv->pageshadow = 0; + nv->window_width = 0; + nv->window_height = 0; + nv->window_maximized = 0; + nv->bordercolor = 0; + nv->editable = TRUE; nv->showguides = TRUE; nv->grids_visible = false; @@ -91,7 +110,12 @@ static void sp_namedview_init(SPNamedView *nv) nv->connector_spacing = defaultConnSpacing; - new (&nv->snap_manager) SnapManager(nv); + //new (&nv->snap_manager) SnapManager(nv); +} + +static void sp_namedview_init(SPNamedView *nv) +{ + new (nv) SPNamedView(); } static void sp_namedview_generate_old_grid(SPNamedView * /*nv*/, SPDocument *document, Inkscape::XML::Node *repr) { |