diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-05-05 11:58:23 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-05-05 11:58:23 +0000 |
| commit | 129e599f69d69970d27f827159d563d58c7831b9 (patch) | |
| tree | fa15e756067f688a61f39da90793d4da90ea0176 /src/zoom-context.cpp | |
| parent | merge from trunk (r12305) (diff) | |
| parent | Fix for 1171434 : trunk: INX <optiongroup> broken^ (diff) | |
| download | inkscape-129e599f69d69970d27f827159d563d58c7831b9.tar.gz inkscape-129e599f69d69970d27f827159d563d58c7831b9.zip | |
merge from trunk (r12322)
(bzr r11668.1.69)
Diffstat (limited to 'src/zoom-context.cpp')
| -rw-r--r-- | src/zoom-context.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/zoom-context.cpp b/src/zoom-context.cpp index 7a5e4f90e..8b06c3e08 100644 --- a/src/zoom-context.cpp +++ b/src/zoom-context.cpp @@ -205,7 +205,7 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent 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; case GDK_KEY_Shift_L: @@ -216,7 +216,7 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent case GDK_KEY_Delete: case GDK_KEY_KP_Delete: case GDK_KEY_BackSpace: - ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY); + ret = event_context->deleteSelectedDrag(MOD__CTRL_ONLY(event)); break; default: |