[gimp/metadata-browser] app: use toggle_behavior_mask not CONTROL to trigger zoom-on-scroll

[Roman Joost <romanofski src gnome org>]

commit 090d0a60ec0769597209639cc4aee68000fd0231
Author: Michael Natterer <mitch gimp org>
Date:   Thu Oct 6 23:59:49 2011 +0200

    app: use toggle_behavior_mask not CONTROL to trigger zoom-on-scroll

 app/display/gimpdisplayshell-tool-events.c |    2 +-
 app/widgets/gimpgradienteditor.c           |    4 ++--
 app/widgets/gimpnavigationview.c           |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-tool-events.c b/app/display/gimpdisplayshell-tool-events.c
index 0108e5c..cc4bfe0 100644
--- a/app/display/gimpdisplayshell-tool-events.c
+++ b/app/display/gimpdisplayshell-tool-events.c
@@ -717,7 +717,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
           {
             GdkScrollDirection  direction = sevent->direction;
 
-            if (state & GDK_CONTROL_MASK)
+            if (state & gimp_get_toggle_behavior_mask ())
               {
                 switch (direction)
                   {
diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c
index 7812dbb..fbafe12 100644
--- a/app/widgets/gimpgradienteditor.c
+++ b/app/widgets/gimpgradienteditor.c
@@ -858,7 +858,7 @@ view_events (GtkWidget          *widget,
       {
         GdkEventScroll *sevent = (GdkEventScroll *) event;
 
-        if (sevent->state & GDK_CONTROL_MASK)
+        if (sevent->state & gimp_get_toggle_behavior_mask ())
           {
             switch (sevent->direction)
               {
@@ -1063,7 +1063,7 @@ control_events (GtkWidget          *widget,
       {
         GdkEventScroll *sevent = (GdkEventScroll *) event;
 
-        if (sevent->state & GDK_SHIFT_MASK)
+        if (sevent->state & gimp_get_toggle_behavior_mask ())
           {
             if (sevent->direction == GDK_SCROLL_UP)
               gimp_gradient_editor_zoom (editor, GIMP_ZOOM_IN);
diff --git a/app/widgets/gimpnavigationview.c b/app/widgets/gimpnavigationview.c
index 06bb08e..3a29810 100644
--- a/app/widgets/gimpnavigationview.c
+++ b/app/widgets/gimpnavigationview.c
@@ -36,6 +36,7 @@
 
 #include "gimpnavigationview.h"
 #include "gimpviewrenderer.h"
+#include "gimpwidgets-utils.h"
 
 
 #define BORDER_WIDTH 2
@@ -302,7 +303,7 @@ static gboolean
 gimp_navigation_view_scroll (GtkWidget      *widget,
                              GdkEventScroll *sevent)
 {
-  if (sevent->state & GDK_CONTROL_MASK)
+  if (sevent->state & gimp_get_toggle_behavior_mask ())
     {
       switch (sevent->direction)
         {