From 8e0ceb0c448765b151744838e67e9e2bcdaa0ba3 Mon Sep 17 00:00:00 2001 From: Maximilian Albert Date: Thu, 14 Aug 2008 21:35:32 +0000 Subject: Removal of SP_ACTIVE_DESKTOP, next take (bzr r6630) --- src/event-context.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/event-context.cpp') diff --git a/src/event-context.cpp b/src/event-context.cpp index 22c91e450..450d1994d 100644 --- a/src/event-context.cpp +++ b/src/event-context.cpp @@ -457,10 +457,10 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, // motion notify coordinates as given (no snapping back to origin) within_tolerance = false; - 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); } else { - Inkscape::Rubberband::get()->start(desktop, motion_dt); + Inkscape::Rubberband::get(desktop)->start(desktop, motion_dt); } if (zoom_rb == 2) gobble_motion_events(GDK_BUTTON2_MASK); @@ -497,8 +497,8 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, ret = TRUE; } else if (zoom_rb == event->button.button) { zoom_rb = 0; - boost::optional const b = Inkscape::Rubberband::get()->getRectangle(); - Inkscape::Rubberband::get()->stop(); + boost::optional const b = Inkscape::Rubberband::get(desktop)->getRectangle(); + Inkscape::Rubberband::get(desktop)->stop(); if (b && !within_tolerance) { desktop->set_display_area(*b, 10); } -- cgit v1.2.3