浏览代码

wxGUI: fix statusbar prop for wxPython3

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@64150 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 年之前
父节点
当前提交
1fe7b6f0e1
共有 2 个文件被更改,包括 9 次插入3 次删除
  1. 3 2
      gui/wxpython/core/globalvar.py
  2. 6 1
      gui/wxpython/mapdisp/frame.py

+ 3 - 2
gui/wxpython/core/globalvar.py

@@ -41,7 +41,7 @@ except IOError:
 
 
 from grass.script.core import get_commands
 from grass.script.core import get_commands
 
 
-def CheckWxVersion(version = [2, 8, 11, 0]):
+def CheckWxVersion(version):
     """Check wx version"""
     """Check wx version"""
     ver = wx.version().split(' ')[0]
     ver = wx.version().split(' ')[0]
     if map(int, ver.split('.')) < version:
     if map(int, ver.split('.')) < version:
@@ -206,7 +206,8 @@ UpdateGRASSAddOnCommands()
 toolbarSize = (24, 24)
 toolbarSize = (24, 24)
 
 
 """@Check version of wxPython, use agwStyle for 2.8.11+"""
 """@Check version of wxPython, use agwStyle for 2.8.11+"""
-hasAgw = CheckWxVersion()
+hasAgw = CheckWxVersion([2, 8, 11, 0])
+wxPython3 = CheckWxVersion([3, 0, 0, 0])
 
 
 """@Add GUIDIR/scripts into path"""
 """@Add GUIDIR/scripts into path"""
 os.environ['PATH'] = os.path.join(GUIDIR, 'scripts') + os.pathsep + os.environ['PATH']
 os.environ['PATH'] = os.path.join(GUIDIR, 'scripts') + os.pathsep + os.environ['PATH']

+ 6 - 1
gui/wxpython/mapdisp/frame.py

@@ -231,7 +231,12 @@ class MapFrame(SingleMapFrame):
         
         
         # create statusbar and its manager
         # create statusbar and its manager
         statusbar = self.CreateStatusBar(number = 4, style = 0)
         statusbar = self.CreateStatusBar(number = 4, style = 0)
-        statusbar.SetStatusWidths([-5, -2, -1, -1])
+        if globalvar.wxPython3:
+            statusbar.SetMinHeight(24)
+            prop = [-6, -2, -1, -2]
+        else:
+            prop = [-5, -2, -1, -1]
+        statusbar.SetStatusWidths(prop)
         self.statusbarManager = sb.SbManager(mapframe = self, statusbar = statusbar)
         self.statusbarManager = sb.SbManager(mapframe = self, statusbar = statusbar)
         
         
         # fill statusbar manager
         # fill statusbar manager