[GRASS-SVN] r64151 - in grass/trunk: gui/wxpython/core lib/init

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-01-13 16:12:14 -0800 (Tue, 13 Jan 2015)
New Revision: 64151

Modified:
   grass/trunk/gui/wxpython/core/globalvar.py
   grass/trunk/lib/init/variables.html
Log:
introduce GRASS_WXVERSION variable

Modified: grass/trunk/gui/wxpython/core/globalvar.py
===================================================================
--- grass/trunk/gui/wxpython/core/globalvar.py	2015-01-13 23:22:35 UTC (rev 64150)
+++ grass/trunk/gui/wxpython/core/globalvar.py	2015-01-14 00:12:14 UTC (rev 64151)
@@ -49,7 +49,7 @@
 
     return True
 
-def CheckForWx(forceVersion = None):
+def CheckForWx(forceVersion = os.getenv('GRASS_WXVERSION', None)):
     """Try to import wx module and check its version
 
     :param forceVersion: force wxPython version, eg. '2.8'

Modified: grass/trunk/lib/init/variables.html
===================================================================
--- grass/trunk/lib/init/variables.html	2015-01-13 23:22:35 UTC (rev 64150)
+++ grass/trunk/lib/init/variables.html	2015-01-14 00:12:14 UTC (rev 64151)
@@ -288,7 +288,16 @@
     When set, the wxGUI will not check the wxPython version, as this
     function is incompatible with a bundled wxPython.  It is up to the
     packager to make sure that a compatible wxPython version is bundled.</dd>
-  
+
+  <dt>GRASS_WXVERSION</dt>
+  <dd>[wxGUI]<br>
+    
+    set to tell wxGUI which version of wxPython to use.<br>
+
+    When set, the wxGUI will select the given wxPython version. It's
+    useful when multiple versions of wxPython are installed and the
+    user wants to run wxGUI with non-default wxPython version.</dd>
+
   <dt>GRASS_XTERM</dt>
   <dd>[lib/init/grass-xterm-wrapper, lib/init/grass-xterm-mac]<br>
     set to any value (e.g. rxvt, aterm, gnome-terminal, konsole) to