diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2008-08-14 21:35:32 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2008-08-14 21:35:32 +0000 |
| commit | 8e0ceb0c448765b151744838e67e9e2bcdaa0ba3 (patch) | |
| tree | ff380858187aad25d049ac97f682b97f9f4447c0 /src/gradient-context.cpp | |
| parent | Get rid of a whole bunch of further instances of SP_ACTIVE_DESKTOP (where the... (diff) | |
| download | inkscape-8e0ceb0c448765b151744838e67e9e2bcdaa0ba3.tar.gz inkscape-8e0ceb0c448765b151744838e67e9e2bcdaa0ba3.zip | |
Removal of SP_ACTIVE_DESKTOP, next take
(bzr r6630)
Diffstat (limited to 'src/gradient-context.cpp')
| -rw-r--r-- | src/gradient-context.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gradient-context.cpp b/src/gradient-context.cpp index f2cd9e03a..e6932c710 100644 --- a/src/gradient-context.cpp +++ b/src/gradient-context.cpp @@ -544,7 +544,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event) Geom::Point button_dt = to_2geom(desktop->w2d(button_w)); if (event->button.state & GDK_SHIFT_MASK) { - Inkscape::Rubberband::get()->start(desktop, from_2geom(button_dt)); + Inkscape::Rubberband::get(desktop)->start(desktop, from_2geom(button_dt)); } else { // remember clicked item, disregarding groups, honoring Alt; do nothing with Crtl to // enable Ctrl+doubleclick of exactly the selected item(s) @@ -579,8 +579,8 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event) event->motion.y); NR::Point const motion_dt = event_context->desktop->w2d(motion_w); - if (Inkscape::Rubberband::get()->is_started()) { - Inkscape::Rubberband::get()->move(motion_dt); + if (Inkscape::Rubberband::get(desktop)->is_started()) { + Inkscape::Rubberband::get(desktop)->move(motion_dt); event_context->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("<b>Draw around</b> handles to select them")); } else { sp_gradient_drag(*rc, motion_dt, event->motion.state, event->motion.time); @@ -637,7 +637,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (!event_context->within_tolerance) { // we've been dragging, either do nothing (grdrag handles that), // or rubberband-select if we have rubberband - Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(); + Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop); if (r->is_started() && !event_context->within_tolerance) { // this was a rubberband drag if (r->getMode() == RUBBERBAND_MODE_RECT) { @@ -665,7 +665,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event) event_context->item_to_select = NULL; ret = TRUE; } - Inkscape::Rubberband::get()->stop(); + Inkscape::Rubberband::get(desktop)->stop(); } break; case GDK_KEY_PRESS: |