[GRASS-SVN] r61912 - in grass/branches/releasebranch_7_0: . gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-09-13 12:54:37 -0700 (Sat, 13 Sep 2014)
New Revision: 61912

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/preferences.py
Log:
wxGUI/preferences: fix font dialog on Windows (merge from trunk, r61808)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60289,60696,61269,61380,61420,61422,61480,61500,61764,61891,61905,61907
   + /grass/trunk:60289,60696,61269,61380,61420,61422,61480,61500,61764,61808,61891,61905,61907

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/preferences.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/preferences.py	2014-09-13 19:50:23 UTC (rev 61911)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/preferences.py	2014-09-13 19:54:37 UTC (rev 61912)
@@ -1467,9 +1467,9 @@
         if size == None or size == 0: size = 11
         size = float(size)
         if type == None or type == '': type = 'Courier'
-        
-        outfont = wx.Font(size, wx.FONTFAMILY_MODERN, wx.NORMAL, 0, faceName = type)
-        
+
+        outfont = wx.Font(size, wx.FONTFAMILY_MODERN, wx.NORMAL, wx.FONTWEIGHT_NORMAL, faceName=type)
+
         fontdata = wx.FontData()
         fontdata.EnableEffects(True)
         fontdata.SetColour('black')