diff options
| author | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
|---|---|---|
| committer | Mike Kestner <mkestner@src.gnome.org> | 2002-11-01 05:30:57 +0800 |
| commit | 613453b1095e325149b8d37e5731d415e1d5f9bd (patch) | |
| tree | 1c0d7f9be4d4a87aa67d8e185ae2bb23d02254b7 /widgets/misc/e-canvas-background.c | |
| parent | ec242d6c30d7bf056c8f59710b8576c942f93583 (diff) | |
| download | gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.bz2 gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.lz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.xz gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.zst gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.zip | |
merging the gal-2 branch back to the trunk.
merging the gal-2 branch back to the trunk.
svn path=/trunk/; revision=18471
Diffstat (limited to 'widgets/misc/e-canvas-background.c')
| -rw-r--r-- | widgets/misc/e-canvas-background.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index 791caf1bcc..ff09ce0e1d 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -69,17 +69,11 @@ enum { static void get_color(ECanvasBackground *ecb) { - int n; GnomeCanvasItem *item = GNOME_CANVAS_ITEM (ecb); - - n = 0; - gdk_color_context_get_pixels (item->canvas->cc, - &ecb->priv->color.red, - &ecb->priv->color.green, - &ecb->priv->color.blue, - 1, - &ecb->priv->color.pixel, - &n); + ecb->priv->color.pixel = gnome_canvas_get_color_pixel (item->canvas, + GNOME_CANVAS_COLOR (ecb->priv->color.red >> 8, + ecb->priv->color.green>> 8, + ecb->priv->color.blue>> 8)); } static void @@ -427,11 +421,11 @@ ecb_class_init (GtkObjectClass *object_class) gtk_object_add_arg_type ("ECanvasBackground::fill_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_FILL_COLOR); - gtk_object_add_arg_type ("ECanvasBackground::fill_color_gdk", GTK_TYPE_GDK_COLOR, + gtk_object_add_arg_type ("ECanvasBackground::fill_color_gdk", GDK_TYPE_COLOR, GTK_ARG_READWRITE, ARG_FILL_COLOR_GDK); gtk_object_add_arg_type ("ECanvasBackground::fill_color_rgba", GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_FILL_COLOR_RGBA); - gtk_object_add_arg_type ("ECanvasBackground::fill_stipple", GTK_TYPE_GDK_WINDOW, + gtk_object_add_arg_type ("ECanvasBackground::fill_stipple", GDK_TYPE_WINDOW, GTK_ARG_READWRITE, ARG_FILL_STIPPLE); gtk_object_add_arg_type ("ECanvasBackground::x1", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_X1); |