[GRASS-SVN] r49750 - in grass/trunk/gui/wxpython: core gui_core

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-14 09:53:44 -0800 (Wed, 14 Dec 2011)
New Revision: 49750

Modified:
   grass/trunk/gui/wxpython/core/gcmd.py
   grass/trunk/gui/wxpython/gui_core/forms.py
   grass/trunk/gui/wxpython/gui_core/prompt.py
Log:
wxGUI: another attempt to fix #1496

Modified: grass/trunk/gui/wxpython/core/gcmd.py
===================================================================
--- grass/trunk/gui/wxpython/core/gcmd.py	2011-12-14 15:53:45 UTC (rev 49749)
+++ grass/trunk/gui/wxpython/core/gcmd.py	2011-12-14 17:53:44 UTC (rev 49750)
@@ -635,8 +635,6 @@
     if sys.platform == "win32":
         if prog in globalvar.grassCmd['script']:
             prog += globalvar.EXT_SCT
-        # else:
-        # prog += globalvar.EXT_BIN
     
     ps = grass.start_command(prog, flags, overwrite, quiet, verbose, **kwargs)
     

Modified: grass/trunk/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/forms.py	2011-12-14 15:53:45 UTC (rev 49749)
+++ grass/trunk/gui/wxpython/gui_core/forms.py	2011-12-14 17:53:44 UTC (rev 49750)
@@ -1966,6 +1966,8 @@
         # parse the interface decription
         try:
             global _blackList
+            if sys.platform == "win32" and cmd[0] in globalvar.grassCmd['script']:
+                cmd[0] += globalvar.EXT_SCT
             self.grass_task = gtask.parse_interface(cmd[0],
                                                     blackList = _blackList)
         except (grass.ScriptError, ValueError), e: 

Modified: grass/trunk/gui/wxpython/gui_core/prompt.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/prompt.py	2011-12-14 15:53:45 UTC (rev 49749)
+++ grass/trunk/gui/wxpython/gui_core/prompt.py	2011-12-14 17:53:44 UTC (rev 49750)
@@ -791,7 +791,9 @@
         self.SetCurrentPos(pos)
         
         cmd = text.strip().split(' ')[0]
-
+        if sys.platform == "win32" and cmd in globalvar.grassCmd['script']:
+            cmd += globalvar.EXT_SCT
+        
         if not self.cmdDesc or cmd != self.cmdDesc.get_name():
             if cmd in ('r.mapcalc', 'r3.mapcalc') and \
                     self.parent.parent.GetName() == 'LayerManager':