Преглед на файлове

wxGUI: fix statusbar prop for wxPython3
(merge https://trac.osgeo.org/grass/changeset/64150,64152 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@64162 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa преди 10 години
родител
ревизия
284b92aed1
променени са 2 файла, в които са добавени 5 реда и са изтрити 2 реда
  1. 3 2
      gui/wxpython/core/globalvar.py
  2. 2 0
      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
 
-def CheckWxVersion(version = [2, 8, 11, 0]):
+def CheckWxVersion(version):
     """Check wx version"""
     ver = wx.version().split(' ')[0]
     if map(int, ver.split('.')) < version:
@@ -202,7 +202,8 @@ UpdateGRASSAddOnCommands()
 toolbarSize = (24, 24)
 
 """@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"""
 os.environ['PATH'] = os.path.join(GUIDIR, 'scripts') + os.pathsep + os.environ['PATH']

+ 2 - 0
gui/wxpython/mapdisp/frame.py

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