diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2013-09-19 02:05:00 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2013-09-19 02:05:00 +0000 |
| commit | f6e99d7d1b76dd7a7933f55ba095bdcb534f81b3 (patch) | |
| tree | cbee5d1eec2e1afe8c3f8033d528cab4504c3c49 /src/sp-skeleton.cpp | |
| parent | Encapsulate the shared memory hack for Cairo and GdkPixbuf in a class (diff) | |
| parent | Added gpl notice (diff) | |
| download | inkscape-f6e99d7d1b76dd7a7933f55ba095bdcb534f81b3.tar.gz inkscape-f6e99d7d1b76dd7a7933f55ba095bdcb534f81b3.zip | |
Merge C++ification of the SP tree by Markus Engel
(bzr r12532)
Diffstat (limited to 'src/sp-skeleton.cpp')
| -rw-r--r-- | src/sp-skeleton.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/sp-skeleton.cpp b/src/sp-skeleton.cpp index b0f5bc91f..83f2bc20d 100644 --- a/src/sp-skeleton.cpp +++ b/src/sp-skeleton.cpp @@ -52,7 +52,13 @@ sp_skeleton_class_init(SPSkeletonClass *klass) { SPObjectClass *sp_object_class = (SPObjectClass *)klass; +<<<<<<< TREE sp_object_class->build = sp_skeleton_build; +======= + skeleton_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass); + + //sp_object_class->build = sp_skeleton_build; +>>>>>>> MERGE-SOURCE sp_object_class->release = sp_skeleton_release; sp_object_class->write = sp_skeleton_write; sp_object_class->set = sp_skeleton_set; @@ -74,9 +80,15 @@ static void sp_skeleton_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr) { debug("0x%p",object); +<<<<<<< TREE if (((SPObjectClass *) sp_skeleton_parent_class)->build) { ((SPObjectClass *) sp_skeleton_parent_class)->build(object, document, repr); } +======= +// if (((SPObjectClass *) skeleton_parent_class)->build) { +// ((SPObjectClass *) skeleton_parent_class)->build(object, document, repr); +// } +>>>>>>> MERGE-SOURCE /* Pay attention to certain settings here |