[gimp/gimp-2-8] Bug 753175 - color picker locks down the GUI

[Michael Natterer <mitch src gnome org>]

commit fd9554d6cdcb0f09592a30e568d19ea6a19c4424
Author: Michael Natterer <mitch gimp org>
Date:   Thu Mar 31 22:15:37 2016 +0200

    Bug 753175 - color picker locks down the GUI
    
    Disable the color pickers buttons on OS X, they are unfixable in 2.8.

 app/widgets/gimpcoloreditor.c       |    6 ++++++
 libgimpwidgets/gimpcolorselection.c |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/app/widgets/gimpcoloreditor.c b/app/widgets/gimpcoloreditor.c
index 43a7f5e..05b33bb 100644
--- a/app/widgets/gimpcoloreditor.c
+++ b/app/widgets/gimpcoloreditor.c
@@ -89,9 +89,11 @@ static void   gimp_color_editor_tab_toggled     (GtkWidget         *widget,
 static void   gimp_color_editor_fg_bg_notify    (GtkWidget         *widget,
                                                  GParamSpec        *pspec,
                                                  GimpColorEditor   *editor);
+#ifndef GDK_WINDOWING_QUARTZ
 static void   gimp_color_editor_color_picked    (GtkWidget         *widget,
                                                  const GimpRGB     *rgb,
                                                  GimpColorEditor   *editor);
+#endif
 static void   gimp_color_editor_entry_changed   (GimpColorHexEntry *entry,
                                                  GimpColorEditor   *editor);
 
@@ -245,6 +247,7 @@ gimp_color_editor_init (GimpColorEditor *editor)
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
+#ifndef GDK_WINDOWING_QUARTZ
   /*  The color picker  */
   button = gimp_pick_button_new ();
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
@@ -253,6 +256,7 @@ gimp_color_editor_init (GimpColorEditor *editor)
   g_signal_connect (button, "color-picked",
                     G_CALLBACK (gimp_color_editor_color_picked),
                     editor);
+#endif
 
   /*  The hex triplet entry  */
   editor->hex_entry = gimp_color_hex_entry_new ();
@@ -632,6 +636,7 @@ gimp_color_editor_fg_bg_notify (GtkWidget       *widget,
     }
 }
 
+#ifndef GDK_WINDOWING_QUARTZ
 static void
 gimp_color_editor_color_picked (GtkWidget       *widget,
                                 const GimpRGB   *rgb,
@@ -645,6 +650,7 @@ gimp_color_editor_color_picked (GtkWidget       *widget,
         gimp_context_set_foreground (editor->context, rgb);
     }
 }
+#endif
 
 static void
 gimp_color_editor_entry_changed (GimpColorHexEntry *entry,
diff --git a/libgimpwidgets/gimpcolorselection.c b/libgimpwidgets/gimpcolorselection.c
index 9796cee..26398de 100644
--- a/libgimpwidgets/gimpcolorselection.c
+++ b/libgimpwidgets/gimpcolorselection.c
@@ -98,9 +98,11 @@ static void   gimp_color_selection_scales_changed    (GimpColorSelector  *select
                                                       const GimpRGB      *rgb,
                                                       const GimpHSV      *hsv,
                                                       GimpColorSelection *selection);
+#ifndef GDK_WINDOWING_QUARTZ
 static void   gimp_color_selection_color_picked      (GtkWidget          *widget,
                                                       const GimpRGB      *rgb,
                                                       GimpColorSelection *selection);
+#endif
 static void   gimp_color_selection_entry_changed     (GimpColorHexEntry  *entry,
                                                       GimpColorSelection *selection);
 static void   gimp_color_selection_channel_changed   (GimpColorSelector  *selector,
@@ -299,6 +301,7 @@ gimp_color_selection_init (GimpColorSelection *selection)
   gtk_box_pack_start (GTK_BOX (selection->right_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
+#ifndef GDK_WINDOWING_QUARTZ
   /*  The color picker  */
   button = gimp_pick_button_new ();
   gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
@@ -307,6 +310,7 @@ gimp_color_selection_init (GimpColorSelection *selection)
   g_signal_connect (button, "color-picked",
                     G_CALLBACK (gimp_color_selection_color_picked),
                     selection);
+#endif
 
   /* The hex triplet entry */
   entry = gimp_color_hex_entry_new ();
@@ -584,6 +588,7 @@ gimp_color_selection_scales_changed (GimpColorSelector  *selector,
   gimp_color_selection_color_changed (selection);
 }
 
+#ifndef GDK_WINDOWING_QUARTZ
 static void
 gimp_color_selection_color_picked (GtkWidget          *widget,
                                    const GimpRGB      *rgb,
@@ -591,6 +596,7 @@ gimp_color_selection_color_picked (GtkWidget          *widget,
 {
   gimp_color_selection_set_color (selection, rgb);
 }
+#endif
 
 static void
 gimp_color_selection_entry_changed (GimpColorHexEntry  *entry,