Merge recent wxPython changes from 2.8 branch to HEAD

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-06-23 20:50:39 +00:00
parent e31f4da5f0
commit fe45b493dc
50 changed files with 7989 additions and 2997 deletions

View File

@@ -304,7 +304,7 @@ class ParamFont(PPanel):
except KeyError: error = True; wx.LogError('Invalid style specification')
try: weight = fontWeightsXml2wx[self.value[3]]
except KeyError: error = True; wx.LogError('Invalid weight specification')
try: underlined = bool(self.value[4])
try: underlined = bool(int(self.value[4]))
except ValueError: error = True; wx.LogError('Invalid underlined flag specification')
face = self.value[5]
except IndexError: