From 192d134e8283fadf349eb41d66f63206c98c33d1 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Sun, 28 Apr 2013 15:48:03 -0700
Subject: Temporily fix abiguous macros before later removal.

(bzr r12310)
---
 src/dyna-draw-context.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/dyna-draw-context.cpp')

diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index 742d52f09..605e487ab 100644
--- a/src/dyna-draw-context.cpp
+++ b/src/dyna-draw-context.cpp
@@ -854,7 +854,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
         switch (get_group0_keyval (&event->key)) {
         case GDK_KEY_Up:
         case GDK_KEY_KP_Up:
-            if (!MOD__CTRL_ONLY) {
+            if (!MOD__CTRL_ONLY(event)) {
                 dc->angle += 5.0;
                 if (dc->angle > 90.0)
                     dc->angle = 90.0;
@@ -864,7 +864,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
             break;
         case GDK_KEY_Down:
         case GDK_KEY_KP_Down:
-            if (!MOD__CTRL_ONLY) {
+            if (!MOD__CTRL_ONLY(event)) {
                 dc->angle -= 5.0;
                 if (dc->angle < -90.0)
                     dc->angle = -90.0;
@@ -874,7 +874,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
             break;
         case GDK_KEY_Right:
         case GDK_KEY_KP_Right:
-            if (!MOD__CTRL_ONLY) {
+            if (!MOD__CTRL_ONLY(event)) {
                 dc->width += 0.01;
                 if (dc->width > 1.0)
                     dc->width = 1.0;
@@ -884,7 +884,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
             break;
         case GDK_KEY_Left:
         case GDK_KEY_KP_Left:
-            if (!MOD__CTRL_ONLY) {
+            if (!MOD__CTRL_ONLY(event)) {
                 dc->width -= 0.01;
                 if (dc->width < 0.01)
                     dc->width = 0.01;
@@ -906,7 +906,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
             break;
         case GDK_KEY_x:
         case GDK_KEY_X:
-            if (MOD__ALT_ONLY) {
+            if (MOD__ALT_ONLY(event)) {
                 desktop->setToolboxFocusTo ("altx-calligraphy");
                 ret = TRUE;
             }
@@ -920,7 +920,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context,
             break;
         case GDK_KEY_z:
         case GDK_KEY_Z:
-            if (MOD__CTRL_ONLY && dc->is_drawing) {
+            if (MOD__CTRL_ONLY(event) && dc->is_drawing) {
                 // if drawing, cancel, otherwise pass it up for undo
                 calligraphic_cancel (dc);
                 ret = TRUE;
-- 
cgit v1.2.3