[GRASS-SVN] r32677 - in grass/trunk: display/d.vect gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-08-11 05:45:28 -0400 (Mon, 11 Aug 2008)
New Revision: 32677

Modified:
   grass/trunk/display/d.vect/main.c
   grass/trunk/gui/wxpython/gui_modules/menuform.py
Log:
more standard options in d.vect, fix wx GUI menuform, update r32674
	merge from devbr6, r32676


Modified: grass/trunk/display/d.vect/main.c
===================================================================
--- grass/trunk/display/d.vect/main.c	2008-08-11 09:41:59 UTC (rev 32676)
+++ grass/trunk/display/d.vect/main.c	2008-08-11 09:45:28 UTC (rev 32677)
@@ -194,13 +194,11 @@
     width_opt->guisection = _("Lines");
     width_opt->description = _("Line width");
 
-    wcolumn_opt = G_define_option();
+    wcolumn_opt = G_define_standard_option(G_OPT_COLUMN);
     wcolumn_opt->key = "wcolumn";
-    wcolumn_opt->type = TYPE_STRING;
     wcolumn_opt->guisection = _("Lines");
     wcolumn_opt->description =
-	_
-	("Name of column for line widths (these values will be scaled by wscale)");
+	_("Name of column for line widths (these values will be scaled by wscale)");
 
     wscale_opt = G_define_option();
     wscale_opt->key = "wscale";
@@ -229,10 +227,8 @@
     size_opt->description = _("Symbol size");
 
     /* Labels */
-    attrcol_opt = G_define_option();
+    attrcol_opt = G_define_standard_option(G_OPT_COLUMN);
     attrcol_opt->key = "attrcol";
-    attrcol_opt->type = TYPE_STRING;
-    attrcol_opt->required = NO;
     attrcol_opt->multiple = NO;	/* or fix attr.c, around line 102 */
     attrcol_opt->guisection = _("Labels");
     attrcol_opt->description = _("Name of column to be displayed");

Modified: grass/trunk/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menuform.py	2008-08-11 09:41:59 UTC (rev 32676)
+++ grass/trunk/gui/wxpython/gui_modules/menuform.py	2008-08-11 09:45:28 UTC (rev 32677)
@@ -1157,7 +1157,7 @@
                     p['wxGetValue'] = columns.GetStringSelection
                     columns.Bind(wx.EVT_ENTER_WINDOW, self.OnDbColumn)
                     columns.Bind(wx.EVT_COMBOBOX, self.OnSetValue)
-                    this_sizer.Add(item=columns, proportion=0,
+                    which_sizer.Add(item=columns, proportion=0,
                                    flag=wx.ADJUST_MINSIZE | wx.BOTTOM | wx.LEFT, border=5)
                 # color entry
                 elif p.get('prompt','') == 'color':