[GRASS-SVN] r46044 - grass/trunk/gui/wxpython

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-04-19 13:36:21 -0700 (Tue, 19 Apr 2011)
New Revision: 46044

Modified:
   grass/trunk/gui/wxpython/gis_set.py
   grass/trunk/gui/wxpython/gis_set_error.py
Log:
wxGUI: remove redundant call of CheckForWx()


Modified: grass/trunk/gui/wxpython/gis_set.py
===================================================================
--- grass/trunk/gui/wxpython/gis_set.py	2011-04-19 20:19:57 UTC (rev 46043)
+++ grass/trunk/gui/wxpython/gis_set.py	2011-04-19 20:36:21 UTC (rev 46044)
@@ -33,13 +33,6 @@
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
 
 from gui_modules import globalvar
-if not os.getenv("GRASS_WXBUNDLED"):
-    globalvar.CheckForWx()
-
-from gui_modules import goutput
-from gui_modules.ghelp import HelpFrame
-from gui_modules.gcmd  import GMessage
-
 import wx
 import wx.html
 import wx.lib.rcsizer as rcs
@@ -47,6 +40,10 @@
 import wx.lib.mixins.listctrl as listmix
 import wx.lib.scrolledpanel as scrolled
 
+from gui_modules import goutput
+from gui_modules.ghelp import HelpFrame
+from gui_modules.gcmd  import GMessage
+
 sys.stderr = codecs.getwriter('utf8')(sys.stderr)
 
 class GRASSStartup(wx.Frame):

Modified: grass/trunk/gui/wxpython/gis_set_error.py
===================================================================
--- grass/trunk/gui/wxpython/gis_set_error.py	2011-04-19 20:19:57 UTC (rev 46043)
+++ grass/trunk/gui/wxpython/gis_set_error.py	2011-04-19 20:36:21 UTC (rev 46044)
@@ -15,8 +15,6 @@
 import sys
 
 import gui_modules.globalvar as globalvar
-if not os.getenv("GRASS_WXBUNDLED"):
-    globalvar.CheckForWx()
 import wx
 
 def main():