r13994 - /branches/gui_testing/gui/fonts.py -- July 29, 2011 - 15:02

Author: bugman
Date: Fri Jul 29 15:02:54 2011
New Revision: 13994

URL: http://svn.gna.org/viewcvs/relax?rev=13994&view=rev
Log:
Updates to the fonts, and the addition of normal_italic.


Modified:
    branches/gui_testing/gui/fonts.py

Modified: branches/gui_testing/gui/fonts.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/fonts.py?rev=13994&r1=13993&r2=13994&view=diff
==============================================================================
--- branches/gui_testing/gui/fonts.py (original)
+++ branches/gui_testing/gui/fonts.py Fri Jul 29 15:02:54 2011
@@ -34,18 +34,19 @@
         """To be called by the main wx app, so that the fonts can be 
initialised correctly."""
 
         # The fonts.
-        self.smaller =     wx.Font(6,  wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, 
"Sans")
-        self.small =       wx.Font(8,  wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, 
"Sans")
-        self.button =      wx.Font(8,  wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, 
"Sans")
-        self.normal =      wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, 
"Sans")
-        self.normal_bold = wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.BOLD,   0, 
"Sans")
-        self.subtitle =    wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.BOLD,   0, 
"Sans")
-        self.font_14 =     wx.Font(14, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, 
"Sans")
-        self.title =       wx.Font(16, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, 
"Sans")
+        self.smaller =              wx.Font(6,  wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
+        self.small =                wx.Font(8,  wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
+        self.button =               wx.Font(8,  wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
+        self.normal =               wx.Font(10, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
+        self.normal_bold =          wx.Font(10, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,   0, "Sans")
+        self.normal_italic =        wx.Font(10, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_ITALIC, wx.FONTWEIGHT_NORMAL, 0, "Sans")
+        self.subtitle =             wx.Font(12, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,   0, "Sans")
+        self.font_14 =              wx.Font(14, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
+        self.title =                wx.Font(16, wx.FONTFAMILY_DEFAULT, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0, "Sans")
 
         # Modern fixed-width fonts.
-        self.modern_8 = wx.Font(8, wx.MODERN, wx.NORMAL, wx.NORMAL, 0)
-        self.modern_10 = wx.Font(10, wx.MODERN, wx.NORMAL, wx.NORMAL, 0)
+        self.modern_8 =             wx.Font(8,  wx.FONTFAMILY_MODERN, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0)
+        self.modern_10 =            wx.Font(10, wx.FONTFAMILY_MODERN, 
wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, 0)