summaryrefslogtreecommitdiffstats
path: root/src/zoom-context.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-07-14 21:09:41 +0000
committerMarkus Engel <markus.engel@tum.de>2013-07-14 21:09:41 +0000
commitd32efb61f1c2c18d1018e510bbe9bafc04a03905 (patch)
treeb447bf9856baf1cf485e38c4ce55edb27285129e /src/zoom-context.cpp
parentMerged from trunk (r12305) (diff)
parentMinor C++ish refactoring pass. (diff)
downloadinkscape-d32efb61f1c2c18d1018e510bbe9bafc04a03905.tar.gz
inkscape-d32efb61f1c2c18d1018e510bbe9bafc04a03905.zip
Merged from trunk (r12419).
(bzr r11608.1.107)
Diffstat (limited to 'src/zoom-context.cpp')
-rw-r--r--src/zoom-context.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/zoom-context.cpp b/src/zoom-context.cpp
index b86fee0ee..99577648f 100644
--- a/src/zoom-context.cpp
+++ b/src/zoom-context.cpp
@@ -201,7 +201,7 @@ gint SPZoomContext::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;
@@ -214,7 +214,7 @@ gint SPZoomContext::root_handler(GdkEvent* event) {
case GDK_KEY_Delete:
case GDK_KEY_KP_Delete:
case GDK_KEY_BackSpace:
- ret = this->deleteSelectedDrag(MOD__CTRL_ONLY);
+ ret = this->deleteSelectedDrag(MOD__CTRL_ONLY(event));
break;
default: