From cfe48de7f071e2e07a1f2f2ace3456f7b410e93b Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Fri, 5 Apr 2013 15:37:33 +0200 Subject: Merged Shape and subclasses. Cleaned up a bit. (bzr r11608.1.76) --- src/star-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index e2d6961f0..35ea79462 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -479,7 +479,7 @@ sp_star_finish (SPStarContext * sc) SPDesktop *desktop = SP_EVENT_CONTEXT(sc)->desktop; SPObject *object = SP_OBJECT(sc->item); - (SP_SHAPE(sc->item))->setShape(); + (SP_SHAPE(sc->item))->set_shape(); object->updateRepr(SP_OBJECT_WRITE_EXT); -- cgit v1.2.3 From e58cac52b258e64c2cc88b0044bf9cfbaecedce2 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 9 Apr 2013 00:23:07 +0200 Subject: Started conversion of SPEventContext tree; added virtual pads to all classes. (bzr r11608.1.89) --- src/star-context.cpp | 93 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 64 insertions(+), 29 deletions(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index 35ea79462..dec70eb4a 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -77,9 +77,17 @@ sp_star_context_class_init (SPStarContextClass * klass) event_context_class->root_handler = sp_star_context_root_handler; } +CStarContext::CStarContext(SPStarContext* starcontext) : CEventContext(starcontext) { + this->spstarcontext = starcontext; +} + static void sp_star_context_init (SPStarContext * star_context) { + star_context->cstarcontext = new CStarContext(star_context); + delete star_context->ceventcontext; + star_context->ceventcontext = star_context->cstarcontext; + SPEventContext *event_context = SP_EVENT_CONTEXT (star_context); event_context->cursor_shape = cursor_star_xpm; @@ -103,6 +111,12 @@ sp_star_context_init (SPStarContext * star_context) static void sp_star_context_finish(SPEventContext *ec) { + ec->ceventcontext->finish(); +} + +void CStarContext::finish() { + SPEventContext* ec = this->speventcontext; + SPStarContext *sc = SP_STAR_CONTEXT(ec); SPDesktop *desktop = ec->desktop; @@ -110,9 +124,10 @@ static void sp_star_context_finish(SPEventContext *ec) sp_star_finish(sc); sc->sel_changed_connection.disconnect(); - if ((SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->finish) { - (SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->finish(ec); - } +// if ((SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->finish) { +// (SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->finish(ec); +// } + CEventContext::finish(); } @@ -161,43 +176,56 @@ static void sp_star_context_selection_changed (Inkscape::Selection * selection, static void sp_star_context_setup (SPEventContext *ec) { - SPStarContext *sc = SP_STAR_CONTEXT (ec); + ec->ceventcontext->setup(); +} - if ((SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->setup) - (SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->setup (ec); +void CStarContext::setup() { + SPEventContext* ec = this->speventcontext; - sp_event_context_read (ec, "magnitude"); - sp_event_context_read (ec, "proportion"); - sp_event_context_read (ec, "isflatsided"); - sp_event_context_read (ec, "rounded"); - sp_event_context_read (ec, "randomized"); + SPStarContext *sc = SP_STAR_CONTEXT (ec); - ec->shape_editor = new ShapeEditor(ec->desktop); +// if ((SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->setup) +// (SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->setup (ec); + CEventContext::setup(); - SPItem *item = sp_desktop_selection(ec->desktop)->singleItem(); - if (item) { - ec->shape_editor->set_item(item, SH_KNOTHOLDER); - } + sp_event_context_read (ec, "magnitude"); + sp_event_context_read (ec, "proportion"); + sp_event_context_read (ec, "isflatsided"); + sp_event_context_read (ec, "rounded"); + sp_event_context_read (ec, "randomized"); - Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); - sc->sel_changed_connection.disconnect(); - sc->sel_changed_connection = selection->connectChanged(sigc::bind(sigc::ptr_fun(&sp_star_context_selection_changed), (gpointer)sc)); + ec->shape_editor = new ShapeEditor(ec->desktop); - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - if (prefs->getBool("/tools/shapes/selcue")) { - ec->enableSelectionCue(); - } + SPItem *item = sp_desktop_selection(ec->desktop)->singleItem(); + if (item) { + ec->shape_editor->set_item(item, SH_KNOTHOLDER); + } - if (prefs->getBool("/tools/shapes/gradientdrag")) { - ec->enableGrDrag(); - } + Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); + sc->sel_changed_connection.disconnect(); + sc->sel_changed_connection = selection->connectChanged(sigc::bind(sigc::ptr_fun(&sp_star_context_selection_changed), (gpointer)sc)); + + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + if (prefs->getBool("/tools/shapes/selcue")) { + ec->enableSelectionCue(); + } - sc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack()); + if (prefs->getBool("/tools/shapes/gradientdrag")) { + ec->enableGrDrag(); + } + + sc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack()); } static void sp_star_context_set (SPEventContext *ec, Inkscape::Preferences::Entry *val) { + ec->ceventcontext->set(val); +} + +void CStarContext::set(Inkscape::Preferences::Entry* val) { + SPEventContext* ec = this->speventcontext; + SPStarContext *sc = SP_STAR_CONTEXT (ec); Glib::ustring path = val->getEntryName(); @@ -216,6 +244,12 @@ sp_star_context_set (SPEventContext *ec, Inkscape::Preferences::Entry *val) static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent *event) { + return event_context->ceventcontext->root_handler(event); +} + +gint CStarContext::root_handler(GdkEvent* event) { + SPEventContext* event_context = this->speventcontext; + static gboolean dragging; SPDesktop *desktop = event_context->desktop; @@ -389,8 +423,9 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent } if (!ret) { - if ((SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->root_handler) - ret = (SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->root_handler (event_context, event); +// if ((SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->root_handler) +// ret = (SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->root_handler (event_context, event); + ret = CEventContext::root_handler(event); } return ret; -- cgit v1.2.3 From 1d8f1753cd8cab38d19fcc26a4ad70ba2e794ac8 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 9 Apr 2013 22:12:07 +0200 Subject: Added constructors to EventContext tree / some missing virtual pads. (bzr r11608.1.90) --- src/star-context.cpp | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index dec70eb4a..ab75813fe 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -71,23 +71,27 @@ sp_star_context_class_init (SPStarContextClass * klass) object_class->dispose = sp_star_context_dispose; - event_context_class->setup = sp_star_context_setup; - event_context_class->finish = sp_star_context_finish; - event_context_class->set = sp_star_context_set; - event_context_class->root_handler = sp_star_context_root_handler; +// event_context_class->setup = sp_star_context_setup; +// event_context_class->finish = sp_star_context_finish; +// event_context_class->set = sp_star_context_set; +// event_context_class->root_handler = sp_star_context_root_handler; } CStarContext::CStarContext(SPStarContext* starcontext) : CEventContext(starcontext) { this->spstarcontext = starcontext; } -static void -sp_star_context_init (SPStarContext * star_context) -{ +SPStarContext::SPStarContext() : SPEventContext() { + SPStarContext* star_context = this; + star_context->cstarcontext = new CStarContext(star_context); delete star_context->ceventcontext; star_context->ceventcontext = star_context->cstarcontext; + star_context->randomized = 0; + star_context->_message_context = 0; + star_context->rounded = 0; + SPEventContext *event_context = SP_EVENT_CONTEXT (star_context); event_context->cursor_shape = cursor_star_xpm; @@ -109,6 +113,12 @@ sp_star_context_init (SPStarContext * star_context) new (&star_context->sel_changed_connection) sigc::connection(); } +static void +sp_star_context_init (SPStarContext * star_context) +{ + new (star_context) SPStarContext(); +} + static void sp_star_context_finish(SPEventContext *ec) { ec->ceventcontext->finish(); -- cgit v1.2.3 From fbb85064cfaaf03cc09bacedb16a8561f61f2b3d Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 13 Apr 2013 00:37:18 +0200 Subject: Added prefPaths to contexts; modified SPFactory (bzr r11608.1.94) --- src/star-context.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index ab75813fe..6979d51a2 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -61,6 +61,8 @@ static void sp_star_drag (SPStarContext * sc, Geom::Point p, guint state); static void sp_star_finish (SPStarContext * sc); static void sp_star_cancel(SPStarContext * sc); +const std::string SPStarContext::prefsPath = "/tools/shapes/star"; + G_DEFINE_TYPE(SPStarContext, sp_star_context, SP_TYPE_EVENT_CONTEXT); static void -- cgit v1.2.3 From fbdc8b84ff670c684dafc7d7d403ed01e7077e70 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 13 Apr 2013 18:13:17 +0200 Subject: Replaced casting macros for EventContext tree; added contructors. (bzr r11608.1.96) --- src/star-context.cpp | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index 6979d51a2..2e1402cbb 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -52,15 +52,24 @@ using Inkscape::DocumentUndo; static void sp_star_context_dispose (GObject *object); -static void sp_star_context_setup (SPEventContext *ec); -static void sp_star_context_finish(SPEventContext *ec); -static void sp_star_context_set (SPEventContext *ec, Inkscape::Preferences::Entry *val); -static gint sp_star_context_root_handler (SPEventContext *ec, GdkEvent *event); - static void sp_star_drag (SPStarContext * sc, Geom::Point p, guint state); static void sp_star_finish (SPStarContext * sc); static void sp_star_cancel(SPStarContext * sc); +#include "sp-factory.h" + +namespace { + SPEventContext* createStarContext() { + return new SPStarContext(); + } + + bool starContextRegistered = ToolFactory::instance().registerObject("/tools/shapes/star", createStarContext); +} + +const std::string& CStarContext::getPrefsPath() { + return SPStarContext::prefsPath; +} + const std::string SPStarContext::prefsPath = "/tools/shapes/star"; G_DEFINE_TYPE(SPStarContext, sp_star_context, SP_TYPE_EVENT_CONTEXT); @@ -89,6 +98,7 @@ SPStarContext::SPStarContext() : SPEventContext() { star_context->cstarcontext = new CStarContext(star_context); delete star_context->ceventcontext; star_context->ceventcontext = star_context->cstarcontext; + types.insert(typeid(SPStarContext)); star_context->randomized = 0; star_context->_message_context = 0; @@ -121,11 +131,6 @@ sp_star_context_init (SPStarContext * star_context) new (star_context) SPStarContext(); } -static void sp_star_context_finish(SPEventContext *ec) -{ - ec->ceventcontext->finish(); -} - void CStarContext::finish() { SPEventContext* ec = this->speventcontext; @@ -185,12 +190,6 @@ static void sp_star_context_selection_changed (Inkscape::Selection * selection, ec->shape_editor->set_item(item, SH_KNOTHOLDER); } -static void -sp_star_context_setup (SPEventContext *ec) -{ - ec->ceventcontext->setup(); -} - void CStarContext::setup() { SPEventContext* ec = this->speventcontext; @@ -229,12 +228,6 @@ void CStarContext::setup() { sc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack()); } -static void -sp_star_context_set (SPEventContext *ec, Inkscape::Preferences::Entry *val) -{ - ec->ceventcontext->set(val); -} - void CStarContext::set(Inkscape::Preferences::Entry* val) { SPEventContext* ec = this->speventcontext; @@ -254,11 +247,6 @@ void CStarContext::set(Inkscape::Preferences::Entry* val) { } } -static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent *event) -{ - return event_context->ceventcontext->root_handler(event); -} - gint CStarContext::root_handler(GdkEvent* event) { SPEventContext* event_context = this->speventcontext; -- cgit v1.2.3 From 65ba6ad9a82f8f47974eb10665478fd783692bb5 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 20 Apr 2013 23:19:46 +0200 Subject: Merging of EventContext classes complete. (bzr r11608.1.98) --- src/star-context.cpp | 72 +++++++++++++--------------------------------------- 1 file changed, 18 insertions(+), 54 deletions(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index 2e1402cbb..28eaca309 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -50,8 +50,6 @@ using Inkscape::DocumentUndo; -static void sp_star_context_dispose (GObject *object); - static void sp_star_drag (SPStarContext * sc, Geom::Point p, guint state); static void sp_star_finish (SPStarContext * sc); static void sp_star_cancel(SPStarContext * sc); @@ -66,40 +64,15 @@ namespace { bool starContextRegistered = ToolFactory::instance().registerObject("/tools/shapes/star", createStarContext); } -const std::string& CStarContext::getPrefsPath() { +const std::string& SPStarContext::getPrefsPath() { return SPStarContext::prefsPath; } const std::string SPStarContext::prefsPath = "/tools/shapes/star"; -G_DEFINE_TYPE(SPStarContext, sp_star_context, SP_TYPE_EVENT_CONTEXT); - -static void -sp_star_context_class_init (SPStarContextClass * klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS(klass); - SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass); - - object_class->dispose = sp_star_context_dispose; - -// event_context_class->setup = sp_star_context_setup; -// event_context_class->finish = sp_star_context_finish; -// event_context_class->set = sp_star_context_set; -// event_context_class->root_handler = sp_star_context_root_handler; -} - -CStarContext::CStarContext(SPStarContext* starcontext) : CEventContext(starcontext) { - this->spstarcontext = starcontext; -} - SPStarContext::SPStarContext() : SPEventContext() { SPStarContext* star_context = this; - star_context->cstarcontext = new CStarContext(star_context); - delete star_context->ceventcontext; - star_context->ceventcontext = star_context->cstarcontext; - types.insert(typeid(SPStarContext)); - star_context->randomized = 0; star_context->_message_context = 0; star_context->rounded = 0; @@ -122,17 +95,11 @@ SPStarContext::SPStarContext() : SPEventContext() { star_context->proportion = 0.5; star_context->isflatsided = false; - new (&star_context->sel_changed_connection) sigc::connection(); + //new (&star_context->sel_changed_connection) sigc::connection(); } -static void -sp_star_context_init (SPStarContext * star_context) -{ - new (star_context) SPStarContext(); -} - -void CStarContext::finish() { - SPEventContext* ec = this->speventcontext; +void SPStarContext::finish() { + SPEventContext* ec = this; SPStarContext *sc = SP_STAR_CONTEXT(ec); SPDesktop *desktop = ec->desktop; @@ -144,20 +111,17 @@ void CStarContext::finish() { // if ((SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->finish) { // (SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->finish(ec); // } - CEventContext::finish(); + SPEventContext::finish(); } - -static void -sp_star_context_dispose (GObject *object) -{ - SPEventContext *ec = SP_EVENT_CONTEXT (object); - SPStarContext *sc = SP_STAR_CONTEXT (object); +SPStarContext::~SPStarContext() { + SPEventContext *ec = SP_EVENT_CONTEXT (this); + SPStarContext *sc = SP_STAR_CONTEXT (this); ec->enableGrDrag(false); sc->sel_changed_connection.disconnect(); - sc->sel_changed_connection.~connection(); + //sc->sel_changed_connection.~connection(); delete ec->shape_editor; ec->shape_editor = NULL; @@ -169,7 +133,7 @@ sp_star_context_dispose (GObject *object) delete sc->_message_context; } - G_OBJECT_CLASS (sp_star_context_parent_class)->dispose (object); + //G_OBJECT_CLASS (sp_star_context_parent_class)->dispose (object); } /** @@ -190,14 +154,14 @@ static void sp_star_context_selection_changed (Inkscape::Selection * selection, ec->shape_editor->set_item(item, SH_KNOTHOLDER); } -void CStarContext::setup() { - SPEventContext* ec = this->speventcontext; +void SPStarContext::setup() { + SPEventContext* ec = this; SPStarContext *sc = SP_STAR_CONTEXT (ec); // if ((SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->setup) // (SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->setup (ec); - CEventContext::setup(); + SPEventContext::setup(); sp_event_context_read (ec, "magnitude"); sp_event_context_read (ec, "proportion"); @@ -228,8 +192,8 @@ void CStarContext::setup() { sc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack()); } -void CStarContext::set(Inkscape::Preferences::Entry* val) { - SPEventContext* ec = this->speventcontext; +void SPStarContext::set(Inkscape::Preferences::Entry* val) { + SPEventContext* ec = this; SPStarContext *sc = SP_STAR_CONTEXT (ec); Glib::ustring path = val->getEntryName(); @@ -247,8 +211,8 @@ void CStarContext::set(Inkscape::Preferences::Entry* val) { } } -gint CStarContext::root_handler(GdkEvent* event) { - SPEventContext* event_context = this->speventcontext; +gint SPStarContext::root_handler(GdkEvent* event) { + SPEventContext* event_context = this; static gboolean dragging; @@ -425,7 +389,7 @@ gint CStarContext::root_handler(GdkEvent* event) { if (!ret) { // if ((SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->root_handler) // ret = (SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->root_handler (event_context, event); - ret = CEventContext::root_handler(event); + ret = SPEventContext::root_handler(event); } return ret; -- cgit v1.2.3 From 5512f857e2f33f1aa40124dc82b353e5f2e5a0b0 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 20 Apr 2013 23:58:53 +0200 Subject: Moved factories to different files. (bzr r11608.1.100) --- src/star-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index 28eaca309..4116d5e68 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -54,7 +54,7 @@ static void sp_star_drag (SPStarContext * sc, Geom::Point p, guint state); static void sp_star_finish (SPStarContext * sc); static void sp_star_cancel(SPStarContext * sc); -#include "sp-factory.h" +#include "tool-factory.h" namespace { SPEventContext* createStarContext() { -- cgit v1.2.3 From dda3882d58e8cc05ce1d153ad09ee17819d2c0f1 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 21 Apr 2013 01:28:31 +0200 Subject: Some refactoring in RectContext and StarContext. (bzr r11608.1.101) --- src/star-context.cpp | 279 +++++++++++++++++++++++---------------------------- 1 file changed, 125 insertions(+), 154 deletions(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index 4116d5e68..043e1430e 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -50,10 +50,6 @@ using Inkscape::DocumentUndo; -static void sp_star_drag (SPStarContext * sc, Geom::Point p, guint state); -static void sp_star_finish (SPStarContext * sc); -static void sp_star_cancel(SPStarContext * sc); - #include "tool-factory.h" namespace { @@ -89,51 +85,39 @@ SPStarContext::SPStarContext() : SPEventContext() { event_context->item_to_select = NULL; event_context->tool_url = "/tools/shapes/star"; - star_context->item = NULL; + star_context->star = NULL; star_context->magnitude = 5; star_context->proportion = 0.5; star_context->isflatsided = false; - - //new (&star_context->sel_changed_connection) sigc::connection(); } void SPStarContext::finish() { - SPEventContext* ec = this; - - SPStarContext *sc = SP_STAR_CONTEXT(ec); - SPDesktop *desktop = ec->desktop; + SPDesktop *desktop = this->desktop; sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME); - sp_star_finish(sc); - sc->sel_changed_connection.disconnect(); + this->finishItem(); + this->sel_changed_connection.disconnect(); -// if ((SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->finish) { -// (SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->finish(ec); -// } SPEventContext::finish(); } SPStarContext::~SPStarContext() { - SPEventContext *ec = SP_EVENT_CONTEXT (this); - SPStarContext *sc = SP_STAR_CONTEXT (this); + this->enableGrDrag(false); - ec->enableGrDrag(false); + this->sel_changed_connection.disconnect(); - sc->sel_changed_connection.disconnect(); - //sc->sel_changed_connection.~connection(); - - delete ec->shape_editor; - ec->shape_editor = NULL; + delete this->shape_editor; + this->shape_editor = NULL; /* fixme: This is necessary because we do not grab */ - if (sc->item) sp_star_finish (sc); - - if (sc->_message_context) { - delete sc->_message_context; + if (this->star) { + this->finishItem(); } - //G_OBJECT_CLASS (sp_star_context_parent_class)->dispose (object); + if (this->_message_context) { + delete this->_message_context; + } } /** @@ -142,103 +126,87 @@ SPStarContext::~SPStarContext() { * * @param selection Should not be NULL. */ -static void sp_star_context_selection_changed (Inkscape::Selection * selection, gpointer data) -{ +void SPStarContext::selection_changed(Inkscape::Selection* selection) { g_assert (selection != NULL); - SPStarContext *sc = SP_STAR_CONTEXT (data); - SPEventContext *ec = SP_EVENT_CONTEXT (sc); - - ec->shape_editor->unset_item(SH_KNOTHOLDER); - SPItem *item = selection->singleItem(); - ec->shape_editor->set_item(item, SH_KNOTHOLDER); + this->shape_editor->unset_item(SH_KNOTHOLDER); + this->shape_editor->set_item(selection->singleItem(), SH_KNOTHOLDER); } void SPStarContext::setup() { - SPEventContext* ec = this; - - SPStarContext *sc = SP_STAR_CONTEXT (ec); - -// if ((SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->setup) -// (SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->setup (ec); SPEventContext::setup(); - sp_event_context_read (ec, "magnitude"); - sp_event_context_read (ec, "proportion"); - sp_event_context_read (ec, "isflatsided"); - sp_event_context_read (ec, "rounded"); - sp_event_context_read (ec, "randomized"); + sp_event_context_read(this, "magnitude"); + sp_event_context_read(this, "proportion"); + sp_event_context_read(this, "isflatsided"); + sp_event_context_read(this, "rounded"); + sp_event_context_read(this, "randomized"); - ec->shape_editor = new ShapeEditor(ec->desktop); + this->shape_editor = new ShapeEditor(this->desktop); - SPItem *item = sp_desktop_selection(ec->desktop)->singleItem(); + SPItem *item = sp_desktop_selection(this->desktop)->singleItem(); if (item) { - ec->shape_editor->set_item(item, SH_KNOTHOLDER); + this->shape_editor->set_item(item, SH_KNOTHOLDER); } - Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); - sc->sel_changed_connection.disconnect(); - sc->sel_changed_connection = selection->connectChanged(sigc::bind(sigc::ptr_fun(&sp_star_context_selection_changed), (gpointer)sc)); + Inkscape::Selection *selection = sp_desktop_selection(this->desktop); + + this->sel_changed_connection.disconnect(); + + this->sel_changed_connection = selection->connectChanged(sigc::mem_fun(this, &SPStarContext::selection_changed)); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); if (prefs->getBool("/tools/shapes/selcue")) { - ec->enableSelectionCue(); + this->enableSelectionCue(); } if (prefs->getBool("/tools/shapes/gradientdrag")) { - ec->enableGrDrag(); + this->enableGrDrag(); } - sc->_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack()); + this->_message_context = new Inkscape::MessageContext(this->desktop->messageStack()); } void SPStarContext::set(Inkscape::Preferences::Entry* val) { - SPEventContext* ec = this; - - SPStarContext *sc = SP_STAR_CONTEXT (ec); Glib::ustring path = val->getEntryName(); if (path == "magnitude") { - sc->magnitude = CLAMP(val->getInt(5), 3, 1024); + this->magnitude = CLAMP(val->getInt(5), 3, 1024); } else if (path == "proportion") { - sc->proportion = CLAMP(val->getDouble(0.5), 0.01, 2.0); + this->proportion = CLAMP(val->getDouble(0.5), 0.01, 2.0); } else if (path == "isflatsided") { - sc->isflatsided = val->getBool(); + this->isflatsided = val->getBool(); } else if (path == "rounded") { - sc->rounded = val->getDouble(); + this->rounded = val->getDouble(); } else if (path == "randomized") { - sc->randomized = val->getDouble(); + this->randomized = val->getDouble(); } } gint SPStarContext::root_handler(GdkEvent* event) { - SPEventContext* event_context = this; - - static gboolean dragging; + static bool dragging; - SPDesktop *desktop = event_context->desktop; + SPDesktop *desktop = this->desktop; Inkscape::Selection *selection = sp_desktop_selection (desktop); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - SPStarContext *sc = SP_STAR_CONTEXT (event_context); - - event_context->tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); + this->tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100); gint ret = FALSE; switch (event->type) { case GDK_BUTTON_PRESS: - if (event->button.button == 1 && !event_context->space_panning) { + if (event->button.button == 1 && !this->space_panning) { + dragging = true; - dragging = TRUE; - - sc->center = Inkscape::setup_for_drag_start(desktop, event_context, event); + this->center = Inkscape::setup_for_drag_start(desktop, this, event); /* Snap center */ SnapManager &m = desktop->namedview->snap_manager; m.setup(desktop, true); - m.freeSnapReturnByRef(sc->center, Inkscape::SNAPSOURCE_NODE_HANDLE); + m.freeSnapReturnByRef(this->center, Inkscape::SNAPSOURCE_NODE_HANDLE); m.unSetup(); + sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | @@ -248,28 +216,28 @@ gint SPStarContext::root_handler(GdkEvent* event) { ret = TRUE; } break; - case GDK_MOTION_NOTIFY: - if (dragging && (event->motion.state & GDK_BUTTON1_MASK) && !event_context->space_panning) { - if ( event_context->within_tolerance - && ( abs( (gint) event->motion.x - event_context->xp ) < event_context->tolerance ) - && ( abs( (gint) event->motion.y - event_context->yp ) < event_context->tolerance ) ) { + case GDK_MOTION_NOTIFY: + if (dragging && (event->motion.state & GDK_BUTTON1_MASK) && !this->space_panning) { + if ( this->within_tolerance + && ( abs( (gint) event->motion.x - this->xp ) < this->tolerance ) + && ( abs( (gint) event->motion.y - this->yp ) < this->tolerance ) ) { break; // do not drag if we're within tolerance from origin } // Once the user has moved farther than tolerance from the original location // (indicating they intend to draw, not click), then always process the // motion notify coordinates as given (no snapping back to origin) - event_context->within_tolerance = false; + this->within_tolerance = false; Geom::Point const motion_w(event->motion.x, event->motion.y); Geom::Point motion_dt(desktop->w2d(motion_w)); - sp_star_drag (sc, motion_dt, event->motion.state); + this->drag(motion_dt, event->motion.state); gobble_motion_events(GDK_BUTTON1_MASK); ret = TRUE; - } else if (!sp_event_context_knot_mouseover(event_context)) { + } else if (!sp_event_context_knot_mouseover(this)) { SnapManager &m = desktop->namedview->snap_manager; m.setup(desktop); @@ -281,30 +249,34 @@ gint SPStarContext::root_handler(GdkEvent* event) { } break; case GDK_BUTTON_RELEASE: - event_context->xp = event_context->yp = 0; - if (event->button.button == 1 && !event_context->space_panning) { - dragging = FALSE; - sp_event_context_discard_delayed_snap_event(event_context); - if (!event_context->within_tolerance) { + this->xp = this->yp = 0; + + if (event->button.button == 1 && !this->space_panning) { + dragging = false; + + sp_event_context_discard_delayed_snap_event(this); + + if (!this->within_tolerance) { // we've been dragging, finish the star - sp_star_finish (sc); - } else if (event_context->item_to_select) { + this->finishItem(); + } else if (this->item_to_select) { // no dragging, select clicked item if any if (event->button.state & GDK_SHIFT_MASK) { - selection->toggle(event_context->item_to_select); + selection->toggle(this->item_to_select); } else { - selection->set(event_context->item_to_select); + selection->set(this->item_to_select); } } else { // click in an empty space selection->clear(); } - event_context->item_to_select = NULL; + this->item_to_select = NULL; ret = TRUE; sp_canvas_item_ungrab(SP_CANVAS_ITEM (desktop->acetate), event->button.time); } break; + case GDK_KEY_PRESS: switch (get_group0_keyval(&event->key)) { case GDK_KEY_Alt_R: @@ -314,11 +286,12 @@ gint SPStarContext::root_handler(GdkEvent* event) { case GDK_KEY_Shift_R: case GDK_KEY_Meta_L: // Meta is when you press Shift+Alt (at least on my machine) case GDK_KEY_Meta_R: - sp_event_show_modifier_tip(event_context->defaultMessageContext(), event, + sp_event_show_modifier_tip(this->defaultMessageContext(), event, _("Ctrl: snap angle; keep rays radial"), NULL, NULL); break; + case GDK_KEY_Up: case GDK_KEY_Down: case GDK_KEY_KP_Up: @@ -327,6 +300,7 @@ gint SPStarContext::root_handler(GdkEvent* event) { if (!MOD__CTRL_ONLY) ret = TRUE; break; + case GDK_KEY_x: case GDK_KEY_X: if (MOD__ALT_ONLY) { @@ -334,38 +308,44 @@ gint SPStarContext::root_handler(GdkEvent* event) { ret = TRUE; } break; + case GDK_KEY_Escape: if (dragging) { dragging = false; - sp_event_context_discard_delayed_snap_event(event_context); + sp_event_context_discard_delayed_snap_event(this); // if drawing, cancel, otherwise pass it up for deselecting - sp_star_cancel(sc); + this->cancel(); ret = TRUE; } break; + case GDK_KEY_space: if (dragging) { - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), - event->button.time); + sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time); + dragging = false; - sp_event_context_discard_delayed_snap_event(event_context); - if (!event_context->within_tolerance) { + + sp_event_context_discard_delayed_snap_event(this); + + if (!this->within_tolerance) { // we've been dragging, finish the star - sp_star_finish(sc); + this->finishItem(); } // do not return true, so that space would work switching to selector } break; + case GDK_KEY_Delete: case GDK_KEY_KP_Delete: case GDK_KEY_BackSpace: - ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY); + ret = this->deleteSelectedDrag(MOD__CTRL_ONLY); break; default: break; } break; + case GDK_KEY_RELEASE: switch (get_group0_keyval (&event->key)) { case GDK_KEY_Alt_L: @@ -376,66 +356,66 @@ gint SPStarContext::root_handler(GdkEvent* event) { case GDK_KEY_Shift_R: case GDK_KEY_Meta_L: // Meta is when you press Shift+Alt case GDK_KEY_Meta_R: - event_context->defaultMessageContext()->clear(); + this->defaultMessageContext()->clear(); break; + default: break; } break; + default: break; } if (!ret) { -// if ((SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->root_handler) -// ret = (SP_EVENT_CONTEXT_CLASS(sp_star_context_parent_class))->root_handler (event_context, event); ret = SPEventContext::root_handler(event); } return ret; } -static void sp_star_drag(SPStarContext *sc, Geom::Point p, guint state) +void SPStarContext::drag(Geom::Point p, guint state) { - SPDesktop *desktop = SP_EVENT_CONTEXT(sc)->desktop; + SPDesktop *desktop = this->desktop; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); int const snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12); - if (!sc->item) { - - if (Inkscape::have_viable_layer(desktop, sc->_message_context) == false) { + if (!this->star) { + if (Inkscape::have_viable_layer(desktop, this->_message_context) == false) { return; } // Create object - Inkscape::XML::Document *xml_doc = SP_EVENT_CONTEXT_DOCUMENT(sc)->getReprDoc(); + Inkscape::XML::Document *xml_doc = this->desktop->doc()->getReprDoc(); Inkscape::XML::Node *repr = xml_doc->createElement("svg:path"); repr->setAttribute("sodipodi:type", "star"); // Set style sp_desktop_apply_style_tool(desktop, repr, "/tools/shapes/star", false); - sc->item = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr)); + this->star = SP_STAR(desktop->currentLayer()->appendChildRepr(repr)); + Inkscape::GC::release(repr); - sc->item->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); - sc->item->updateRepr(); + this->star->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse(); + this->star->updateRepr(); desktop->canvas->forceFullRedrawAfterInterruptions(5); } /* Snap corner point with no constraints */ SnapManager &m = desktop->namedview->snap_manager; - m.setup(desktop, true, sc->item); + + m.setup(desktop, true, this->star); Geom::Point pt2g = p; m.freeSnapReturnByRef(pt2g, Inkscape::SNAPSOURCE_NODE_HANDLE); m.unSetup(); - Geom::Point const p0 = desktop->dt2doc(sc->center); - Geom::Point const p1 = desktop->dt2doc(pt2g); - SPStar *star = SP_STAR(sc->item); + Geom::Point const p0 = desktop->dt2doc(this->center); + Geom::Point const p1 = desktop->dt2doc(pt2g); - double const sides = (gdouble) sc->magnitude; + double const sides = (gdouble) this->magnitude; Geom::Point const d = p1 - p0; Geom::Coord const r1 = Geom::L2(d); double arg1 = atan2(d); @@ -445,13 +425,13 @@ static void sp_star_drag(SPStarContext *sc, Geom::Point p, guint state) arg1 = sp_round(arg1, M_PI / snaps); } - sp_star_position_set(star, sc->magnitude, p0, r1, r1 * sc->proportion, - arg1, arg1 + M_PI / sides, sc->isflatsided, sc->rounded, sc->randomized); + sp_star_position_set(this->star, this->magnitude, p0, r1, r1 * this->proportion, + arg1, arg1 + M_PI / sides, this->isflatsided, this->rounded, this->randomized); /* status text */ GString *rads = SP_PX_TO_METRIC_STRING(r1, desktop->namedview->getDefaultMetric()); - sc->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, - ( sc->isflatsided? + this->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, + ( this->isflatsided? _("Polygon: radius %s, angle %5g°; with Ctrl to snap angle") : _("Star: radius %s, angle %5g°; with Ctrl to snap angle") ), rads->str, sp_round((arg1) * 180 / M_PI, 0.0001)); @@ -459,55 +439,46 @@ static void sp_star_drag(SPStarContext *sc, Geom::Point p, guint state) g_string_free(rads, FALSE); } -static void -sp_star_finish (SPStarContext * sc) -{ - sc->_message_context->clear(); +void SPStarContext::finishItem() { + this->_message_context->clear(); - if (sc->item != NULL) { - SPStar *star = SP_STAR(sc->item); - if (star->r[1] == 0) { - sp_star_cancel(sc); // Don't allow the creating of zero sized arc, for example when the start and and point snap to the snap grid point + if (this->star != NULL) { + if (this->star->r[1] == 0) { + // Don't allow the creating of zero sized arc, for example + // when the start and and point snap to the snap grid point + this->cancel(); return; } // Set transform center, so that odd stars rotate correctly // LP #462157 - sc->item->setCenter(sc->center); - - SPDesktop *desktop = SP_EVENT_CONTEXT(sc)->desktop; - SPObject *object = SP_OBJECT(sc->item); - - (SP_SHAPE(sc->item))->set_shape(); - - object->updateRepr(SP_OBJECT_WRITE_EXT); + this->star->setCenter(this->center); + this->star->set_shape(); + this->star->updateRepr(SP_OBJECT_WRITE_EXT); desktop->canvas->endForcedFullRedraws(); - sp_desktop_selection(desktop)->set(sc->item); + sp_desktop_selection(desktop)->set(this->star); DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_STAR, _("Create star")); - sc->item = NULL; + this->star = NULL; } } -static void sp_star_cancel(SPStarContext *sc) -{ - SPDesktop *desktop = SP_EVENT_CONTEXT(sc)->desktop; - +void SPStarContext::cancel() { sp_desktop_selection(desktop)->clear(); sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), 0); - if (sc->item != NULL) { - SP_OBJECT(sc->item)->deleteObject(); - sc->item = NULL; + if (this->star != NULL) { + this->star->deleteObject(); + this->star = NULL; } - sc->within_tolerance = false; - sc->xp = 0; - sc->yp = 0; - sc->item_to_select = NULL; + this->within_tolerance = false; + this->xp = 0; + this->yp = 0; + this->item_to_select = NULL; desktop->canvas->endForcedFullRedraws(); -- cgit v1.2.3 From d483730f7dbad0c29366354b32b4b2a1020eba0d Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 21 Apr 2013 21:32:53 +0200 Subject: More cleaning. (bzr r11608.1.103) --- src/star-context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index 043e1430e..aecdd1b0d 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -83,7 +83,7 @@ SPStarContext::SPStarContext() : SPEventContext() { event_context->tolerance = 0; event_context->within_tolerance = false; event_context->item_to_select = NULL; - event_context->tool_url = "/tools/shapes/star"; + //event_context->tool_url = "/tools/shapes/star"; star_context->star = NULL; -- cgit v1.2.3 From bdde74bbab299f2ee448f1c55469c56a66fb01f7 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 21 Apr 2013 23:58:15 +0200 Subject: Removed some unused files; more refactoring in EventContext tree. (bzr r11608.1.104) --- src/star-context.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index aecdd1b0d..cb3e663d7 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -167,19 +167,19 @@ void SPStarContext::setup() { this->_message_context = new Inkscape::MessageContext(this->desktop->messageStack()); } -void SPStarContext::set(Inkscape::Preferences::Entry* val) { - Glib::ustring path = val->getEntryName(); +void SPStarContext::set(const Inkscape::Preferences::Entry& val) { + Glib::ustring path = val.getEntryName(); if (path == "magnitude") { - this->magnitude = CLAMP(val->getInt(5), 3, 1024); + this->magnitude = CLAMP(val.getInt(5), 3, 1024); } else if (path == "proportion") { - this->proportion = CLAMP(val->getDouble(0.5), 0.01, 2.0); + this->proportion = CLAMP(val.getDouble(0.5), 0.01, 2.0); } else if (path == "isflatsided") { - this->isflatsided = val->getBool(); + this->isflatsided = val.getBool(); } else if (path == "rounded") { - this->rounded = val->getDouble(); + this->rounded = val.getDouble(); } else if (path == "randomized") { - this->randomized = val->getDouble(); + this->randomized = val.getDouble(); } } -- cgit v1.2.3 From b2dd3583e7372d23d18bbc6e861f4f645ec3dc37 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 30 Jul 2013 23:17:21 +0200 Subject: Further refactoring of EventContexts. (bzr r11608.1.109) --- src/star-context.cpp | 53 ++++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index 4272fb1a0..3601a4d49 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -67,35 +67,30 @@ const std::string& SPStarContext::getPrefsPath() { const std::string SPStarContext::prefsPath = "/tools/shapes/star"; SPStarContext::SPStarContext() : SPEventContext() { - SPStarContext* star_context = this; + this->randomized = 0; + this->message_context = 0; + this->rounded = 0; - star_context->randomized = 0; - star_context->_message_context = 0; - star_context->rounded = 0; - - SPEventContext *event_context = SP_EVENT_CONTEXT (star_context); - - event_context->cursor_shape = cursor_star_xpm; - event_context->hot_x = 4; - event_context->hot_y = 4; - event_context->xp = 0; - event_context->yp = 0; - event_context->tolerance = 0; - event_context->within_tolerance = false; - event_context->item_to_select = NULL; - //event_context->tool_url = "/tools/shapes/star"; + this->cursor_shape = cursor_star_xpm; + this->hot_x = 4; + this->hot_y = 4; + this->xp = 0; + this->yp = 0; + this->tolerance = 0; + this->within_tolerance = false; + this->item_to_select = NULL; + //this->tool_url = "/tools/shapes/star"; - star_context->star = NULL; + this->star = NULL; - star_context->magnitude = 5; - star_context->proportion = 0.5; - star_context->isflatsided = false; + this->magnitude = 5; + this->proportion = 0.5; + this->isflatsided = false; } void SPStarContext::finish() { - SPDesktop *desktop = this->desktop; - sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), GDK_CURRENT_TIME); + this->finishItem(); this->sel_changed_connection.disconnect(); @@ -115,8 +110,8 @@ SPStarContext::~SPStarContext() { this->finishItem(); } - if (this->_message_context) { - delete this->_message_context; + if (this->message_context) { + delete this->message_context; } } @@ -164,7 +159,7 @@ void SPStarContext::setup() { this->enableGrDrag(); } - this->_message_context = new Inkscape::MessageContext(this->desktop->messageStack()); + this->message_context = new Inkscape::MessageContext(this->desktop->messageStack()); } void SPStarContext::set(const Inkscape::Preferences::Entry& val) { @@ -183,7 +178,7 @@ void SPStarContext::set(const Inkscape::Preferences::Entry& val) { } } -gint SPStarContext::root_handler(GdkEvent* event) { +bool SPStarContext::root_handler(GdkEvent* event) { static bool dragging; SPDesktop *desktop = this->desktop; @@ -383,7 +378,7 @@ void SPStarContext::drag(Geom::Point p, guint state) int const snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12); if (!this->star) { - if (Inkscape::have_viable_layer(desktop, this->_message_context) == false) { + if (Inkscape::have_viable_layer(desktop, this->message_context) == false) { return; } @@ -430,7 +425,7 @@ void SPStarContext::drag(Geom::Point p, guint state) /* status text */ GString *rads = SP_PX_TO_METRIC_STRING(r1, desktop->namedview->getDefaultMetric()); - this->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, + this->message_context->setF(Inkscape::IMMEDIATE_MESSAGE, ( this->isflatsided? _("Polygon: radius %s, angle %5g°; with Ctrl to snap angle") : _("Star: radius %s, angle %5g°; with Ctrl to snap angle") ), @@ -440,7 +435,7 @@ void SPStarContext::drag(Geom::Point p, guint state) } void SPStarContext::finishItem() { - this->_message_context->clear(); + this->message_context->clear(); if (this->star != NULL) { if (this->star->r[1] == 0) { -- cgit v1.2.3 From 989abbac025a8b3349748d19a613a08586c5fdcd Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Wed, 31 Jul 2013 21:11:20 +0200 Subject: Fixed SPObject ctor and dtor; removed singleton.h; some smaller changes. (bzr r11608.1.110) --- src/star-context.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/star-context.cpp') diff --git a/src/star-context.cpp b/src/star-context.cpp index 3601a4d49..d4dee3892 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -68,7 +68,6 @@ const std::string SPStarContext::prefsPath = "/tools/shapes/star"; SPStarContext::SPStarContext() : SPEventContext() { this->randomized = 0; - this->message_context = 0; this->rounded = 0; this->cursor_shape = cursor_star_xpm; @@ -109,10 +108,6 @@ SPStarContext::~SPStarContext() { if (this->star) { this->finishItem(); } - - if (this->message_context) { - delete this->message_context; - } } /** @@ -158,8 +153,6 @@ void SPStarContext::setup() { if (prefs->getBool("/tools/shapes/gradientdrag")) { this->enableGrDrag(); } - - this->message_context = new Inkscape::MessageContext(this->desktop->messageStack()); } void SPStarContext::set(const Inkscape::Preferences::Entry& val) { -- cgit v1.2.3