wxGUI: fix check for mininal wxPython version

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

gui/wxpython/gis_set.py

@@ -36,7 +36,7 @@ from gui_modules import globalvar
 if not os.getenv("GRASS_WXBUNDLED"):
     globalvar.CheckForWx()
 
-import gui_modules.goutput
+from gui_modules import goutput
 from gui_modules.ghelp import HelpFrame
 from gui_modules.gcmd  import GMessage
 

gui/wxpython/gui_modules/dbm.py

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

gui/wxpython/gui_modules/dbm_dialogs.py

@@ -19,9 +19,6 @@ for details.
 import os
 
 import globalvar
-if not os.getenv("GRASS_WXBUNDLED"):
-    globalvar.CheckForWx()
-
 import wx
 import wx.lib.scrolledpanel as scrolled
 

gui/wxpython/gui_modules/gcpmapdisp.py

@@ -26,8 +26,6 @@ import copy
 import platform
 
 import globalvar
-if not os.getenv("GRASS_WXBUNDLED"):
-    globalvar.CheckForWx()
 import wx
 import wx.aui
 

gui/wxpython/gui_modules/globalvar.py

@@ -49,16 +49,17 @@ def CheckForWx():
     global check
     if not check:
         return
-    
     minVersion = [2, 8, 1, 1]
     try:
         try:
             import wxversion
         except ImportError, e:
             raise ImportError(e)
-        wxversion.select(str(minVersion[0]) + '.' + str(minVersion[1]))
+        # wxversion.select(str(minVersion[0]) + '.' + str(minVersion[1]))
+        wxversion.ensureMinimal(str(minVersion[0]) + '.' + str(minVersion[1]))
         import wx
         version = wx.version().split(' ')[0]
+        
         if map(int, version.split('.')) < minVersion:
             raise ValueError('Your wxPython version is %s.%s.%s.%s' % tuple(version.split('.')))
 

gui/wxpython/gui_modules/gmodeler.py

@@ -56,8 +56,6 @@ except ImportError:
     import elementtree.ElementTree as etree # Python <= 2.4
 
 import globalvar
-if not os.getenv("GRASS_WXBUNDLED"):
-    globalvar.CheckForWx()
 import wx
 import wx.lib.ogl             as ogl
 import wx.lib.flatnotebook    as FN

gui/wxpython/gui_modules/mapdisp.py

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

gui/wxpython/gui_modules/menuform.py

@@ -63,9 +63,6 @@ import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
 
 import globalvar
-if not os.getenv("GRASS_WXBUNDLED"):
-    globalvar.CheckForWx()
-
 import wx
 import wx.html
 try:

gui/wxpython/gui_modules/sqlbuilder.py

@@ -33,9 +33,6 @@ import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
 
 import globalvar
-if not os.getenv("GRASS_WXBUNDLED"):
-    globalvar.CheckForWx()
-
 import wx
 
 import grass.script as grass

gui/wxpython/icons/grass_icons.py

@@ -7,7 +7,7 @@ __author__ = "Robert Szczepanek"
 
 import os
 
-import globalvar
+from gui_modules import globalvar
 
 iconPath = os.path.join(globalvar.ETCDIR, "gui", "icons", "grass")
 

gui/wxpython/icons/icon.py

@@ -23,12 +23,9 @@ import sys
 
 sys.path.append(os.path.join(os.getenv("GISBASE"), "etc", "wxpython", "gui_modules"))
 
-import globalvar
-if not os.getenv("GRASS_WXBUNDLED"):
-    globalvar.CheckForWx()
 import wx
 
-from preferences import globalSettings as UserSettings
+from gui_modules.preferences import globalSettings as UserSettings
 
 # default icon set
 import grass_icons

gui/wxpython/scripts/vkrige.py

@@ -37,8 +37,6 @@ GUIModulesPath = os.path.join(os.getenv("GISBASE"), "etc", "gui", "wxpython", "g
 sys.path.append(GUIModulesPath)
 
 import globalvar
-if not os.getenv("GRASS_WXBUNDLED"):
-    globalvar.CheckForWx()
 import gselect
 import goutput
 import menuform

gui/wxpython/wxgui.py

@@ -28,7 +28,7 @@ import platform
 import signal
 import tempfile
 
-### XML 
+### XML
 try:
     import xml.etree.ElementTree as etree
 except ImportError:
@@ -38,13 +38,7 @@ except ImportError:
 import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
 
-import gui_modules
-sys.path.append(gui_modules.__path__[0])
-
-import gui_modules.globalvar as globalvar
-if not os.getenv("GRASS_WXBUNDLED"):
-    globalvar.CheckForWx()
-
+from gui_modules import globalvar
 import wx
 import wx.aui
 import wx.combo
@@ -65,33 +59,31 @@ except ImportError:
 sys.path.append(os.path.join(globalvar.ETCDIR, "python"))
 from grass.script import core as grass
 
-import gui_modules.utils as utils
-import gui_modules.preferences as preferences
-import gui_modules.layertree as layertree
-import gui_modules.mapdisp as mapdisp
-import gui_modules.menudata as menudata
-import gui_modules.menuform as menuform
-import gui_modules.histogram as histogram
-import gui_modules.profile as profile
-import gui_modules.mcalc_builder as mapcalculator
-import gui_modules.gcmd as gcmd
-import gui_modules.dbm as dbm
-import gui_modules.workspace as workspace
-import gui_modules.goutput as goutput
-import gui_modules.gdialogs as gdialogs
-import gui_modules.colorrules as colorrules
-import gui_modules.ogc_services as ogc_services
-import gui_modules.prompt as prompt
-import gui_modules.menu as menu
-import gui_modules.gmodeler as gmodeler
-import gui_modules.vclean as vclean
-import gui_modules.nviz_tools as nviz_tools
-from   gui_modules.debug import Debug
-from   gui_modules.ghelp import MenuTreeWindow
-from   gui_modules.ghelp import AboutWindow
-from   gui_modules.ghelp import InstallExtensionWindow
-from   gui_modules.toolbars import LayerManagerToolbar
-from   icons.icon import Icons
+from gui_modules import utils
+from gui_modules import preferences
+from gui_modules import layertree
+from gui_modules import mapdisp
+from gui_modules import menudata
+from gui_modules import menuform
+from gui_modules import histogram
+from gui_modules import profile
+from gui_modules import mcalc_builder as mapcalculator
+from gui_modules import gcmd
+from gui_modules import dbm
+from gui_modules import workspace
+from gui_modules import goutput
+from gui_modules import gdialogs
+from gui_modules import colorrules
+from gui_modules import ogc_services
+from gui_modules import prompt
+from gui_modules import menu
+from gui_modules import gmodeler
+from gui_modules import vclean
+from gui_modules import nviz_tools
+from gui_modules.debug import Debug
+from gui_modules.ghelp import MenuTreeWindow, AboutWindow, InstallExtensionWindow
+from gui_modules.toolbars import LayerManagerToolbar
+from icons.icon import Icons
 
 UserSettings = preferences.globalSettings