diff options
| author | MenTaLguY <mental@rydia.net> | 2007-03-04 02:08:21 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2007-03-04 02:08:21 +0000 |
| commit | 4f7fe42548e3f91dffc8df220c04f16911497346 (patch) | |
| tree | e72476964c14896870222829d38e55f387ed3995 /src/node-context.cpp | |
| parent | remove debug messages that sneaked in (diff) | |
| download | inkscape-4f7fe42548e3f91dffc8df220c04f16911497346.tar.gz inkscape-4f7fe42548e3f91dffc8df220c04f16911497346.zip | |
make conversions away from NR::Maybe explicit
(bzr r2530)
Diffstat (limited to 'src/node-context.cpp')
| -rw-r--r-- | src/node-context.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<NR::Rect> 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; |