Merge branch 'master' into wx3

Used code from the master on conflicts
2014-12-15 15:45:33 +03:00
parent 3c1bf22e87 1b3c058eab
commit e8268633e3
14 changed files with 134 additions and 252 deletions
--- a/gui/utils/fonts.py
+++ b/gui/utils/fonts.py
@@ -5,11 +5,9 @@ different wxPython versions

 import wx

-if 'wxMSW' in wx.PlatformInfo and wx.VERSION < (2,9):
-    SMALL  = (0,12)
-    NORMAL = (0,14)
-    BIG    = (0,15)
+if 'wxMac' in wx.PlatformInfo:
+    sizes = (10, 11, 12)
 else:
-    SMALL  = (0,10)
-    NORMAL = (0,11)
-    BIG    = (0,12)
+    sizes = (7, 8, 9)
+
+SMALL, NORMAL, BIG = sizes