[GRASS-SVN] r36292 - in grass/branches/develbranch_6/gui/wxpython: . gui_modules icons

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-03-09 13:12:16 -0400 (Mon, 09 Mar 2009)
New Revision: 36292

Modified:
   grass/branches/develbranch_6/gui/wxpython/gis_set.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/dbm.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
   grass/branches/develbranch_6/gui/wxpython/icons/icon.py
   grass/branches/develbranch_6/gui/wxpython/wxgui.py
Log:
wxversion doesn't work with bundled wxpython cont'ed
         (merge from trunk, r36285)


Modified: grass/branches/develbranch_6/gui/wxpython/gis_set.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gis_set.py	2009-03-09 16:44:18 UTC (rev 36291)
+++ grass/branches/develbranch_6/gui/wxpython/gis_set.py	2009-03-09 17:12:16 UTC (rev 36292)
@@ -31,7 +31,8 @@
 import gettext
 
 from gui_modules import globalvar
-globalvar.CheckForWx()
+if not os.getenv("GRASS_WXBUNDLED"):
+    globalvar.CheckForWx()
 
 import wx
 import wx.html

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/dbm.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/dbm.py	2009-03-09 16:44:18 UTC (rev 36291)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/dbm.py	2009-03-09 17:12:16 UTC (rev 36292)
@@ -42,7 +42,8 @@
 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

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py	2009-03-09 16:44:18 UTC (rev 36291)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/mapdisp.py	2009-03-09 17:12:16 UTC (rev 36292)
@@ -31,12 +31,12 @@
 import tempfile
 import copy
 
-import gui_modules.globalvar as globalvar
-globalvar.CheckForWx()
+import globalvar
+if not os.getenv("GRASS_WXBUNDLED"):
+    globalvar.CheckForWx()
 import wx
 import wx.aui
 
-import globalvar
 try:
     import subprocess
 except:

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py	2009-03-09 16:44:18 UTC (rev 36291)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/menuform.py	2009-03-09 17:12:16 UTC (rev 36292)
@@ -58,9 +58,9 @@
 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.flatnotebook as FN

Modified: grass/branches/develbranch_6/gui/wxpython/icons/icon.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2009-03-09 16:44:18 UTC (rev 36291)
+++ grass/branches/develbranch_6/gui/wxpython/icons/icon.py	2009-03-09 17:12:16 UTC (rev 36292)
@@ -21,14 +21,14 @@
 import os
 import sys
 
-import gui_modules.globalvar as globalvar
-globalvar.CheckForWx()
-import wx
-
 gmPath = os.path.join(os.getenv("GISBASE"), "etc", "wxpython", "gui_modules")
 sys.path.append(gmPath)
 
 import globalvar
+if not os.getenv("GRASS_WXBUNDLED"):
+    globalvar.CheckForWx()
+import wx
+
 from preferences import globalSettings as UserSettings
 
 import grass_icons # default icon set

Modified: grass/branches/develbranch_6/gui/wxpython/wxgui.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/wxgui.py	2009-03-09 16:44:18 UTC (rev 36291)
+++ grass/branches/develbranch_6/gui/wxpython/wxgui.py	2009-03-09 17:12:16 UTC (rev 36292)
@@ -52,7 +52,8 @@
 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