소스 검색

fix https://trac.osgeo.org/grass/changeset/42549 (agwStyle available in wxPython 2.8.11+)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42554 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 15 년 전
부모
커밋
b27d5bcfd2
4개의 변경된 파일13개의 추가작업 그리고 7개의 파일을 삭제
  1. 8 0
      gui/wxpython/gui_modules/globalvar.py
  2. 3 3
      gui/wxpython/gui_modules/layertree.py
  3. 1 2
      gui/wxpython/gui_modules/menuform.py
  4. 1 2
      gui/wxpython/wxgui.py

+ 8 - 0
gui/wxpython/gui_modules/globalvar.py

@@ -33,6 +33,14 @@ import grass.script as grass
 # wxversion.select() called once at the beginning
 check = True
 
+def CheckWxVersion(version = [2, 8, 11, 0]):
+    """!Check wx version"""
+    ver = wx.version().split(' ')[0]
+    if map(int, ver.split('.')) < version:
+        return False
+    
+    return True
+
 def CheckForWx():
     """!Try to import wx module and check its version"""
     global check

+ 3 - 3
gui/wxpython/gui_modules/layertree.py

@@ -25,18 +25,18 @@ import string
 import wx
 try:
     import wx.lib.agw.customtreectrl as CT
-    hasAgw = True
 except ImportError:
     import wx.lib.customtreectrl as CT
-    hasAgw = False
 import wx.combo
 import wx.lib.newevent
 import wx.lib.buttons  as  buttons
 
+import globalvar
+hasAgw = globalvar.CheckWxVersion()
+
 from grass.script import core as grass
 
 import gdialogs
-import globalvar
 import menuform
 import toolbars
 import mapdisp

+ 1 - 2
gui/wxpython/gui_modules/menuform.py

@@ -71,10 +71,9 @@ import wx
 import wx.html
 try:
     import wx.lib.agw.flatnotebook as FN
-    hasAgw = True
 except ImportError:
     import wx.lib.flatnotebook as FN
-    hasAgw = False
+hasAgw = globalvar.CheckWxVersion()
 import wx.lib.colourselect as csel
 import wx.lib.filebrowsebutton as filebrowse
 from wx.lib.expando import ExpandoTextCtrl, EVT_ETC_LAYOUT_NEEDED

+ 1 - 2
gui/wxpython/wxgui.py

@@ -53,11 +53,10 @@ import wx.stc
 try:
     import wx.lib.agw.customtreectrl as CT
     import wx.lib.agw.flatnotebook   as FN
-    hasAgw = True
 except ImportError:
     import wx.lib.customtreectrl as CT
     import wx.lib.flatnotebook   as FN
-    hasAgw = False
+hasAgw = globalvar.CheckWxVersion()
 
 sys.path.append(os.path.join(globalvar.ETCDIR, "python"))
 from grass.script import core as grass