wxGUI: cosmetics in globalvar import

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@36286 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gui_modules/mapdisp.py

@@ -31,13 +31,12 @@ import math
 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:

gui/wxpython/gui_modules/menuform.py

@@ -58,7 +58,6 @@ import copy
 import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
 
-
 import globalvar
 if not os.getenv("GRASS_WXBUNDLED"):
     globalvar.CheckForWx()

gui/wxpython/icons/icon.py

@@ -21,15 +21,14 @@ for details.
 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