[GRASS-SVN] r36271 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-03-09 04:51:53 -0400 (Mon, 09 Mar 2009)
New Revision: 36271

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py
Log:
wxversion doesn't work with bundled wxpython
	  (merge from trunk, r36268)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py	2009-03-09 08:51:31 UTC (rev 36270)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/globalvar.py	2009-03-09 08:51:53 UTC (rev 36271)
@@ -51,7 +51,8 @@
 
     check = False
 
-CheckForWx()
+if not os.getenv("GRASS_WXBUNDLED"):
+    CheckForWx()
 import wx
 import wx.lib.flatnotebook as FN