Temporily fix abiguous macros before later removal.

(bzr r12310)

1 files changed, 36 insertions, 36 deletions

diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp
index 28e4c1629..694c497e3 100644
--- a/src/tweak-context.cpp
+++ b/src/tweak-context.cpp
@@ -1233,7 +1233,7 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
                 if (!tc->has_dilated) {
                     // if we did not rub, do a light tap
                     tc->pressure = 0.03;
-                    sp_tweak_dilate (tc, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT);
+                    sp_tweak_dilate (tc, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event));
                 }
                 tc->is_dilating = false;
                 tc->has_dilated = false;
@@ -1300,24 +1300,24 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
                 case GDK_KEY_m:
                 case GDK_KEY_M:
                 case GDK_KEY_0:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_tweak_switch_mode(tc, TWEAK_MODE_MOVE, MOD__SHIFT);
+                    if (MOD__SHIFT_ONLY(event)) {
+                        sp_tweak_switch_mode(tc, TWEAK_MODE_MOVE, MOD__SHIFT(event));
                         ret = TRUE;
                     }
                     break;
                 case GDK_KEY_i:
                 case GDK_KEY_I:
                 case GDK_KEY_1:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_tweak_switch_mode(tc, TWEAK_MODE_MOVE_IN_OUT, MOD__SHIFT);
+                    if (MOD__SHIFT_ONLY(event)) {
+                        sp_tweak_switch_mode(tc, TWEAK_MODE_MOVE_IN_OUT, MOD__SHIFT(event));
                         ret = TRUE;
                     }
                     break;
                 case GDK_KEY_z:
                 case GDK_KEY_Z:
                 case GDK_KEY_2:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_tweak_switch_mode(tc, TWEAK_MODE_MOVE_JITTER, MOD__SHIFT);
+                    if (MOD__SHIFT_ONLY(event)) {
+                        sp_tweak_switch_mode(tc, TWEAK_MODE_MOVE_JITTER, MOD__SHIFT(event));
                         ret = TRUE;
                     }
                     break;
@@ -1326,84 +1326,84 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
                 case GDK_KEY_greater:
                 case GDK_KEY_period:
                 case GDK_KEY_3:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_tweak_switch_mode(tc, TWEAK_MODE_SCALE, MOD__SHIFT);
+                    if (MOD__SHIFT_ONLY(event)) {
+                        sp_tweak_switch_mode(tc, TWEAK_MODE_SCALE, MOD__SHIFT(event));
                         ret = TRUE;
                     }
                     break;
                 case GDK_KEY_bracketright:
                 case GDK_KEY_bracketleft:
                 case GDK_KEY_4:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_tweak_switch_mode(tc, TWEAK_MODE_ROTATE, MOD__SHIFT);
+                    if (MOD__SHIFT_ONLY(event)) {
+                        sp_tweak_switch_mode(tc, TWEAK_MODE_ROTATE, MOD__SHIFT(event));
                         ret = TRUE;
                     }
                     break;
                 case GDK_KEY_d:
                 case GDK_KEY_D:
                 case GDK_KEY_5:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_tweak_switch_mode(tc, TWEAK_MODE_MORELESS, MOD__SHIFT);
+                    if (MOD__SHIFT_ONLY(event)) {
+                        sp_tweak_switch_mode(tc, TWEAK_MODE_MORELESS, MOD__SHIFT(event));
                         ret = TRUE;
                     }
                     break;
                 case GDK_KEY_p:
                 case GDK_KEY_P:
                 case GDK_KEY_6:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_tweak_switch_mode(tc, TWEAK_MODE_PUSH, MOD__SHIFT);
+                    if (MOD__SHIFT_ONLY(event)) {
+                        sp_tweak_switch_mode(tc, TWEAK_MODE_PUSH, MOD__SHIFT(event));
                         ret = TRUE;
                     }
                     break;
                 case GDK_KEY_s:
                 case GDK_KEY_S:
                 case GDK_KEY_7:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_tweak_switch_mode(tc, TWEAK_MODE_SHRINK_GROW, MOD__SHIFT);
+                    if (MOD__SHIFT_ONLY(event)) {
+                        sp_tweak_switch_mode(tc, TWEAK_MODE_SHRINK_GROW, MOD__SHIFT(event));
                         ret = TRUE;
                     }
                     break;
                 case GDK_KEY_a:
                 case GDK_KEY_A:
                 case GDK_KEY_8:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_tweak_switch_mode(tc, TWEAK_MODE_ATTRACT_REPEL, MOD__SHIFT);
+                    if (MOD__SHIFT_ONLY(event)) {
+                        sp_tweak_switch_mode(tc, TWEAK_MODE_ATTRACT_REPEL, MOD__SHIFT(event));
                         ret = TRUE;
                     }
                     break;
                 case GDK_KEY_r:
                 case GDK_KEY_R:
                 case GDK_KEY_9:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_tweak_switch_mode(tc, TWEAK_MODE_ROUGHEN, MOD__SHIFT);
+                    if (MOD__SHIFT_ONLY(event)) {
+                        sp_tweak_switch_mode(tc, TWEAK_MODE_ROUGHEN, MOD__SHIFT(event));
                         ret = TRUE;
                     }
                     break;
                 case GDK_KEY_c:
                 case GDK_KEY_C:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_tweak_switch_mode(tc, TWEAK_MODE_COLORPAINT, MOD__SHIFT);
+                    if (MOD__SHIFT_ONLY(event)) {
+                        sp_tweak_switch_mode(tc, TWEAK_MODE_COLORPAINT, MOD__SHIFT(event));
                         ret = TRUE;
                     }
                     break;
                 case GDK_KEY_j:
                 case GDK_KEY_J:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_tweak_switch_mode(tc, TWEAK_MODE_COLORJITTER, MOD__SHIFT);
+                    if (MOD__SHIFT_ONLY(event)) {
+                        sp_tweak_switch_mode(tc, TWEAK_MODE_COLORJITTER, MOD__SHIFT(event));
                         ret = TRUE;
                     }
                     break;
                 case GDK_KEY_b:
                 case GDK_KEY_B:
-                    if (MOD__SHIFT_ONLY) {
-                        sp_tweak_switch_mode(tc, TWEAK_MODE_BLUR, MOD__SHIFT);
+                    if (MOD__SHIFT_ONLY(event)) {
+                        sp_tweak_switch_mode(tc, TWEAK_MODE_BLUR, MOD__SHIFT(event));
                         ret = TRUE;
                     }
                     break;
 
                 case GDK_KEY_Up:
                 case GDK_KEY_KP_Up:
-                    if (!MOD__CTRL_ONLY) {
+                    if (!MOD__CTRL_ONLY(event)) {
                         tc->force += 0.05;
                         if (tc->force > 1.0) {
                             tc->force = 1.0;
@@ -1414,7 +1414,7 @@ sp_tweak_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)) {
                         tc->force -= 0.05;
                         if (tc->force < 0.0) {
                             tc->force = 0.0;
@@ -1425,7 +1425,7 @@ sp_tweak_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)) {
                         tc->width += 0.01;
                         if (tc->width > 1.0) {
                             tc->width = 1.0;
@@ -1437,7 +1437,7 @@ sp_tweak_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)) {
                         tc->width -= 0.01;
                         if (tc->width < 0.01) {
                             tc->width = 0.01;
@@ -1463,7 +1463,7 @@ sp_tweak_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-tweak");
                         ret = TRUE;
                     }
@@ -1476,12 +1476,12 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
 
                 case GDK_KEY_Control_L:
                 case GDK_KEY_Control_R:
-                    sp_tweak_switch_mode_temporarily(tc, TWEAK_MODE_SHRINK_GROW, MOD__SHIFT);
+                    sp_tweak_switch_mode_temporarily(tc, TWEAK_MODE_SHRINK_GROW, MOD__SHIFT(event));
                     break;
                 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:
@@ -1498,11 +1498,11 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
                     break;
                 case GDK_KEY_Control_L:
                 case GDK_KEY_Control_R:
-                    sp_tweak_switch_mode (tc, prefs->getInt("/tools/tweak/mode"), MOD__SHIFT);
+                    sp_tweak_switch_mode (tc, prefs->getInt("/tools/tweak/mode"), MOD__SHIFT(event));
                     tc->_message_context->clear();
                     break;
                 default:
-                    sp_tweak_switch_mode (tc, prefs->getInt("/tools/tweak/mode"), MOD__SHIFT);
+                    sp_tweak_switch_mode (tc, prefs->getInt("/tools/tweak/mode"), MOD__SHIFT(event));
                     break;
             }
         }