Hiroyuki Ikezoe
ikezo****@users*****
2006年 11月 22日 (水) 16:13:34 JST
Index: libtomoe-gtk/src/tomoe-canvas.c
diff -u libtomoe-gtk/src/tomoe-canvas.c:1.14 libtomoe-gtk/src/tomoe-canvas.c:1.15
--- libtomoe-gtk/src/tomoe-canvas.c:1.14 Wed Nov 22 16:07:12 2006
+++ libtomoe-gtk/src/tomoe-canvas.c Wed Nov 22 16:13:34 2006
@@ -877,11 +877,7 @@
static void
tomoe_canvas_gc_set_foreground (GdkGC *gc, GdkColor *color)
{
- GdkColor default_color;
-
- default_color.red = 0x0000;
- default_color.green = 0x0000;
- default_color.blue = 0x0000;
+ GdkColor default_color = { 0, 0x0000, 0x0000, 0x0000 };
if (color) {
gdk_colormap_alloc_color (gdk_colormap_get_system (), color,
@@ -1042,13 +1038,10 @@
{
TomoeCanvasPriv *priv = TOMOE_CANVAS_GET_PRIVATE (canvas);
GtkWidget *widget = GTK_WIDGET (canvas);
- GdkColor color;
if (!priv->axis_gc) {
/* FIXME: customize color */
- color.red = 0x8000;
- color.green = 0x8000;
- color.blue = 0x8000;
+ GdkColor color = { 0, 0x8000, 0x8000, 0x8000 };
priv->axis_gc = gdk_gc_new (widget->window);
tomoe_canvas_set_axis_color (canvas, &color);
gdk_gc_set_line_attributes (priv->axis_gc, 1,
@@ -1072,10 +1065,7 @@
GtkWidget *widget = GTK_WIDGET (canvas);
if (!priv->adjust_line_gc) {
- GdkColor color;
- color.red = 0x8000;
- color.green = 0x0000;
- color.blue = 0x0000;
+ GdkColor color = { 0, 0x8000, 0x0000, 0x0000 };
priv->adjust_line_gc = gdk_gc_new (widget->window);
tomoe_canvas_set_adjust_line_color (canvas, &color);
gdk_gc_set_line_attributes (priv->adjust_line_gc, 1,
@@ -1085,10 +1075,7 @@
}
if (!priv->handwrite_line_gc) {
- GdkColor color;
- color.red = 0x0000;
- color.green = 0x0000;
- color.blue = 0x0000;
+ GdkColor color = { 0, 0x0000, 0x0000, 0x0000 };
priv->handwrite_line_gc = gdk_gc_new (widget->window);
tomoe_canvas_set_handwrite_line_color (canvas, &color);
gdk_gc_set_line_attributes (priv->handwrite_line_gc, 4,
@@ -1098,10 +1085,7 @@
}
if (!priv->annotate_gc) {
- GdkColor color;
- color.red = 0x8000;
- color.green = 0x0000;
- color.blue = 0x0000;
+ GdkColor color = { 0, 0x8000, 0x0000, 0x0000 };
priv->annotate_gc = gdk_gc_new (widget->window);
tomoe_canvas_set_annotate_color (canvas, &color);
}