NR::Maybe => boost::optional

[inkscape.git] / src / event-context.cpp

diff --git a/src/event-context.cpp b/src/event-context.cpp
index 7afe9070dd670bc5aa569b7b1620d49f7b2d3b80..22c91e4505c8f66f508b090406fd5fcc5ac8ce9f 100644 (file)
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -198,6 +198,7 @@ sp_event_context_update_cursor(SPEventContext *ec)
             }
         }
         gdk_window_set_cursor(w->window, ec->cursor);
+        gdk_flush();
     }
     ec->desktop->waiting_cursor = false;
 }
@@ -496,7 +497,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
                 ret = TRUE;
             } else if (zoom_rb == event->button.button) {
                 zoom_rb = 0;
-                NR::Maybe<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle();
+                boost::optional<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle();
                 Inkscape::Rubberband::get()->stop();
                 if (b && !within_tolerance) {
                     desktop->set_display_area(*b, 10);