瀏覽代碼

wxGUI: remove redundant call of CheckForWx()

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@46044 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 14 年之前
父節點
當前提交
a820a29cf9
共有 2 個文件被更改,包括 4 次插入9 次删除
  1. 4 7
      gui/wxpython/gis_set.py
  2. 0 2
      gui/wxpython/gis_set_error.py

+ 4 - 7
gui/wxpython/gis_set.py

@@ -33,13 +33,6 @@ import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
 
 
 from gui_modules import globalvar
 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
 import wx.html
 import wx.html
 import wx.lib.rcsizer as rcs
 import wx.lib.rcsizer as rcs
@@ -47,6 +40,10 @@ import wx.lib.filebrowsebutton as filebrowse
 import wx.lib.mixins.listctrl as listmix
 import wx.lib.mixins.listctrl as listmix
 import wx.lib.scrolledpanel as scrolled
 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)
 sys.stderr = codecs.getwriter('utf8')(sys.stderr)
 
 
 class GRASSStartup(wx.Frame):
 class GRASSStartup(wx.Frame):

+ 0 - 2
gui/wxpython/gis_set_error.py

@@ -15,8 +15,6 @@ import os
 import sys
 import sys
 
 
 import gui_modules.globalvar as globalvar
 import gui_modules.globalvar as globalvar
-if not os.getenv("GRASS_WXBUNDLED"):
-    globalvar.CheckForWx()
 import wx
 import wx
 
 
 def main():
 def main():