wxversion doesn't work with bundled wxpython cont'ed

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

gui/wxpython/gis_set.py

@@ -31,7 +31,8 @@ import platform
 import gettext
 
 from gui_modules import globalvar
-globalvar.CheckForWx()
+if not os.getenv("GRASS_WXBUNDLED"):
+    globalvar.CheckForWx()
 
 import wx
 import wx.html

gui/wxpython/gui_modules/dbm.py

@@ -42,7 +42,8 @@ import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
 
 import globalvar
-globalvar.CheckForWx()
+if not os.getenv("GRASS_WXBUNDLED"):
+    globalvar.CheckForWx()
 
 import wx
 import wx.lib.mixins.listctrl as listmix

gui/wxpython/gui_modules/mapdisp.py

@@ -32,7 +32,8 @@ import tempfile
 import copy
 
 import gui_modules.globalvar as globalvar
-globalvar.CheckForWx()
+if not os.getenv("GRASS_WXBUNDLED"):
+    globalvar.CheckForWx()
 import wx
 import wx.aui
 

gui/wxpython/gui_modules/menuform.py

@@ -60,7 +60,8 @@ gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unico
 
 
 import globalvar
-globalvar.CheckForWx()
+if not os.getenv("GRASS_WXBUNDLED"):
+    globalvar.CheckForWx()
 
 import wx
 import wx.lib.flatnotebook as FN

gui/wxpython/icons/icon.py

@@ -22,7 +22,8 @@ import os
 import sys
 
 import gui_modules.globalvar as globalvar
-globalvar.CheckForWx()
+if not os.getenv("GRASS_WXBUNDLED"):
+    globalvar.CheckForWx()
 import wx
 
 gmPath = os.path.join(os.getenv("GISBASE"), "etc", "wxpython", "gui_modules")

gui/wxpython/wxgui.py

@@ -52,7 +52,8 @@ gmpath = icons.__path__[0]
 sys.path.append(gmpath)
 
 import gui_modules.globalvar as globalvar
-globalvar.CheckForWx()
+if not os.getenv("GRASS_WXBUNDLED"):
+    globalvar.CheckForWx()
 
 import wx
 import wx.aui