merged from trunk

(bzr r11608.1.56)

1 files changed, 7 insertions, 64 deletions

diff --git a/src/sp-style-elem.cpp b/src/sp-style-elem.cpp
index 5337dd31d..682750aec 100644
--- a/src/sp-style-elem.cpp
+++ b/src/sp-style-elem.cpp
@@ -7,48 +7,11 @@
 #include "style.h"
 using Inkscape::XML::TEXT_NODE;
 
-static void sp_style_elem_init(SPStyleElem *style_elem);
-static void sp_style_elem_class_init(SPStyleElemClass *klass);
-static void sp_style_elem_build(SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr);
-static void sp_style_elem_set(SPObject *object, unsigned const key, gchar const *const value);
-static void sp_style_elem_read_content(SPObject *);
-static Inkscape::XML::Node *sp_style_elem_write(SPObject *, Inkscape::XML::Document *, Inkscape::XML::Node *, guint flags);
-
-static SPObjectClass *parent_class;
-
-GType
-sp_style_elem_get_type()
-{
-    static GType type = 0;
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPStyleElemClass),
-            NULL,   /* base_init */
-            NULL,   /* base_finalize */
-            (GClassInitFunc) sp_style_elem_class_init,
-            NULL,   /* class_finalize */
-            NULL,   /* class_data */
-            sizeof(SPStyleElem),
-            16,     /* n_preallocs */
-            (GInstanceInitFunc) sp_style_elem_init,
-            NULL,   /* value_table */
-        };
-        type = g_type_register_static(SP_TYPE_OBJECT, "SPStyleElem", &info, (GTypeFlags) 0);
-    }
-
-    return type;
-}
+G_DEFINE_TYPE(SPStyleElem, sp_style_elem, SP_TYPE_OBJECT);
 
 static void
 sp_style_elem_class_init(SPStyleElemClass *klass)
 {
-    parent_class = (SPObjectClass *)g_type_class_ref(SP_TYPE_OBJECT);
-    /* FIXME */
-
-    //klass->build = sp_style_elem_build;
-//    klass->set = sp_style_elem_set;
-//    klass->read_content = sp_style_elem_read_content;
-//    klass->write = sp_style_elem_write;
 }
 
 CStyleElem::CStyleElem(SPStyleElem* se) : CObject(se) {
@@ -62,6 +25,8 @@ static void
 sp_style_elem_init(SPStyleElem *style_elem)
 {
 	style_elem->cstyleelem = new CStyleElem(style_elem);
+
+	delete style_elem->cobject;
 	style_elem->cobject = style_elem->cstyleelem;
 
     media_set_all(style_elem->media);
@@ -105,24 +70,19 @@ void CStyleElem::onSet(unsigned int key, const gchar* value) {
     }
 }
 
-static void
-sp_style_elem_set(SPObject *object, unsigned const key, gchar const *const value)
-{
-	((SPStyleElem*)object)->cstyleelem->onSet(key, value);
-}
 
 static void
 child_add_rm_cb(Inkscape::XML::Node *, Inkscape::XML::Node *, Inkscape::XML::Node *,
                 void *const data)
 {
-    sp_style_elem_read_content(static_cast<SPObject *>(data));
+    static_cast<SPObject *>(data)->cobject->onReadContent();
 }
 
 static void
 content_changed_cb(Inkscape::XML::Node *, gchar const *, gchar const *,
                    void *const data)
 {
-    sp_style_elem_read_content(static_cast<SPObject *>(data));
+    static_cast<SPObject *>(data)->cobject->onReadContent();
 }
 
 static void
@@ -130,7 +90,7 @@ child_order_changed_cb(Inkscape::XML::Node *, Inkscape::XML::Node *,
                        Inkscape::XML::Node *, Inkscape::XML::Node *,
                        void *const data)
 {
-    sp_style_elem_read_content(static_cast<SPObject *>(data));
+    static_cast<SPObject *>(data)->cobject->onReadContent();
 }
 
 Inkscape::XML::Node* CStyleElem::onWrite(Inkscape::XML::Document* xml_doc, Inkscape::XML::Node* repr, guint flags) {
@@ -157,12 +117,6 @@ Inkscape::XML::Node* CStyleElem::onWrite(Inkscape::XML::Document* xml_doc, Inksc
     return repr;
 }
 
-static Inkscape::XML::Node *
-sp_style_elem_write(SPObject *const object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint const flags)
-{
-	return ((SPStyleElem*)object)->cstyleelem->onWrite(xml_doc, repr, flags);
-}
-
 
 /** Returns the concatenation of the content of the text children of the specified object. */
 static GString *
@@ -391,12 +345,6 @@ void CStyleElem::onReadContent() {
     }
 }
 
-static void
-sp_style_elem_read_content(SPObject *const object)
-{
-	((SPStyleElem* const)object)->cstyleelem->onReadContent();
-}
-
 /**
  * Does addListener(fns, data) on \a repr and all of its descendents.
  */
@@ -413,7 +361,7 @@ rec_add_listener(Inkscape::XML::Node &repr,
 void CStyleElem::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
 	SPStyleElem* object = this->spstyleelem;
 
-    sp_style_elem_read_content(object);
+    object->cstyleelem->onReadContent();
 
     object->readAttr( "type" );
     object->readAttr( "media" );
@@ -430,11 +378,6 @@ void CStyleElem::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
     CObject::onBuild(document, repr);
 }
 
-static void
-sp_style_elem_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
-{
-	((SPStyleElem*)object)->cstyleelem->onBuild(document, repr);
-}
 
 
 /*