[GRASS-SVN] r49625 - in grass/branches/develbranch_6: gui/wxpython/gui_core lib/gis

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-08 05:15:20 -0800 (Thu, 08 Dec 2011)
New Revision: 49625

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_core/forms.py
   grass/branches/develbranch_6/lib/gis/parser.c
Log:
wxGUI major code reorganization (part4) - fix parser


Modified: grass/branches/develbranch_6/gui/wxpython/gui_core/forms.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_core/forms.py	2011-12-08 13:12:21 UTC (rev 49624)
+++ grass/branches/develbranch_6/gui/wxpython/gui_core/forms.py	2011-12-08 13:15:20 UTC (rev 49625)
@@ -61,7 +61,7 @@
     gisbase = os.path.join(os.path.dirname(sys.argv[0]), os.path.pardir)
     wxbase = gisbase
 else:
-    wxbase = os.path.join(gisbase, 'etc', 'gui', 'wxpython')
+    wxbase = os.path.join(gisbase, 'etc', 'wxpython')
 
 sys.path.append(wxbase)
 
@@ -778,7 +778,8 @@
         # are we running from command line?
         ### add 'command output' tab regardless standalone dialog
         if self.parent.GetName() ==  "MainFrame" and self.parent.get_dcmd is None:
-            self.goutput = goutput.GMConsole(parent = self, margin = False)
+            from gui_core.goutput import GMConsole
+            self.goutput = GMConsole(parent = self, margin = False)
             self.outpage = self.notebook.AddPage(page = self.goutput, text = _("Command output"), name = 'output')
         else:
             self.goutput = None

Modified: grass/branches/develbranch_6/lib/gis/parser.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/parser.c	2011-12-08 13:12:21 UTC (rev 49624)
+++ grass/branches/develbranch_6/lib/gis/parser.c	2011-12-08 13:15:20 UTC (rev 49625)
@@ -2014,7 +2014,7 @@
     if (!pgm_name)
 	G_fatal_error(_("Unable to determine program name"));
 
-    sprintf(script, "%s/etc/wxpython/gui_modules/menuform.py",
+    sprintf(script, "%s/etc/wxpython/gui_core/forms.py",
 	    getenv("GISBASE"));
     G_spawn(getenv("GRASS_PYTHON"), getenv("GRASS_PYTHON"), script, G_recreate_command(), NULL);
 }