2009-01-13 Claudio Saavedra <csaavedra@igalia.com>

[hildon] / src / hildon-color-chooser-dialog.c

diff --git a/src/hildon-color-chooser-dialog.c b/src/hildon-color-chooser-dialog.c
index e4ee755..902a475 100644 (file)
--- a/src/hildon-color-chooser-dialog.c
+++ b/src/hildon-color-chooser-dialog.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2005, 2006 Nokia Corporation, all rights reserved.
  *
  * Author: Kuisma Salonen <kuisma.salonen@nokia.com>
- * Contact: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
+ * Contact: Rodrigo Novo <rodrigo.novo@nokia.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -38,6 +38,8 @@
  *
  */
 
+#undef                                          HILDON_DISABLE_DEPRECATED
+
 #ifdef                                          HAVE_CONFIG_H
 #include                                        <config.h>
 #endif
@@ -213,7 +215,6 @@ hildon_color_chooser_dialog_init                (HildonColorChooserDialog *objec
     gtk_box_pack_start (GTK_BOX (priv->vbox), priv->align_custom, FALSE, FALSE, 0);
 
     gtk_dialog_add_button (GTK_DIALOG (object), _("ecdg_bd_colour_selector_ok"), GTK_RESPONSE_OK);
-    gtk_dialog_add_button (GTK_DIALOG (object), _("ecdg_bd_colour_selector_cancel"), GTK_RESPONSE_CANCEL);
     gtk_dialog_set_default_response (GTK_DIALOG (object), GTK_RESPONSE_OK);
 
     g_signal_connect (G_OBJECT (priv->chooser), 
@@ -883,7 +884,7 @@ hildon_color_chooser_dialog_area_expose         (GtkWidget *widget,
         y = ((i / w) * (tot_h + spacing));
 
         gdk_draw_rectangle (widget->window,
-                widget->style->black_gc,
+                (i == num_selected) ? widget->style->bg_gc[GTK_STATE_SELECTED] : widget->style->bg_gc[GTK_STATE_NORMAL],
                 TRUE,
                 (i == num_selected) ? x : x + 2,  
                 (i == num_selected) ? y : y + 2,
@@ -891,7 +892,7 @@ hildon_color_chooser_dialog_area_expose         (GtkWidget *widget,
                 (i == num_selected) ? tot_h : tot_h - 4);
 
         gdk_draw_rectangle(widget->window,
-                widget->style->white_gc,
+                (i == num_selected) ? widget->style->bg_gc[GTK_STATE_NORMAL] : widget->style->white_gc,
                 TRUE,
                 x + 3,  
                 y + 3,