[GRASS-SVN] r43228 - in grass/branches/releasebranch_6_4: general/g.gui lib/init

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-08-24 10:51:09 +0000 (Tue, 24 Aug 2010)
New Revision: 43228

Modified:
   grass/branches/releasebranch_6_4/general/g.gui/main.c
   grass/branches/releasebranch_6_4/lib/init/init.sh
Log:
note 'wx' in init.sh and wxGUI in g.gui


Modified: grass/branches/releasebranch_6_4/general/g.gui/main.c
===================================================================
--- grass/branches/releasebranch_6_4/general/g.gui/main.c	2010-08-24 10:36:55 UTC (rev 43227)
+++ grass/branches/releasebranch_6_4/general/g.gui/main.c	2010-08-24 10:51:09 UTC (rev 43228)
@@ -8,7 +8,7 @@
  *
  * PURPOSE:      Start GRASS GUI from command line.
  *
- * COPYRIGHT:    (C) 2008 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2008, 2010 by the GRASS Development Team
  *
  *               This program is free software under the GNU General Public
  *               License (>=v2). Read the file COPYING that comes with GRASS
@@ -42,7 +42,7 @@
     type->type = TYPE_STRING;
     type->label = _("GUI type");
     type->description = _("Default value: GRASS_GUI if defined, otherwise wxpython");
-    type->descriptions = _("wxpython;wxPython based next generation GUI;"
+    type->descriptions = _("wxpython;wxPython based GUI - wxGUI;"
 			   "tcltk;Tcl/Tk based GUI - GIS Manager (gis.m);"
 			   "oldtcltk;Old Tcl/Tk based GUI - Display Manager (d.m);"
 			   "text;command line interface only");

Modified: grass/branches/releasebranch_6_4/lib/init/init.sh
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/init.sh	2010-08-24 10:36:55 UTC (rev 43227)
+++ grass/branches/releasebranch_6_4/lib/init/init.sh	2010-08-24 10:51:09 UTC (rev 43228)
@@ -108,7 +108,7 @@
             echo "  GISDBASE/LOCATION_NAME/MAPSET  fully qualified initial mapset directory"
             echo
             echo "Environment variables relevant for startup:"
-            echo "  GRASS_GUI                      select GUI (text, gui, tcltk, oldtcltk, wxpython)"
+            echo "  GRASS_GUI                      select GUI (text, gui, tcltk, oldtcltk, wxpython, wx)"
             echo "  GRASS_TCLSH                    set tclsh shell name to override 'tclsh'"
             echo "  GRASS_WISH                     set wish shell name to override 'wish'"
             echo "  GRASS_HTML_BROWSER             set html web browser for help pages"
@@ -878,7 +878,7 @@
      oldtcltk | d.m)
         echo "If required, restart the GUI with:       g.gui oldtcltk"
         ;;
-     wxpython)
+     wxpython | wx)
         echo "If required, restart the GUI with:       g.gui wxpython"
         ;;
      *)