summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-07-30 21:17:21 +0000
committerMarkus Engel <markus.engel@tum.de>2013-07-30 21:17:21 +0000
commitb2dd3583e7372d23d18bbc6e861f4f645ec3dc37 (patch)
tree659f5549fc533cebec5326615b6e385ffdde5453 /src/widgets
parentMerge from trunk (r12439). (diff)
downloadinkscape-b2dd3583e7372d23d18bbc6e861f4f645ec3dc37.tar.gz
inkscape-b2dd3583e7372d23d18bbc6e861f4f645ec3dc37.zip
Further refactoring of EventContexts.
(bzr r11608.1.109)
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/gradient-toolbar.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index 291e19016..ecb9df4c4 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -373,7 +373,7 @@ static void gr_tb_selection_changed(Inkscape::Selection * /*selection*/, gpointe
Inkscape::Selection *selection = sp_desktop_selection(desktop); // take from desktop, not from args
if (selection) {
- SPEventContext *ev = sp_desktop_event_context(desktop);
+ SPEventContext *ev = desktop->getEventContext();
GrDrag *drag = NULL;
if (ev) {
drag = ev->get_drag();
@@ -585,7 +585,7 @@ static void gr_add_stop(GtkWidget * /*button*/, GtkWidget *vb)
return;
}
- SPEventContext *ev = sp_desktop_event_context(desktop);
+ SPEventContext *ev = desktop->getEventContext();
SPGradientContext *rc = SP_GRADIENT_CONTEXT(ev);
if (rc) {
@@ -607,7 +607,7 @@ static void gr_remove_stop(GtkWidget * /*button*/, GtkWidget *vb)
return;
}
- SPEventContext *ev = sp_desktop_event_context(desktop);
+ SPEventContext *ev = desktop->getEventContext();
GrDrag *drag = NULL;
if (ev) {
drag = ev->get_drag();
@@ -939,7 +939,7 @@ static void gr_gradient_combo_changed(EgeSelectOneAction *act, gpointer data)
SPDesktop *desktop = static_cast<SPDesktop *>(data);
Inkscape::Selection *selection = sp_desktop_selection(desktop);
- SPEventContext *ev = sp_desktop_event_context(desktop);
+ SPEventContext *ev = desktop->getEventContext();
gr_apply_gradient(selection, ev? ev->get_drag() : NULL, gr);
@@ -981,7 +981,7 @@ static void gr_stop_combo_changed(GtkComboBox * /*widget*/, GtkWidget *data)
}
SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data(G_OBJECT(data), "desktop"));
- SPEventContext *ev = sp_desktop_event_context(desktop);
+ SPEventContext *ev = desktop->getEventContext();
SPGradient *gr = gr_get_selected_gradient(data);
select_drag_by_stop(data, gr, ev);