[GRASS-SVN] r49758 - grass/trunk/gui/wxpython/gmodeler

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-14 15:31:17 -0800 (Wed, 14 Dec 2011)
New Revision: 49758

Modified:
   grass/trunk/gui/wxpython/gmodeler/model.py
Log:
wxGUI/modeler: minor fixes (import)
	       (merge r49757 from devbr6)


Modified: grass/trunk/gui/wxpython/gmodeler/model.py
===================================================================
--- grass/trunk/gui/wxpython/gmodeler/model.py	2011-12-14 23:28:21 UTC (rev 49757)
+++ grass/trunk/gui/wxpython/gmodeler/model.py	2011-12-14 23:31:17 UTC (rev 49758)
@@ -39,11 +39,12 @@
 import wx
 from wx.lib import ogl
 
-from core.globalvar      import ETCWXDIR
+from core                import globalvar
 from core                import utils
 from core.gcmd           import GMessage, GException, GError, RunCommand, EncodeString, GWarning
 from core.settings       import UserSettings
-from gui_core.forms      import GUI
+from gui_core.forms      import GUI, CmdPanel
+from gui_core.widgets    import GNotebook
 
 from grass.script import core as grass
 from grass.script import task as gtask
@@ -224,7 +225,7 @@
         
         Raise exception on error.
         """
-        dtdFilename = os.path.join(ETCWXDIR, "xml", "grass-gxm.dtd")
+        dtdFilename = os.path.join(globalvar.ETCWXDIR, "xml", "grass-gxm.dtd")
         
         # parse workspace file
         try: