diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-07-14 21:09:41 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-07-14 21:09:41 +0000 |
| commit | d32efb61f1c2c18d1018e510bbe9bafc04a03905 (patch) | |
| tree | b447bf9856baf1cf485e38c4ce55edb27285129e /src/flood-context.cpp | |
| parent | Merged from trunk (r12305) (diff) | |
| parent | Minor C++ish refactoring pass. (diff) | |
| download | inkscape-d32efb61f1c2c18d1018e510bbe9bafc04a03905.tar.gz inkscape-d32efb61f1c2c18d1018e510bbe9bafc04a03905.zip | |
Merged from trunk (r12419).
(bzr r11608.1.107)
Diffstat (limited to 'src/flood-context.cpp')
| -rw-r--r-- | src/flood-context.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/flood-context.cpp b/src/flood-context.cpp index 367597532..3d2975e41 100644 --- a/src/flood-context.cpp +++ b/src/flood-context.cpp @@ -485,7 +485,7 @@ static void do_trace(bitmap_coords_info bci, guchar *trace_px, SPDesktop *deskto ngettext("Area filled, path with <b>%d</b> node created and unioned with selection.","Area filled, path with <b>%d</b> nodes created and unioned with selection.", SP_PATH(reprobj)->nodesInPath()), SP_PATH(reprobj)->nodesInPath() ); selection->add(reprobj); - sp_selected_path_union_skip_undo(desktop); + sp_selected_path_union_skip_undo(sp_desktop_selection(desktop), desktop); } else { desktop->messageStack()->flashF( Inkscape::WARNING_MESSAGE, ngettext("Area filled, path with <b>%d</b> node created.","Area filled, path with <b>%d</b> nodes created.", @@ -1211,7 +1211,7 @@ gint SPFloodContext::root_handler(GdkEvent* event) { case GDK_KEY_KP_Up: case GDK_KEY_KP_Down: // prevent the zoom field from activation - if (!MOD__CTRL_ONLY) + if (!MOD__CTRL_ONLY(event)) ret = TRUE; break; default: |