[GRASS-SVN] r36286 - in grass/trunk/gui/wxpython: gui_modules icons

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-03-09 11:57:57 -0400 (Mon, 09 Mar 2009)
New Revision: 36286

Modified:
   grass/trunk/gui/wxpython/gui_modules/mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/menuform.py
   grass/trunk/gui/wxpython/icons/icon.py
Log:
wxGUI: cosmetics in globalvar import


Modified: grass/trunk/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2009-03-09 15:47:51 UTC (rev 36285)
+++ grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2009-03-09 15:57:57 UTC (rev 36286)
@@ -31,13 +31,12 @@
 import tempfile
 import copy
 
-import gui_modules.globalvar as globalvar
+import globalvar
 if not os.getenv("GRASS_WXBUNDLED"):
     globalvar.CheckForWx()
 import wx
 import wx.aui
 
-import globalvar
 try:
     import subprocess
 except:

Modified: grass/trunk/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menuform.py	2009-03-09 15:47:51 UTC (rev 36285)
+++ grass/trunk/gui/wxpython/gui_modules/menuform.py	2009-03-09 15:57:57 UTC (rev 36286)
@@ -58,7 +58,6 @@
 import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
 
-
 import globalvar
 if not os.getenv("GRASS_WXBUNDLED"):
     globalvar.CheckForWx()

Modified: grass/trunk/gui/wxpython/icons/icon.py
===================================================================
--- grass/trunk/gui/wxpython/icons/icon.py	2009-03-09 15:47:51 UTC (rev 36285)
+++ grass/trunk/gui/wxpython/icons/icon.py	2009-03-09 15:57:57 UTC (rev 36286)
@@ -21,15 +21,14 @@
 import os
 import sys
 
-import gui_modules.globalvar as globalvar
-if not os.getenv("GRASS_WXBUNDLED"):
-    globalvar.CheckForWx()
-import wx
-
 gmPath = os.path.join(os.getenv("GISBASE"), "etc", "wxpython", "gui_modules")
 sys.path.append(gmPath)
 
 import globalvar
+if not os.getenv("GRASS_WXBUNDLED"):
+    globalvar.CheckForWx()
+import wx
+
 from preferences import globalSettings as UserSettings
 
 import grass_icons # default icon set