NR::Maybe => boost::optional

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

diff --git a/src/event-context.cpp b/src/event-context.cpp
index 146237346b1360899a7e97afecb2f8381ccbd096..22c91e4505c8f66f508b090406fd5fcc5ac8ce9f 100644 (file)
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -32,6 +32,8 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmenu.h>
 #include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
 
 #include "display/sp-canvas.h"
 #include "xml/node-event-vector.h"
@@ -196,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;
 }
@@ -372,7 +375,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
                     if (event_context->space_panning) {
                         panning = 1;
                         sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
-                            GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
+                            GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
                             NULL, event->button.time-1);
                         ret = TRUE;
                     }
@@ -383,7 +386,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
                     } else {
                         panning = 2;
                         sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
-                            GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
+                            GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
                             NULL, event->button.time-1);
                     }
                     ret = TRUE;
@@ -393,7 +396,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
                             || event->button.state & GDK_CONTROL_MASK) {
                         panning = 3;
                         sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
-                                GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK,
+                                GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK,
                                 NULL, event->button.time);
                         ret = TRUE;
                     } else {
@@ -494,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);
@@ -1051,7 +1054,7 @@ ec_shape_event_attr_changed(Inkscape::XML::Node */*shape_repr*/, gchar const *na
     SPEventContext *ec = SP_EVENT_CONTEXT(data);
 
     if (ec->shape_knot_holder) {
-        sp_knot_holder_destroy(ec->shape_knot_holder);
+        delete ec->shape_knot_holder;
     }
     ec->shape_knot_holder = NULL;