[GRASS-SVN] r35132 - grass/branches/releasebranch_6_4/display/d.barscale

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-12-31 04:57:38 -0500 (Wed, 31 Dec 2008)
New Revision: 35132

Modified:
   grass/branches/releasebranch_6_4/display/d.barscale/main.c
Log:
d.barscale: fix color options
           (merge from devbr6, r35130)


Modified: grass/branches/releasebranch_6_4/display/d.barscale/main.c
===================================================================
--- grass/branches/releasebranch_6_4/display/d.barscale/main.c	2008-12-31 09:57:11 UTC (rev 35131)
+++ grass/branches/releasebranch_6_4/display/d.barscale/main.c	2008-12-31 09:57:38 UTC (rev 35132)
@@ -80,24 +80,13 @@
     scalebar->key = 's';
     scalebar->description = _("Draw a scale bar only");
 
-    opt1 = G_define_option();
+    opt1 = G_define_standard_option(G_OPT_C_BG);
     opt1->key = "bcolor";
-    opt1->type = TYPE_STRING;
-    opt1->answer = DEFAULT_BG_COLOR;
-    opt1->required = NO;
-    opt1->description =
-	_("Background color, either a standard GRASS color, R:G:B triplet, or \"none\"");
-    opt1->gisprompt = GISPROMPT_COLOR;
 
-    opt2 = G_define_option();
+    opt2 = G_define_standard_option(G_OPT_C_FG);
     opt2->key = "tcolor";
-    opt2->type = TYPE_STRING;
-    opt2->answer = DEFAULT_FG_COLOR;
-    opt2->required = NO;
-    opt2->description =
-	_("Text color, either a standard GRASS color or R:G:B triplet");
-    opt2->gisprompt = GISPROMPT_COLOR;
-
+    opt2->label = _("Text color");
+    
     opt3 = G_define_option();
     opt3->key = "at";
     opt3->key_desc = "x,y";