gtk: Always load the atk-bridge

[~andy/gtk] / gtk / gtkcolorbutton.c

diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index ab2821fa41a4ea3cf79b97adcf2cf7727089330a..c9056b5d02023bd53afc62e587e3cd2da40c68e2 100644 (file)
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -60,8 +60,6 @@
 #define CHECK_DARK  (1.0 / 3.0)
 #define CHECK_LIGHT (2.0 / 3.0)
 
-#define COLOR_SAMPLE_MARGIN 1
-
 struct _GtkColorButtonPrivate
 {
   GtkWidget *draw_area; /* Widget where we draw the color sample */
@@ -437,19 +435,12 @@ gtk_color_button_init (GtkColorButton *button)
   gtk_widget_push_composite_child ();
 
   button->priv->draw_area = gtk_drawing_area_new ();
-  g_object_set (button->priv->draw_area, 
-                "margin-top", COLOR_SAMPLE_MARGIN,
-                "margin-bottom", COLOR_SAMPLE_MARGIN,
-                "margin-left", 16,
-                "margin-right", 16,
-                NULL);
-
   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 (button->priv->draw_area, 
-                               rect.width, rect.height - 2 * COLOR_SAMPLE_MARGIN);
+                               rect.width, rect.height);
 
   g_signal_connect (button->priv->draw_area, "draw",
                     G_CALLBACK (gtk_color_button_draw_cb), button);
@@ -628,6 +619,9 @@ gtk_color_button_clicked (GtkButton *b)
   gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (button->priv->cs_dialog),
                                    button->priv->use_alpha);
 
+  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (button->priv->cs_dialog),
+                              &button->priv->rgba);
+
   gtk_window_present (GTK_WINDOW (button->priv->cs_dialog));
 }