]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkcolorbutton.c
GtkLabelAccessible: Sanity check _get_text() input values
[~andy/gtk] / gtk / gtkcolorbutton.c
index 9afc7542f21748b168f833ede39d600fdd803ebf..52c1ec52516f12f5dc1f973394ccd630c7ebb355 100644 (file)
@@ -14,9 +14,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 /* Color picker button for GNOME
  *
  * Modified by the GTK+ Team and others 2003.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#define GDK_DISABLE_DEPRECATION_WARNINGS
 #include "config.h"
 
 #include "gtkcolorbutton.h"
-#include "gdk/gdkkeysyms.h"
-#include "gdk-pixbuf/gdk-pixbuf.h"
+
 #include "gtkbutton.h"
 #include "gtkmain.h"
-#include "gtkalignment.h"
-#include "gtkcolorsel.h"
-#include "gtkcolorseldialog.h"
+#include "gtkcolorchooser.h"
+#include "gtkcolorchooserprivate.h"
+#include "gtkcolorchooserdialog.h"
 #include "gtkdnd.h"
 #include "gtkdrawingarea.h"
-#include "gtkframe.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
@@ -52,9 +49,9 @@
  * @Title: GtkColorButton
  * @See_also: #GtkColorSelectionDialog, #GtkFontButton
  *
- * The #GtkColorButton is a button which displays the currently selected color
- * an allows to open a color selection dialog to change the color. It is suitable
- * widget for selecting a color in a preference dialog.
+ * The #GtkColorButton is a button which displays the currently selected
+ * color an allows to open a color selection dialog to change the color.
+ * It is suitable widget for selecting a color in a preference dialog.
  */
 
 
 #define CHECK_DARK  (1.0 / 3.0)
 #define CHECK_LIGHT (2.0 / 3.0)
 
-
-struct _GtkColorButtonPrivate 
+struct _GtkColorButtonPrivate
 {
   GtkWidget *draw_area; /* Widget where we draw the color sample */
   GtkWidget *cs_dialog; /* Color selection dialog */
-  
+
   gchar *title;         /* Title for the color selection window */
   GdkRGBA rgba;
 
@@ -76,7 +72,7 @@ struct _GtkColorButtonPrivate
 };
 
 /* Properties */
-enum 
+enum
 {
   PROP_0,
   PROP_USE_ALPHA,
@@ -87,7 +83,7 @@ enum
 };
 
 /* Signals */
-enum 
+enum
 {
   COLOR_SET,
   LAST_SIGNAL
@@ -96,48 +92,52 @@ enum
 /* gobject signals */
 static void gtk_color_button_finalize      (GObject             *object);
 static void gtk_color_button_set_property  (GObject        *object,
-                                           guint           param_id,
-                                           const GValue   *value,
-                                           GParamSpec     *pspec);
+                                            guint           param_id,
+                                            const GValue   *value,
+                                            GParamSpec     *pspec);
 static void gtk_color_button_get_property  (GObject        *object,
-                                           guint           param_id,
-                                           GValue         *value,
-                                           GParamSpec     *pspec);
+                                            guint           param_id,
+                                            GValue         *value,
+                                            GParamSpec     *pspec);
 
 /* gtkwidget signals */
-static void gtk_color_button_state_changed (GtkWidget           *widget, 
-                                           GtkStateType         previous_state);
+static void gtk_color_button_state_changed (GtkWidget           *widget,
+                                            GtkStateType         previous_state);
 
 /* gtkbutton signals */
 static void gtk_color_button_clicked       (GtkButton           *button);
 
 /* source side drag signals */
 static void gtk_color_button_drag_begin (GtkWidget        *widget,
-                                        GdkDragContext   *context,
-                                        gpointer          data);
+                                         GdkDragContext   *context,
+                                         gpointer          data);
 static void gtk_color_button_drag_data_get (GtkWidget        *widget,
                                             GdkDragContext   *context,
                                             GtkSelectionData *selection_data,
                                             guint             info,
                                             guint             time,
-                                            GtkColorButton   *color_button);
+                                            GtkColorButton   *button);
 
 /* target side drag signals */
 static void gtk_color_button_drag_data_received (GtkWidget        *widget,
-                                                GdkDragContext   *context,
-                                                gint              x,
-                                                gint              y,
-                                                GtkSelectionData *selection_data,
-                                                guint             info,
-                                                guint32           time,
-                                                GtkColorButton   *color_button);
+                                                 GdkDragContext   *context,
+                                                 gint              x,
+                                                 gint              y,
+                                                 GtkSelectionData *selection_data,
+                                                 guint             info,
+                                                 guint32           time,
+                                                 GtkColorButton   *button);
 
 
 static guint color_button_signals[LAST_SIGNAL] = { 0 };
 
 static const GtkTargetEntry drop_types[] = { { "application/x-color", 0, 0 } };
 
-G_DEFINE_TYPE (GtkColorButton, gtk_color_button, GTK_TYPE_BUTTON)
+static void gtk_color_button_iface_init (GtkColorChooserInterface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GtkColorButton, gtk_color_button, GTK_TYPE_BUTTON,
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_COLOR_CHOOSER,
+                                                gtk_color_button_iface_init))
 
 static void
 gtk_color_button_class_init (GtkColorButtonClass *klass)
@@ -160,15 +160,15 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
   /**
    * GtkColorButton:use-alpha:
    *
-   * If this property is set to %TRUE, the color swatch on the button is rendered against a 
-   * checkerboard background to show its opacity and the opacity slider is displayed in the 
-   * color selection dialog. 
+   * If this property is set to %TRUE, the color swatch on the button is
+   * rendered against a checkerboard background to show its opacity and
+   * the opacity slider is displayed in the color selection dialog.
    *
    * Since: 2.4
    */
   g_object_class_install_property (gobject_class,
                                    PROP_USE_ALPHA,
-                                   g_param_spec_boolean ("use-alpha", P_("Use alpha"), 
+                                   g_param_spec_boolean ("use-alpha", P_("Use alpha"),
                                                          P_("Whether to give the color an alpha value"),
                                                          FALSE,
                                                          GTK_PARAM_READWRITE));
@@ -182,8 +182,8 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
    */
   g_object_class_install_property (gobject_class,
                                    PROP_TITLE,
-                                   g_param_spec_string ("title", 
-                                                       P_("Title"), 
+                                   g_param_spec_string ("title",
+                                                        P_("Title"),
                                                         P_("The title of the color selection dialog"),
                                                         _("Pick a Color"),
                                                         GTK_PARAM_READWRITE));
@@ -194,6 +194,8 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
    * The selected color.
    *
    * Since: 2.4
+   *
+   * Deprecated: 3.4: Use #GtkColorButton:rgba instead.
    */
   g_object_class_install_property (gobject_class,
                                    PROP_COLOR,
@@ -201,12 +203,12 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
                                                        P_("Current Color"),
                                                        P_("The selected color"),
                                                        GDK_TYPE_COLOR,
-                                                       GTK_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
 
   /**
    * GtkColorButton:alpha:
    *
-   * The selected opacity value (0 fully transparent, 65535 fully opaque). 
+   * The selected opacity value (0 fully transparent, 65535 fully opaque).
    *
    * Since: 2.4
    */
@@ -219,7 +221,7 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
                                                       GTK_PARAM_READWRITE));
 
   /**
-   * GtkColorButton::rgba
+   * GtkColorButton:rgba:
    *
    * The RGBA color.
    *
@@ -237,10 +239,10 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
   /**
    * GtkColorButton::color-set:
    * @widget: the object which received the signal.
-   * 
-   * The ::color-set signal is emitted when the user selects a color. 
-   * When handling this signal, use gtk_color_button_get_color() and 
-   * gtk_color_button_get_alpha() to find out which color was just selected.
+   *
+   * The ::color-set signal is emitted when the user selects a color.
+   * When handling this signal, use gtk_color_button_get_rgba() to
+   * find out which color was just selected.
    *
    * Note that this signal is only emitted when the <emphasis>user</emphasis>
    * changes the color. If you need to react to programmatic color changes
@@ -249,56 +251,32 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
    * Since: 2.4
    */
   color_button_signals[COLOR_SET] = g_signal_new (I_("color-set"),
-                                                 G_TYPE_FROM_CLASS (gobject_class),
-                                                 G_SIGNAL_RUN_FIRST,
-                                                 G_STRUCT_OFFSET (GtkColorButtonClass, color_set),
-                                                 NULL, NULL,
-                                                 _gtk_marshal_VOID__VOID,
-                                                 G_TYPE_NONE, 0);
+                                                  G_TYPE_FROM_CLASS (gobject_class),
+                                                  G_SIGNAL_RUN_FIRST,
+                                                  G_STRUCT_OFFSET (GtkColorButtonClass, color_set),
+                                                  NULL, NULL,
+                                                  _gtk_marshal_VOID__VOID,
+                                                  G_TYPE_NONE, 0);
 
   g_type_class_add_private (gobject_class, sizeof (GtkColorButtonPrivate));
 }
 
 static gboolean
-gtk_color_button_has_alpha (GtkColorButton *color_button)
+gtk_color_button_has_alpha (GtkColorButton *button)
 {
-  return color_button->priv->use_alpha &&
-      color_button->priv->rgba.alpha < 1;
-}
-
-static cairo_pattern_t *
-gtk_color_button_get_checkered (void)
-{
-  /* need to respect pixman's stride being a multiple of 4 */
-  static unsigned char data[8] = { 0xFF, 0x00, 0x00, 0x00,
-                                   0x00, 0xFF, 0x00, 0x00 };
-  static cairo_surface_t *checkered = NULL;
-  cairo_pattern_t *pattern;
-
-  if (checkered == NULL)
-    {
-      checkered = cairo_image_surface_create_for_data (data,
-                                                       CAIRO_FORMAT_A8,
-                                                       2, 2, 4);
-    }
-
-  pattern = cairo_pattern_create_for_surface (checkered);
-  cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
-  cairo_pattern_set_filter (pattern, CAIRO_FILTER_NEAREST);
-
-  return pattern;
+  return button->priv->use_alpha && button->priv->rgba.alpha < 1;
 }
 
 /* Handle exposure events for the color picker's drawing area */
 static gint
-gtk_color_button_draw_cb (GtkWidget *widget, 
+gtk_color_button_draw_cb (GtkWidget *widget,
                           cairo_t   *cr,
                           gpointer   data)
 {
-  GtkColorButton *color_button = GTK_COLOR_BUTTON (data);
+  GtkColorButton *button = GTK_COLOR_BUTTON (data);
   cairo_pattern_t *checkered;
 
-  if (gtk_color_button_has_alpha (color_button))
+  if (gtk_color_button_has_alpha (button))
     {
       cairo_set_source_rgb (cr, CHECK_DARK, CHECK_DARK, CHECK_DARK);
       cairo_paint (cr);
@@ -306,26 +284,32 @@ gtk_color_button_draw_cb (GtkWidget *widget,
       cairo_set_source_rgb (cr, CHECK_LIGHT, CHECK_LIGHT, CHECK_LIGHT);
       cairo_scale (cr, CHECK_SIZE, CHECK_SIZE);
 
-      checkered = gtk_color_button_get_checkered ();
+      checkered = _gtk_color_chooser_get_checkered_pattern ();
       cairo_mask (cr, checkered);
       cairo_pattern_destroy (checkered);
 
-      gdk_cairo_set_source_rgba (cr, &color_button->priv->rgba);
+      gdk_cairo_set_source_rgba (cr, &button->priv->rgba);
     }
   else
     {
       cairo_set_source_rgb (cr,
-                            color_button->priv->rgba.red,
-                            color_button->priv->rgba.green,
-                            color_button->priv->rgba.blue);
+                            button->priv->rgba.red,
+                            button->priv->rgba.green,
+                            button->priv->rgba.blue);
     }
 
   cairo_paint (cr);
 
-  if (!gtk_widget_is_sensitive (GTK_WIDGET (color_button)))
+  if (!gtk_widget_is_sensitive (GTK_WIDGET (button)))
     {
-      gdk_cairo_set_source_color (cr, &gtk_widget_get_style (GTK_WIDGET(color_button))->bg[GTK_STATE_INSENSITIVE]);
-      checkered = gtk_color_button_get_checkered ();
+      GtkStyleContext *context;
+      GdkRGBA color;
+
+      context = gtk_widget_get_style_context (widget);
+      gtk_style_context_get_background_color (context, GTK_STATE_FLAG_INSENSITIVE, &color);
+
+      gdk_cairo_set_source_rgba (cr, &color);
+      checkered = _gtk_color_chooser_get_checkered_pattern ();
       cairo_mask (cr, checkered);
       cairo_pattern_destroy (checkered);
     }
@@ -334,7 +318,7 @@ gtk_color_button_draw_cb (GtkWidget *widget,
 }
 
 static void
-gtk_color_button_state_changed (GtkWidget   *widget, 
+gtk_color_button_state_changed (GtkWidget   *widget,
                                 GtkStateType previous_state)
 {
   gtk_widget_queue_draw (widget);
@@ -342,13 +326,13 @@ gtk_color_button_state_changed (GtkWidget   *widget,
 
 static void
 gtk_color_button_drag_data_received (GtkWidget        *widget,
-                                    GdkDragContext   *context,
-                                    gint              x,
-                                    gint              y,
-                                    GtkSelectionData *selection_data,
-                                    guint             info,
-                                    guint32           time,
-                                    GtkColorButton   *color_button)
+                                     GdkDragContext   *context,
+                                     gint              x,
+                                     gint              y,
+                                     GtkSelectionData *selection_data,
+                                     guint             info,
+                                     guint32           time,
+                                     GtkColorButton   *button)
 {
   gint length;
   guint16 *dropped;
@@ -363,27 +347,27 @@ gtk_color_button_drag_data_received (GtkWidget        *widget,
    */
   if (length != 8)
     {
-      g_warning (_("Received invalid color data\n"));
+      g_warning ("%s: Received invalid color data", G_STRFUNC);
       return;
     }
 
 
   dropped = (guint16 *) gtk_selection_data_get_data (selection_data);
 
-  color_button->priv->rgba.red = dropped[0] / 65535.;
-  color_button->priv->rgba.green = dropped[1] / 65535.;
-  color_button->priv->rgba.blue = dropped[2] / 65535.;
-  color_button->priv->rgba.alpha = dropped[3] / 65535.;
+  button->priv->rgba.red = dropped[0] / 65535.;
+  button->priv->rgba.green = dropped[1] / 65535.;
+  button->priv->rgba.blue = dropped[2] / 65535.;
+  button->priv->rgba.alpha = dropped[3] / 65535.;
 
-  gtk_widget_queue_draw (color_button->priv->draw_area);
+  gtk_widget_queue_draw (button->priv->draw_area);
 
-  g_signal_emit (color_button, color_button_signals[COLOR_SET], 0);
+  g_signal_emit (button, color_button_signals[COLOR_SET], 0);
 
-  g_object_freeze_notify (G_OBJECT (color_button));
-  g_object_notify (G_OBJECT (color_button), "color");
-  g_object_notify (G_OBJECT (color_button), "alpha");
-  g_object_notify (G_OBJECT (color_button), "rgba");
-  g_object_thaw_notify (G_OBJECT (color_button));
+  g_object_freeze_notify (G_OBJECT (button));
+  g_object_notify (G_OBJECT (button), "color");
+  g_object_notify (G_OBJECT (button), "alpha");
+  g_object_notify (G_OBJECT (button), "rgba");
+  g_object_thaw_notify (G_OBJECT (button));
 }
 
 static void
@@ -408,97 +392,84 @@ set_color_icon (GdkDragContext *context,
 
 static void
 gtk_color_button_drag_begin (GtkWidget      *widget,
-                            GdkDragContext *context,
-                            gpointer        data)
+                             GdkDragContext *context,
+                             gpointer        data)
 {
-  GtkColorButton *color_button = data;
+  GtkColorButton *button = data;
 
-  set_color_icon (context, &color_button->priv->rgba);
+  set_color_icon (context, &button->priv->rgba);
 }
 
 static void
 gtk_color_button_drag_data_get (GtkWidget        *widget,
-                               GdkDragContext   *context,
-                               GtkSelectionData *selection_data,
-                               guint             info,
-                               guint             time,
-                               GtkColorButton   *color_button)
+                                GdkDragContext   *context,
+                                GtkSelectionData *selection_data,
+                                guint             info,
+                                guint             time,
+                                GtkColorButton   *button)
 {
   guint16 dropped[4];
 
-  dropped[0] = (guint16) (color_button->priv->rgba.red * 65535);
-  dropped[1] = (guint16) (color_button->priv->rgba.green * 65535);
-  dropped[2] = (guint16) (color_button->priv->rgba.blue * 65535);
-  dropped[3] = (guint16) (color_button->priv->rgba.alpha * 65535);
+  dropped[0] = (guint16) (button->priv->rgba.red * 65535);
+  dropped[1] = (guint16) (button->priv->rgba.green * 65535);
+  dropped[2] = (guint16) (button->priv->rgba.blue * 65535);
+  dropped[3] = (guint16) (button->priv->rgba.alpha * 65535);
 
   gtk_selection_data_set (selection_data,
                           gtk_selection_data_get_target (selection_data),
-                         16, (guchar *)dropped, 8);
+                          16, (guchar *)dropped, 8);
 }
 
 static void
-gtk_color_button_init (GtkColorButton *color_button)
+gtk_color_button_init (GtkColorButton *button)
 {
-  GtkWidget *alignment;
-  GtkWidget *frame;
   PangoLayout *layout;
   PangoRectangle rect;
 
   /* Create the widgets */
-  color_button->priv = G_TYPE_INSTANCE_GET_PRIVATE (color_button,
-                                                    GTK_TYPE_COLOR_BUTTON,
-                                                    GtkColorButtonPrivate);
+  button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button,
+                                              GTK_TYPE_COLOR_BUTTON,
+                                              GtkColorButtonPrivate);
 
   gtk_widget_push_composite_child ();
 
-  alignment = gtk_alignment_new (0.5, 0.5, 0.5, 1.0);
-  gtk_container_set_border_width (GTK_CONTAINER (alignment), 1);
-  gtk_container_add (GTK_CONTAINER (color_button), alignment);
-  gtk_widget_show (alignment);
-
-  frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_OUT);
-  gtk_container_add (GTK_CONTAINER (alignment), frame);
-  gtk_widget_show (frame);
-
-  /* Just some widget we can hook to expose-event on */
-  color_button->priv->draw_area = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-
-  layout = gtk_widget_create_pango_layout (GTK_WIDGET (color_button), "Black");
+  button->priv->draw_area = gtk_drawing_area_new ();
+  layout = gtk_widget_create_pango_layout (GTK_WIDGET (button), "Black");
   pango_layout_get_pixel_extents (layout, NULL, &rect);
   g_object_unref (layout);
 
-  gtk_widget_set_size_request (color_button->priv->draw_area, rect.width - 2, rect.height - 2);
-  g_signal_connect (color_button->priv->draw_area, "draw",
-                    G_CALLBACK (gtk_color_button_draw_cb), color_button);
-  gtk_container_add (GTK_CONTAINER (frame), color_button->priv->draw_area);
-  gtk_widget_show (color_button->priv->draw_area);
+  gtk_widget_set_size_request (button->priv->draw_area, 
+                               rect.width, rect.height);
 
-  color_button->priv->title = g_strdup (_("Pick a Color")); /* default title */
+  g_signal_connect (button->priv->draw_area, "draw",
+                    G_CALLBACK (gtk_color_button_draw_cb), button);
+  gtk_container_add (GTK_CONTAINER (button), button->priv->draw_area);
+  gtk_widget_show (button->priv->draw_area);
 
-  /* Start with opaque black, alpha disabled */
+  button->priv->title = g_strdup (_("Pick a Color")); /* default title */
 
-  color_button->priv->rgba.red = 0;
-  color_button->priv->rgba.green = 0;
-  color_button->priv->rgba.blue = 0;
-  color_button->priv->rgba.alpha = 1;
-  color_button->priv->use_alpha = FALSE;
+  /* Start with opaque black, alpha disabled */
+  button->priv->rgba.red = 0;
+  button->priv->rgba.green = 0;
+  button->priv->rgba.blue = 0;
+  button->priv->rgba.alpha = 1;
+  button->priv->use_alpha = FALSE;
 
-  gtk_drag_dest_set (GTK_WIDGET (color_button),
+  gtk_drag_dest_set (GTK_WIDGET (button),
                      GTK_DEST_DEFAULT_MOTION |
                      GTK_DEST_DEFAULT_HIGHLIGHT |
                      GTK_DEST_DEFAULT_DROP,
                      drop_types, 1, GDK_ACTION_COPY);
-  gtk_drag_source_set (GTK_WIDGET(color_button),
+  gtk_drag_source_set (GTK_WIDGET (button),
                        GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
                        drop_types, 1,
                        GDK_ACTION_COPY);
-  g_signal_connect (color_button, "drag-begin",
-                   G_CALLBACK (gtk_color_button_drag_begin), color_button);
-  g_signal_connect (color_button, "drag-data-received",
-                    G_CALLBACK (gtk_color_button_drag_data_received), color_button);
-  g_signal_connect (color_button, "drag-data-get",
-                    G_CALLBACK (gtk_color_button_drag_data_get), color_button);
+  g_signal_connect (button, "drag-begin",
+                    G_CALLBACK (gtk_color_button_drag_begin), button);
+  g_signal_connect (button, "drag-data-received",
+                    G_CALLBACK (gtk_color_button_drag_data_received), button);
+  g_signal_connect (button, "drag-data-get",
+                    G_CALLBACK (gtk_color_button_drag_data_get), button);
 
   gtk_widget_pop_composite_child ();
 }
@@ -506,14 +477,14 @@ gtk_color_button_init (GtkColorButton *color_button)
 static void
 gtk_color_button_finalize (GObject *object)
 {
-  GtkColorButton *color_button = GTK_COLOR_BUTTON (object);
+  GtkColorButton *button = GTK_COLOR_BUTTON (object);
 
-  if (color_button->priv->cs_dialog != NULL)
-    gtk_widget_destroy (color_button->priv->cs_dialog);
-  color_button->priv->cs_dialog = NULL;
+  if (button->priv->cs_dialog != NULL)
+    gtk_widget_destroy (button->priv->cs_dialog);
+  button->priv->cs_dialog = NULL;
 
-  g_free (color_button->priv->title);
-  color_button->priv->title = NULL;
+  g_free (button->priv->title);
+  button->priv->title = NULL;
 
   G_OBJECT_CLASS (gtk_color_button_parent_class)->finalize (object);
 }
@@ -522,13 +493,15 @@ gtk_color_button_finalize (GObject *object)
 /**
  * gtk_color_button_new:
  *
- * Creates a new color button. This returns a widget in the form of
- * a small button containing a swatch representing the current selected 
- * color. When the button is clicked, a color-selection dialog will open, 
- * allowing the user to select a color. The swatch will be updated to reflect 
- * the new color when the user finishes.
+ * Creates a new color button.
+ *
+ * This returns a widget in the form of a small button containing
+ * a swatch representing the current selected color. When the button
+ * is clicked, a color-selection dialog will open, allowing the user
+ * to select a color. The swatch will be updated to reflect the new
+ * color when the user finishes.
  *
- * Returns: a new color button.
+ * Returns: a new color button
  *
  * Since: 2.4
  */
@@ -540,13 +513,15 @@ gtk_color_button_new (void)
 
 /**
  * gtk_color_button_new_with_color:
- * @color: A #GdkColor to set the current color with.
+ * @color: A #GdkColor to set the current color with
  *
- * Creates a new color button. 
+ * Creates a new color button.
  *
- * Returns: a new color button.
+ * Returns: a new color button
  *
  * Since: 2.4
+ *
+ * Deprecated: 3.4: Use gtk_color_button_new_with_rgba() instead.
  */
 GtkWidget *
 gtk_color_button_new_with_color (const GdkColor *color)
@@ -556,7 +531,7 @@ gtk_color_button_new_with_color (const GdkColor *color)
 
 /**
  * gtk_color_button_new_with_rgba:
- * @rgba: A #GdkRGBA to set the current color with.
+ * @rgba: A #GdkRGBA to set the current color with
  *
  * Creates a new color button.
  *
@@ -570,313 +545,315 @@ gtk_color_button_new_with_rgba (const GdkRGBA *rgba)
   return g_object_new (GTK_TYPE_COLOR_BUTTON, "rgba", rgba, NULL);
 }
 
-static void
-dialog_ok_clicked (GtkWidget *widget, 
-                  gpointer   data)
+static gboolean
+dialog_destroy (GtkWidget *widget,
+                gpointer   data)
 {
-  GtkColorButton *color_button = GTK_COLOR_BUTTON (data);
-  GtkColorSelection *color_selection;
-  GtkColorSelectionDialog *selection_dialog;
+  GtkColorButton *button = GTK_COLOR_BUTTON (data);
 
-  selection_dialog = GTK_COLOR_SELECTION_DIALOG (color_button->priv->cs_dialog);
-  color_selection = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));
+  button->priv->cs_dialog = NULL;
 
-  gtk_color_selection_get_current_rgba (color_selection, &color_button->priv->rgba);
+  return FALSE;
+}
 
-  gtk_widget_hide (color_button->priv->cs_dialog);
+static void
+dialog_response (GtkDialog *dialog,
+                 gint       response,
+                 gpointer   data)
+{
+  if (response == GTK_RESPONSE_CANCEL)
+    gtk_widget_hide (GTK_WIDGET (dialog));
+  else if (response == GTK_RESPONSE_OK)
+    {
+      GtkColorButton *button = GTK_COLOR_BUTTON (data);
 
-  gtk_widget_queue_draw (color_button->priv->draw_area);
+      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog),
+                                  &button->priv->rgba);
 
-  g_signal_emit (color_button, color_button_signals[COLOR_SET], 0);
+      gtk_widget_hide (GTK_WIDGET (dialog));
 
-  g_object_freeze_notify (G_OBJECT (color_button));
-  g_object_notify (G_OBJECT (color_button), "color");
-  g_object_notify (G_OBJECT (color_button), "alpha");
-  g_object_notify (G_OBJECT (color_button), "rgba");
-  g_object_thaw_notify (G_OBJECT (color_button));
-}
+      gtk_widget_queue_draw (button->priv->draw_area);
 
-static gboolean
-dialog_destroy (GtkWidget *widget, 
-               gpointer   data)
-{
-  GtkColorButton *color_button = GTK_COLOR_BUTTON (data);
-  
-  color_button->priv->cs_dialog = NULL;
+      g_signal_emit (button, color_button_signals[COLOR_SET], 0);
 
-  return FALSE;
+      g_object_freeze_notify (G_OBJECT (button));
+      g_object_notify (G_OBJECT (button), "color");
+      g_object_notify (G_OBJECT (button), "alpha");
+      g_object_notify (G_OBJECT (button), "rgba");
+      g_object_thaw_notify (G_OBJECT (button));
+    }
 }
 
+/* Create the dialog and connects its buttons */
 static void
-dialog_cancel_clicked (GtkWidget *widget,
-                      gpointer   data)
+ensure_dialog (GtkColorButton *button)
 {
-  GtkColorButton *color_button = GTK_COLOR_BUTTON (data);
-  
-  gtk_widget_hide (color_button->priv->cs_dialog);  
+  GtkWidget *parent, *dialog;
+
+  if (button->priv->cs_dialog != NULL)
+    return;
+
+  parent = gtk_widget_get_toplevel (GTK_WIDGET (button));
+
+  button->priv->cs_dialog = dialog = gtk_color_chooser_dialog_new (button->priv->title, NULL);
+
+  if (gtk_widget_is_toplevel (parent) && GTK_IS_WINDOW (parent))
+  {
+    if (GTK_WINDOW (parent) != gtk_window_get_transient_for (GTK_WINDOW (dialog)))
+      gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
+
+    gtk_window_set_modal (GTK_WINDOW (dialog),
+                            gtk_window_get_modal (GTK_WINDOW (parent)));
+  }
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (dialog_response), button);
+  g_signal_connect (dialog, "destroy",
+                    G_CALLBACK (dialog_destroy), button);
 }
 
+
 static void
-gtk_color_button_clicked (GtkButton *button)
+gtk_color_button_clicked (GtkButton *b)
 {
-  GtkColorButton *color_button = GTK_COLOR_BUTTON (button);
-  GtkColorSelection *color_selection;
-  GtkColorSelectionDialog *color_dialog;
+  GtkColorButton *button = GTK_COLOR_BUTTON (b);
 
   /* if dialog already exists, make sure it's shown and raised */
-  if (!color_button->priv->cs_dialog) 
-    {
-      /* Create the dialog and connects its buttons */
-      GtkWidget *parent;
-      GtkWidget *ok_button, *cancel_button;
-      
-      parent = gtk_widget_get_toplevel (GTK_WIDGET (color_button));
-      
-      color_button->priv->cs_dialog = gtk_color_selection_dialog_new (color_button->priv->title);
-      
-      color_dialog = GTK_COLOR_SELECTION_DIALOG (color_button->priv->cs_dialog);
-
-      if (gtk_widget_is_toplevel (parent) && GTK_IS_WINDOW (parent))
-        {
-          if (GTK_WINDOW (parent) != gtk_window_get_transient_for (GTK_WINDOW (color_dialog)))
-           gtk_window_set_transient_for (GTK_WINDOW (color_dialog), GTK_WINDOW (parent));
-              
-         gtk_window_set_modal (GTK_WINDOW (color_dialog),
-                               gtk_window_get_modal (GTK_WINDOW (parent)));
-       }
-
-      g_object_get (color_dialog,
-                    "ok-button", &ok_button,
-                    "cancel-button", &cancel_button,
-                    NULL);
-      
-      g_signal_connect (ok_button, "clicked",
-                        G_CALLBACK (dialog_ok_clicked), color_button);
-      g_signal_connect (cancel_button, "clicked",
-                       G_CALLBACK (dialog_cancel_clicked), color_button);
-      g_signal_connect (color_dialog, "destroy",
-                        G_CALLBACK (dialog_destroy), color_button);
-    }
-
-  color_dialog = GTK_COLOR_SELECTION_DIALOG (color_button->priv->cs_dialog);
-  color_selection = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (color_dialog));
+  ensure_dialog (button);
 
-  gtk_color_selection_set_has_opacity_control (color_selection,
-                                               color_button->priv->use_alpha);
+  gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (button->priv->cs_dialog),
+                                   button->priv->use_alpha);
 
-  gtk_color_selection_set_previous_rgba (color_selection,
-                                         &color_button->priv->rgba);
-  gtk_color_selection_set_current_rgba (color_selection,
-                                        &color_button->priv->rgba);
+  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (button->priv->cs_dialog),
+                              &button->priv->rgba);
 
-  gtk_window_present (GTK_WINDOW (color_button->priv->cs_dialog));
+  gtk_window_present (GTK_WINDOW (button->priv->cs_dialog));
 }
 
 /**
  * gtk_color_button_set_color:
- * @color_button: a #GtkColorButton.
- * @color: A #GdkColor to set the current color with.
+ * @button: a #GtkColorButton
+ * @color: A #GdkColor to set the current color with
  *
  * Sets the current color to be @color.
  *
  * Since: 2.4
- **/
+ *
+ * Deprecated: Use gtk_color_chooser_set_rgba() instead.
+ */
 void
-gtk_color_button_set_color (GtkColorButton *color_button,
-                           const GdkColor *color)
+gtk_color_button_set_color (GtkColorButton *button,
+                            const GdkColor *color)
 {
-  g_return_if_fail (GTK_IS_COLOR_BUTTON (color_button));
+  g_return_if_fail (GTK_IS_COLOR_BUTTON (button));
   g_return_if_fail (color != NULL);
 
-  color_button->priv->rgba.red = color->red / 65535.;
-  color_button->priv->rgba.green = color->green / 65535.;
-  color_button->priv->rgba.blue = color->blue / 65535.;
+  button->priv->rgba.red = color->red / 65535.;
+  button->priv->rgba.green = color->green / 65535.;
+  button->priv->rgba.blue = color->blue / 65535.;
+
+  gtk_widget_queue_draw (button->priv->draw_area);
 
-  gtk_widget_queue_draw (color_button->priv->draw_area);
-  
-  g_object_notify (G_OBJECT (color_button), "color");
-  g_object_notify (G_OBJECT (color_button), "rgba");
+  g_object_notify (G_OBJECT (button), "color");
+  g_object_notify (G_OBJECT (button), "rgba");
 }
 
 
 /**
  * gtk_color_button_set_alpha:
- * @color_button: a #GtkColorButton.
- * @alpha: an integer between 0 and 65535.
+ * @button: a #GtkColorButton
+ * @alpha: an integer between 0 and 65535
  *
- * Sets the current opacity to be @alpha. 
+ * Sets the current opacity to be @alpha.
  *
  * Since: 2.4
- **/
+ *
+ * Deprecated: 3.4: Use gtk_color_chooser_set_rgba() instead.
+ */
 void
-gtk_color_button_set_alpha (GtkColorButton *color_button,
-                           guint16         alpha)
+gtk_color_button_set_alpha (GtkColorButton *button,
+                            guint16         alpha)
 {
-  g_return_if_fail (GTK_IS_COLOR_BUTTON (color_button));
+  g_return_if_fail (GTK_IS_COLOR_BUTTON (button));
 
-  color_button->priv->rgba.alpha = alpha / 65535.;
+  button->priv->rgba.alpha = alpha / 65535.;
 
-  gtk_widget_queue_draw (color_button->priv->draw_area);
+  gtk_widget_queue_draw (button->priv->draw_area);
 
-  g_object_notify (G_OBJECT (color_button), "alpha");
-  g_object_notify (G_OBJECT (color_button), "rgba");
+  g_object_notify (G_OBJECT (button), "alpha");
+  g_object_notify (G_OBJECT (button), "rgba");
 }
 
 /**
  * gtk_color_button_get_color:
- * @color_button: a #GtkColorButton.
- * @color: (out): a #GdkColor to fill in with the current color.
+ * @button: a #GtkColorButton
+ * @color: (out): a #GdkColor to fill in with the current color
  *
  * Sets @color to be the current color in the #GtkColorButton widget.
  *
  * Since: 2.4
- **/
+ *
+ * Deprecated: 3.4: Use gtk_color_chooser_get_rgba() instead.
+ */
 void
-gtk_color_button_get_color (GtkColorButton *color_button,
-                           GdkColor       *color)
+gtk_color_button_get_color (GtkColorButton *button,
+                            GdkColor       *color)
 {
-  g_return_if_fail (GTK_IS_COLOR_BUTTON (color_button));
+  g_return_if_fail (GTK_IS_COLOR_BUTTON (button));
 
-  color->red = (guint16) (color_button->priv->rgba.red * 65535);
-  color->green = (guint16) (color_button->priv->rgba.green * 65535);
-  color->blue = (guint16) (color_button->priv->rgba.blue * 65535);
+  color->red = (guint16) (button->priv->rgba.red * 65535);
+  color->green = (guint16) (button->priv->rgba.green * 65535);
+  color->blue = (guint16) (button->priv->rgba.blue * 65535);
 }
 
 /**
  * gtk_color_button_get_alpha:
- * @color_button: a #GtkColorButton.
+ * @button: a #GtkColorButton
  *
- * Returns the current alpha value. 
+ * Returns the current alpha value.
  *
- * Return value: an integer between 0 and 65535.
+ * Return value: an integer between 0 and 65535
  *
  * Since: 2.4
- **/
+ *
+ * Deprecated: 3.4: Use gtk_color_chooser_get_rgba() instead.
+ */
 guint16
-gtk_color_button_get_alpha (GtkColorButton *color_button)
+gtk_color_button_get_alpha (GtkColorButton *button)
 {
-  g_return_val_if_fail (GTK_IS_COLOR_BUTTON (color_button), 0);
+  g_return_val_if_fail (GTK_IS_COLOR_BUTTON (button), 0);
 
-  return (guint16) (color_button->priv->rgba.alpha * 65535);
+  return (guint16) (button->priv->rgba.alpha * 65535);
 }
 
 /**
- * gtk_color_button_set_rgba:
- * @color_button: a #GtkColorButton.
+ * gtk_color_button_set_rgba: (skip)
+ * @button: a #GtkColorButton
  * @rgba: a #GdkRGBA to set the current color with
  *
  * Sets the current color to be @rgba.
  *
  * Since: 3.0
- **/
+ *
+ * Deprecated: 3.4: Use gtk_color_chooser_set_rgba() instead.
+ */
 void
-gtk_color_button_set_rgba (GtkColorButton *color_button,
+gtk_color_button_set_rgba (GtkColorButton *button,
                            const GdkRGBA  *rgba)
 {
-  g_return_if_fail (GTK_IS_COLOR_BUTTON (color_button));
+  g_return_if_fail (GTK_IS_COLOR_BUTTON (button));
   g_return_if_fail (rgba != NULL);
 
-  color_button->priv->rgba = *rgba;
+  button->priv->rgba = *rgba;
+  gtk_widget_queue_draw (button->priv->draw_area);
 
-  g_object_notify (G_OBJECT (color_button), "rgba");
+  g_object_notify (G_OBJECT (button), "color");
+  g_object_notify (G_OBJECT (button), "alpha");
+  g_object_notify (G_OBJECT (button), "rgba");
 }
 
 /**
- * gtk_color_button_get_rgba:
- * @color_button: a #GtkColorButton.
+ * gtk_color_button_get_rgba: (skip)
+ * @button: a #GtkColorButton
  * @rgba: (out): a #GdkRGBA to fill in with the current color
  *
  * Sets @rgba to be the current color in the #GtkColorButton widget.
  *
  * Since: 3.0
- **/
+ *
+ * Deprecated: 3.4: Use gtk_color_chooser_get_rgba() instead.
+ */
 void
-gtk_color_button_get_rgba (GtkColorButton *color_button,
+gtk_color_button_get_rgba (GtkColorButton *button,
                            GdkRGBA        *rgba)
 {
-  g_return_if_fail (GTK_IS_COLOR_BUTTON (color_button));
+  g_return_if_fail (GTK_IS_COLOR_BUTTON (button));
   g_return_if_fail (rgba != NULL);
 
-  *rgba = color_button->priv->rgba;
+  *rgba = button->priv->rgba;
 }
 
 /**
  * gtk_color_button_set_use_alpha:
- * @color_button: a #GtkColorButton.
- * @use_alpha: %TRUE if color button should use alpha channel, %FALSE if not.
+ * @button: a #GtkColorButton
+ * @use_alpha: %TRUE if color button should use alpha channel, %FALSE if not
  *
  * Sets whether or not the color button should use the alpha channel.
  *
  * Since: 2.4
+ *
+ * Deprecated: 3.4: Use gtk_color_chooser_set_use_alpha() instead.
  */
 void
-gtk_color_button_set_use_alpha (GtkColorButton *color_button, 
-                               gboolean        use_alpha)
+gtk_color_button_set_use_alpha (GtkColorButton *button,
+                                gboolean        use_alpha)
 {
-  g_return_if_fail (GTK_IS_COLOR_BUTTON (color_button));
+  g_return_if_fail (GTK_IS_COLOR_BUTTON (button));
 
   use_alpha = (use_alpha != FALSE);
 
-  if (color_button->priv->use_alpha != use_alpha) 
+  if (button->priv->use_alpha != use_alpha)
     {
-      color_button->priv->use_alpha = use_alpha;
+      button->priv->use_alpha = use_alpha;
 
-      gtk_widget_queue_draw (color_button->priv->draw_area);
+      gtk_widget_queue_draw (button->priv->draw_area);
 
-      g_object_notify (G_OBJECT (color_button), "use-alpha");
+      g_object_notify (G_OBJECT (button), "use-alpha");
     }
 }
 
 /**
  * gtk_color_button_get_use_alpha:
- * @color_button: a #GtkColorButton.
+ * @button: a #GtkColorButton
  *
- * Does the color selection dialog use the alpha channel?
+ * Does the color selection dialog use the alpha channel ?
  *
- * Returns: %TRUE if the color sample uses alpha channel, %FALSE if not.
+ * Returns: %TRUE if the color sample uses alpha channel, %FALSE if not
  *
  * Since: 2.4
+ *
+ * Deprecated: 3.4: Use gtk_color_chooser_get_use_alpha() instead.
  */
 gboolean
-gtk_color_button_get_use_alpha (GtkColorButton *color_button)
+gtk_color_button_get_use_alpha (GtkColorButton *button)
 {
-  g_return_val_if_fail (GTK_IS_COLOR_BUTTON (color_button), FALSE);
+  g_return_val_if_fail (GTK_IS_COLOR_BUTTON (button), FALSE);
 
-  return color_button->priv->use_alpha;
+  return button->priv->use_alpha;
 }
 
 
 /**
  * gtk_color_button_set_title:
- * @color_button: a #GtkColorButton
- * @title: String containing new window title.
+ * @button: a #GtkColorButton
+ * @title: String containing new window title
  *
  * Sets the title for the color selection dialog.
  *
  * Since: 2.4
  */
 void
-gtk_color_button_set_title (GtkColorButton *color_button, 
-                           const gchar    *title)
+gtk_color_button_set_title (GtkColorButton *button,
+                            const gchar    *title)
 {
   gchar *old_title;
 
-  g_return_if_fail (GTK_IS_COLOR_BUTTON (color_button));
+  g_return_if_fail (GTK_IS_COLOR_BUTTON (button));
 
-  old_title = color_button->priv->title;
-  color_button->priv->title = g_strdup (title);
+  old_title = button->priv->title;
+  button->priv->title = g_strdup (title);
   g_free (old_title);
 
-  if (color_button->priv->cs_dialog)
-    gtk_window_set_title (GTK_WINDOW (color_button->priv->cs_dialog), 
-                         color_button->priv->title);
-  
-  g_object_notify (G_OBJECT (color_button), "title");
+  if (button->priv->cs_dialog)
+    gtk_window_set_title (GTK_WINDOW (button->priv->cs_dialog),
+                          button->priv->title);
+
+  g_object_notify (G_OBJECT (button), "title");
 }
 
 /**
  * gtk_color_button_get_title:
- * @color_button: a #GtkColorButton
+ * @button: a #GtkColorButton
  *
  * Gets the title of the color selection dialog.
  *
@@ -884,38 +861,50 @@ gtk_color_button_set_title (GtkColorButton *color_button,
  *
  * Since: 2.4
  */
-G_CONST_RETURN gchar *
-gtk_color_button_get_title (GtkColorButton *color_button)
+const gchar *
+gtk_color_button_get_title (GtkColorButton *button)
 {
-  g_return_val_if_fail (GTK_IS_COLOR_BUTTON (color_button), NULL);
+  g_return_val_if_fail (GTK_IS_COLOR_BUTTON (button), NULL);
 
-  return color_button->priv->title;
+  return button->priv->title;
 }
 
 static void
 gtk_color_button_set_property (GObject      *object,
-                              guint         param_id,
-                              const GValue *value,
-                              GParamSpec   *pspec)
+                               guint         param_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
 {
-  GtkColorButton *color_button = GTK_COLOR_BUTTON (object);
+  GtkColorButton *button = GTK_COLOR_BUTTON (object);
 
-  switch (param_id) 
+  switch (param_id)
     {
     case PROP_USE_ALPHA:
-      gtk_color_button_set_use_alpha (color_button, g_value_get_boolean (value));
+      gtk_color_button_set_use_alpha (button, g_value_get_boolean (value));
       break;
     case PROP_TITLE:
-      gtk_color_button_set_title (color_button, g_value_get_string (value));
+      gtk_color_button_set_title (button, g_value_get_string (value));
       break;
     case PROP_COLOR:
-      gtk_color_button_set_color (color_button, g_value_get_boxed (value));
+      {
+        GdkColor *color;
+        GdkRGBA rgba;
+
+        color = g_value_get_boxed (value);
+
+        rgba.red = color->red / 65535.0;
+        rgba.green = color->green / 65535.0;
+        rgba.blue = color->blue / 65535.0;
+        rgba.alpha = 1.0;
+
+        gtk_color_button_set_rgba (button, &rgba);
+      }
       break;
     case PROP_ALPHA:
-      gtk_color_button_set_alpha (color_button, g_value_get_uint (value));
+      gtk_color_button_set_alpha (button, g_value_get_uint (value));
       break;
     case PROP_RGBA:
-      gtk_color_button_set_rgba (color_button, g_value_get_boxed (value));
+      gtk_color_button_set_rgba (button, g_value_get_boxed (value));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -925,33 +914,42 @@ gtk_color_button_set_property (GObject      *object,
 
 static void
 gtk_color_button_get_property (GObject    *object,
-                              guint       param_id,
-                              GValue     *value,
-                              GParamSpec *pspec)
+                               guint       param_id,
+                               GValue     *value,
+                               GParamSpec *pspec)
 {
-  GtkColorButton *color_button = GTK_COLOR_BUTTON (object);
-  GdkColor color;
+  GtkColorButton *button = GTK_COLOR_BUTTON (object);
 
-  switch (param_id) 
+  switch (param_id)
     {
     case PROP_USE_ALPHA:
-      g_value_set_boolean (value, gtk_color_button_get_use_alpha (color_button));
+      g_value_set_boolean (value, gtk_color_button_get_use_alpha (button));
       break;
     case PROP_TITLE:
-      g_value_set_string (value, gtk_color_button_get_title (color_button));
+      g_value_set_string (value, gtk_color_button_get_title (button));
       break;
     case PROP_COLOR:
-      gtk_color_button_get_color (color_button, &color);
-      g_value_set_boxed (value, &color);
+      {
+        GdkColor color;
+        GdkRGBA rgba;
+
+        gtk_color_button_get_rgba (button, &rgba);
+
+        color.red = (guint16) (rgba.red * 65535 + 0.5);
+        color.green = (guint16) (rgba.green * 65535 + 0.5);
+        color.blue = (guint16) (rgba.blue * 65535 + 0.5);
+
+        g_value_set_boxed (value, &color);
+      }
       break;
     case PROP_ALPHA:
-      g_value_set_uint (value, gtk_color_button_get_alpha (color_button));
+      g_value_set_uint (value, gtk_color_button_get_alpha (button));
       break;
     case PROP_RGBA:
       {
         GdkRGBA rgba;
 
-        gtk_color_button_get_rgba (color_button, &rgba);
+        gtk_color_button_get_rgba (button, &rgba);
         g_value_set_boxed (value, &rgba);
       }
       break;
@@ -960,3 +958,30 @@ gtk_color_button_get_property (GObject    *object,
       break;
     }
 }
+
+static void
+gtk_color_button_add_palette (GtkColorChooser *chooser,
+                              GtkOrientation   orientation,
+                              gint             colors_per_line,
+                              gint             n_colors,
+                              GdkRGBA         *colors)
+{
+  GtkColorButton *button = GTK_COLOR_BUTTON (chooser);
+
+  ensure_dialog (button);
+
+  gtk_color_chooser_add_palette (GTK_COLOR_CHOOSER (button->priv->cs_dialog),
+                                   orientation, colors_per_line, n_colors, colors);
+}
+
+typedef void (* get_rgba) (GtkColorChooser *, GdkRGBA *);
+typedef void (* set_rgba) (GtkColorChooser *, const GdkRGBA *);
+
+static void
+gtk_color_button_iface_init (GtkColorChooserInterface *iface)
+{
+  iface->get_rgba = (get_rgba)gtk_color_button_get_rgba;
+  iface->set_rgba = (set_rgba)gtk_color_button_set_rgba;
+  iface->add_palette = gtk_color_button_add_palette;
+}
+