* 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
*
*/
+#undef HILDON_DISABLE_DEPRECATED
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <memory.h>
#include <string.h>
#include <libintl.h>
-#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-#include <gconf/gconf-client.h>
+
#include "hildon-color-chooser-dialog.h"
#include "hildon-color-chooser.h"
#include "hildon-defines.h"
gtk_box_pack_start (GTK_BOX (priv->vbox), priv->separator, FALSE, FALSE, 0);
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_add_button (GTK_DIALOG (object), _("wdgt_bd_done"), GTK_RESPONSE_OK);
gtk_dialog_set_default_response (GTK_DIALOG (object), GTK_RESPONSE_OK);
g_signal_connect (G_OBJECT (priv->chooser),
- "insensitive-press", G_CALLBACK (hildon_color_chooser_dialog_insensitive_press), object);
+ "query-tooltip", G_CALLBACK (hildon_color_chooser_dialog_insensitive_press), object);
g_signal_connect (G_OBJECT (priv->area_custom),
"expose-event", G_CALLBACK (hildon_color_chooser_dialog_area_expose), object);
for (i = 0; i < tmp; i++) {
g_object_unref (priv->gc_array[i]);
+ priv->gc_array[i] = NULL;
}
GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
if (tmpcolor) {
priv->style_info.default_color = *tmpcolor;
+ gdk_color_free (tmpcolor);
} else {
priv->style_info.default_color.red = 0x0000;
priv->style_info.default_color.green = 0x0000;
for (i = 0; i < tmpn; i++) {
g_object_unref (priv->gc_array[i]);
+ priv->gc_array[i] = NULL;
}
}
(priv->style_info.num_buttons.top * priv->style_info.num_buttons.bottom);
priv->gc_array = (GdkGC **) g_malloc0 (sizeof (GdkGC *) * tmpn);
+ if (GTK_WIDGET_REALIZED (widget)) {
+ for (i = 0; i < tmpn; i++) {
+ priv->gc_array[i] = gdk_gc_new (widget->window);
+ }
+ }
if (priv->gconf_client) {
if (tmpcolor) {
priv->colors_defined[i] = *tmpcolor;
+ gdk_color_free (tmpcolor);
} else {
if(i < 16) {
priv->colors_defined[i] = hardcoded_colors[i];
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,
(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,
if (tmp1) {
priv->style_info.cont_sizes = *tmp1;
- g_free (tmp1);
+ gtk_border_free (tmp1);
} else {
priv->style_info.cont_sizes.left = 0;
priv->style_info.cont_sizes.right = 8;
if (tmp2) {
priv->style_info.radio_sizes = *tmp2;
- g_free (tmp2);
+ gtk_border_free (tmp2);
} else {
priv->style_info.radio_sizes.left = 16;
priv->style_info.radio_sizes.right = 16;
if (tmp3) {
priv->style_info.num_buttons = *tmp3;
- g_free (tmp3);
+ gtk_border_free (tmp3);
} else {
priv->style_info.num_buttons.left = 8;
priv->style_info.num_buttons.right = 2;