[gimp/metadata-browser] app: more s/GDK_CONTROL_MASK/gimp_get_toggle_behavior_mask()/

[Roman Joost <romanofski src gnome org>]

commit 05f02dde298a14da02c058236a6070020044a83e
Author: Michael Natterer <mitch gimp org>
Date:   Fri Oct 7 00:51:17 2011 +0200

    app: more s/GDK_CONTROL_MASK/gimp_get_toggle_behavior_mask()/

 app/widgets/gimpcolormapeditor.c |    5 +++--
 app/widgets/gimpdocumentview.c   |    4 ++--
 app/widgets/gimplayertreeview.c  |    3 ++-
 app/widgets/gimppaletteeditor.c  |    4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/app/widgets/gimpcolormapeditor.c b/app/widgets/gimpcolormapeditor.c
index fa08c27..b6a6832 100644
--- a/app/widgets/gimpcolormapeditor.c
+++ b/app/widgets/gimpcolormapeditor.c
@@ -41,6 +41,7 @@
 #include "gimppaletteview.h"
 #include "gimpuimanager.h"
 #include "gimpviewrendererpalette.h"
+#include "gimpwidgets-utils.h"
 
 #include "gimp-intl.h"
 
@@ -229,7 +230,7 @@ gimp_colormap_editor_constructed (GObject *object)
   gimp_editor_add_action_button (GIMP_EDITOR (editor), "colormap",
                                  "colormap-add-color-from-fg",
                                  "colormap-add-color-from-bg",
-                                 GDK_CONTROL_MASK,
+                                 gimp_get_toggle_behavior_mask (),
                                  NULL);
 }
 
@@ -569,7 +570,7 @@ gimp_colormap_editor_entry_clicked (GimpPaletteView    *view,
 
   gimp_colormap_editor_set_index (editor, entry->position, NULL);
 
-  if (state & GDK_CONTROL_MASK)
+  if (state & gimp_get_toggle_behavior_mask ())
     gimp_context_set_background (image_editor->context, &entry->color);
   else
     gimp_context_set_foreground (image_editor->context, &entry->color);
diff --git a/app/widgets/gimpdocumentview.c b/app/widgets/gimpdocumentview.c
index 31877f4..efa329d 100644
--- a/app/widgets/gimpdocumentview.c
+++ b/app/widgets/gimpdocumentview.c
@@ -101,7 +101,7 @@ gimp_document_view_new (GimpViewType     view_type,
                                    "documents-raise-or-open",
                                    GDK_SHIFT_MASK,
                                    "documents-file-open-dialog",
-                                   GDK_CONTROL_MASK,
+                                   gimp_get_toggle_behavior_mask (),
                                    NULL);
   gimp_container_view_enable_dnd (editor->view,
                                   GTK_BUTTON (document_view->open_button),
@@ -123,7 +123,7 @@ gimp_document_view_new (GimpViewType     view_type,
                                    "documents-reload-previews",
                                    GDK_SHIFT_MASK,
                                    "documents-remove-dangling",
-                                   GDK_CONTROL_MASK,
+                                   gimp_get_toggle_behavior_mask (),
                                    NULL);
 
   if (view_type == GIMP_VIEW_TYPE_LIST)
diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c
index 7ac15ae..e76809a 100644
--- a/app/widgets/gimplayertreeview.c
+++ b/app/widgets/gimplayertreeview.c
@@ -56,6 +56,7 @@
 #include "gimpuimanager.h"
 #include "gimpviewrenderer.h"
 #include "gimpwidgets-constructors.h"
+#include "gimpwidgets-utils.h"
 
 #include "gimp-intl.h"
 
@@ -1358,7 +1359,7 @@ gimp_layer_tree_view_mask_clicked (GimpCellRendererViewable *cell,
           if (state & GDK_MOD1_MASK)
             gimp_action_group_set_action_active (group, "layers-mask-show",
                                                  ! gimp_layer_mask_get_show (mask));
-          else if (state & GDK_CONTROL_MASK)
+          else if (state & gimp_get_toggle_behavior_mask ())
             gimp_action_group_set_action_active (group, "layers-mask-disable",
                                                  gimp_layer_mask_get_apply (mask));
           else if (! gimp_layer_mask_get_edit (mask))
diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c
index 26db659..04914f4 100644
--- a/app/widgets/gimppaletteeditor.c
+++ b/app/widgets/gimppaletteeditor.c
@@ -259,7 +259,7 @@ gimp_palette_editor_constructed (GObject *object)
   gimp_editor_add_action_button (GIMP_EDITOR (editor), "palette-editor",
                                  "palette-editor-new-color-fg",
                                  "palette-editor-new-color-bg",
-                                 GDK_CONTROL_MASK,
+                                 gimp_get_toggle_behavior_mask (),
                                  NULL);
 
   gimp_editor_add_action_button (GIMP_EDITOR (editor), "palette-editor",
@@ -656,7 +656,7 @@ palette_editor_entry_clicked (GimpPaletteView   *view,
     {
       GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
 
-      if (state & GDK_CONTROL_MASK)
+      if (state & gimp_get_toggle_behavior_mask ())
         gimp_context_set_background (data_editor->context, &entry->color);
       else
         gimp_context_set_foreground (data_editor->context, &entry->color);