[GRASS-SVN] r36031 - grass/branches/develbranch_6/lib/init

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-02-22 06:54:33 -0500 (Sun, 22 Feb 2009)
New Revision: 36031

Modified:
   grass/branches/develbranch_6/lib/init/grass6.html
   grass/branches/develbranch_6/lib/init/init.bat
   grass/branches/develbranch_6/lib/init/init.sh
Log:
allow -wx as an alias to -wxpython

Modified: grass/branches/develbranch_6/lib/init/grass6.html
===================================================================
--- grass/branches/develbranch_6/lib/init/grass6.html	2009-02-22 11:24:43 UTC (rev 36030)
+++ grass/branches/develbranch_6/lib/init/grass6.html	2009-02-22 11:54:33 UTC (rev 36031)
@@ -17,7 +17,7 @@
 <H2>SYNOPSIS</H2>
 
 <B>grass65</B> [<B>-</B>] [<B>-v</B>] [<B>-h | -help | --help</B>]
-    [<B>-text | -gui | -tcltk | -wxpython]</B>]
+    [<B>-text | -gui | -tcltk | -oldtcltk | -wxpython | -wx]</B>]
     [[[<B>&lt;GISDBASE&gt;/</B>]<B>&lt;LOCATION_NAME&gt;/</B>]
     	<B>&lt;MAPSET&gt;</B>]
 
@@ -70,7 +70,10 @@
 <DT><B>-gui</B> (or <B>-tcltk</B>)
 <DD> Indicates that the old Tcl/Tk based graphical user interface should be used
 
-<DT><B>-wxpython</B>
+<DT><B>-oldtcltk</B>
+<DD> Indicates that the even older Tcl/Tk based graphical user interface should be used
+
+<DT><B>-wxpython</B> (or <B>-wx</B>)
 <DD> Indicates that the new Python based graphical user interface should be used
 
 <DT><B>-v</B> <B>--version</B>

Modified: grass/branches/develbranch_6/lib/init/init.bat
===================================================================
--- grass/branches/develbranch_6/lib/init/init.bat	2009-02-22 11:24:43 UTC (rev 36030)
+++ grass/branches/develbranch_6/lib/init/init.bat	2009-02-22 11:54:33 UTC (rev 36031)
@@ -54,6 +54,7 @@
 
 if "%1" == "-tcltk" goto setguimode
 if "%1" == "-wxpython" goto setwxmode
+if "%1" == "-wx" goto setwxmode
 if "%1" == "-gui" goto setguimode
 
 :afterguicheck

Modified: grass/branches/develbranch_6/lib/init/init.sh
===================================================================
--- grass/branches/develbranch_6/lib/init/init.sh	2009-02-22 11:24:43 UTC (rev 36030)
+++ grass/branches/develbranch_6/lib/init/init.sh	2009-02-22 11:54:33 UTC (rev 36031)
@@ -82,7 +82,7 @@
 	help|-h|-help|--help)
 	    echo "Usage:"
 	    echo "  $CMD_NAME [-h | -help | --help] [-v | --version] [-c]"
-	    echo "          [-text | -gui | -tcltk | -oldtcltk | -wxpython]"
+	    echo "          [-text | -gui | -tcltk | -oldtcltk | -wxpython | -wx]"
 	    echo "          [[[<GISDBASE>/]<LOCATION_NAME>/]<MAPSET>]"
 	    echo
             echo "Flags:"
@@ -97,7 +97,7 @@
             echo "                                   and set as default"
 	    echo "  -oldtcltk                      use old Tcl/Tk based graphical user interface"
             echo "                                   and set as default"
-            echo "  -wxpython                      use wxPython based graphical user interface"
+            echo "  -wxpython or -wx               use wxPython based graphical user interface"
             echo "                                   and set as default"
             echo
             echo "Parameters:"
@@ -143,7 +143,7 @@
 	    ;;
 
 	# Check if the -wxpython flag was given
-	-wxpython)
+	-wxpython | -wx)
 	    GRASS_GUI="wxpython"
 	    shift
 	    ;;