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/zoom-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/zoom-context.cpp')
| -rw-r--r-- | src/zoom-context.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/zoom-context.cpp b/src/zoom-context.cpp index 56eeb69cb..8c6400189 100644 --- a/src/zoom-context.cpp +++ b/src/zoom-context.cpp @@ -133,7 +133,7 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent yp = (gint) event->button.y; within_tolerance = true; - Inkscape::Rubberband::get()->start(desktop, button_dt); + Inkscape::Rubberband::get(desktop)->start(desktop, button_dt); escaped = false; @@ -164,7 +164,7 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent NR::Point const motion_w(event->motion.x, event->motion.y); NR::Point const motion_dt(desktop->w2d(motion_w)); - Inkscape::Rubberband::get()->move(motion_dt); + Inkscape::Rubberband::get(desktop)->move(motion_dt); gobble_motion_events(GDK_BUTTON1_MASK); } break; @@ -174,7 +174,7 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent NR::Point const button_w(event->button.x, event->button.y); NR::Point const button_dt(desktop->w2d(button_w)); if ( event->button.button == 1 && !event_context->space_panning) { - boost::optional<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle(); + boost::optional<NR::Rect> const b = Inkscape::Rubberband::get(desktop)->getRectangle(); if (b && !within_tolerance) { desktop->set_display_area(*b, 10); } else if (!escaped) { @@ -185,7 +185,7 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent } ret = TRUE; } - Inkscape::Rubberband::get()->stop(); + Inkscape::Rubberband::get(desktop)->stop(); xp = yp = 0; escaped = false; break; @@ -193,7 +193,7 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent case GDK_KEY_PRESS: switch (get_group0_keyval (&event->key)) { case GDK_Escape: - Inkscape::Rubberband::get()->stop(); + Inkscape::Rubberband::get(desktop)->stop(); xp = yp = 0; escaped = true; ret = TRUE; |