From 4f7fe42548e3f91dffc8df220c04f16911497346 Mon Sep 17 00:00:00 2001 From: MenTaLguY Date: Sun, 4 Mar 2007 02:08:21 +0000 Subject: make conversions away from NR::Maybe explicit (bzr r2530) --- src/node-context.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/node-context.cpp') diff --git a/src/node-context.cpp b/src/node-context.cpp index 235b89db3..352bac584 100644 --- a/src/node-context.cpp +++ b/src/node-context.cpp @@ -419,8 +419,8 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (nc->shape_editor->hits_curve() && !event_context->within_tolerance) { //drag curve nc->shape_editor->finish_drag(); - } else if (b != NR::Nothing() && !event_context->within_tolerance) { // drag to select - nc->shape_editor->select_rect(b.assume(), event->button.state & GDK_SHIFT_MASK); + } else if (b && !event_context->within_tolerance) { // drag to select + nc->shape_editor->select_rect(*b, event->button.state & GDK_SHIFT_MASK); } else { if (!(nc->rb_escaped)) { // unless something was cancelled if (nc->shape_editor->has_selection()) @@ -584,7 +584,7 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event) case GDK_Escape: { NR::Maybe const b = Inkscape::Rubberband::get()->getRectangle(); - if (b != NR::Nothing()) { + if (b) { Inkscape::Rubberband::get()->stop(); nc->current_state = SP_NODE_CONTEXT_INACTIVE; nc->rb_escaped = true; -- cgit v1.2.3