changed glyph set color to use GdkColor as per code usage

src/zmapWindow/items/zmapWindowBasicFeature.c

@@ -29,7 +29,7 @@
  * HISTORY:
  * Last edited: Jul  3 17:07 2009 (rds)
  * Created: Wed Dec  3 10:02:22 2008 (rds)
- * CVS info:   $Id: zmapWindowBasicFeature.c,v 1.9 2010-01-11 16:50:20 mh17 Exp $
+ * CVS info:   $Id: zmapWindowBasicFeature.c,v 1.10 2010-01-12 09:17:28 mh17 Exp $
  *-------------------------------------------------------------------
  */
 
@@ -104,9 +104,9 @@ static FooCanvasItem *zmap_window_basic_feature_add_interval(ZMapWindowCanvasIte
       ZMapFeatureTypeStyle style;
       ZMapFeature feature;
       gboolean interval_type_from_feature_type = TRUE; /* for now */
-      GdkColor fill,outline;
-      GdkColor *pfill = &fill,*poutline = &outline;
-
+      char *fill = "white",*outline = "black";
+      GdkColor gdk_fill,gdk_outline;
+      GdkColor *pfill = &gdk_fill,*poutline = &gdk_outline;
       feature = basic->feature;
       style   = (ZMAP_CANVAS_ITEM_GET_CLASS(basic)->get_style)(basic);
 
@@ -141,26 +141,23 @@ static FooCanvasItem *zmap_window_basic_feature_add_interval(ZMapWindowCanvasIte
                   if(feature->strand == ZMAPSTRAND_FORWARD)
                     type = ZMAP_GLYPH_ITEM_STYLE_TRIANGLE;
                   else 
-                  type = ZMAP_GLYPH_ITEM_STYLE_TRIANGLE; // mh17: (sic)
+                    type = ZMAP_GLYPH_ITEM_STYLE_TRIANGLE; // mh17: (sic)
+
+                  fill = "blue";
 
-                  gdk_color_parse("#0000ff",&fill);
-                  gdk_color_parse("#000000",&outline);
-                  pfill = &fill;
-                  poutline = &outline;
                   break;
 
           case ZMAPSTYLE_GLYPH_MARKER:
                   type = zMapStyleGlyphType(style);
-                  if(!zMapStyleGetColoursDefault(style,&pfill,NULL,&poutline))
-                  {
-                        gdk_color_parse("#00ff00",&fill);
-                        gdk_color_parse("#000000",&outline);
-                        pfill = &fill;
-                        poutline = &outline;
-                  }
+                  fill = "green";
 
                   break;
           }
+          if(!zMapStyleGetColoursDefault(style,&pfill,NULL,&poutline))
+            {
+                  gdk_color_parse(fill,pfill);
+                  gdk_color_parse(outline,poutline);
+            }
 
 
 	    basic->auto_resize_background = 1;

src/zmapWindow/items/zmapWindowGlyphItem.c

@@ -29,7 +29,7 @@
  * HISTORY:
  * Last edited: Jun  3 09:51 2009 (rds)
  * Created: Fri Jan 16 11:20:07 2009 (rds)
- * CVS info:   $Id: zmapWindowGlyphItem.c,v 1.5 2010-01-11 16:50:20 mh17 Exp $
+ * CVS info:   $Id: zmapWindowGlyphItem.c,v 1.6 2010-01-12 09:17:28 mh17 Exp $
  *-------------------------------------------------------------------
  */
 
@@ -247,20 +247,14 @@ static gboolean glyph_set_color_property(ZMapWindowGlyphItem glyph_item, guint p
 	
 	if (pcolor) 
 	  {
-	    GdkColormap *colormap;
-	    
-	    color    = *pcolor;
-	    colormap = gtk_widget_get_colormap (GTK_WIDGET (item->canvas));
-	    
-	    gdk_rgb_find_color (colormap, &color);
-	    
-	    pixel = color.pixel;
 	    set   = TRUE;
+          rgba = glyph_color_to_rgba(pcolor);
+          pixel = foo_canvas_get_color_pixel(item->canvas, rgba);
 	  }
 	else
 	  set = FALSE;
 	
-	rgba = glyph_color_to_rgba(&color);
+
       }
       break;
     case PROP_FILL_COLOR_RGBA: