Corrections for fonts

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/tools/XRCed/params.py b/wxPython/wx/tools/XRCed/params.py
index d2a2a1e72a15c01c73a5aa100dadc2a7c82f1b5a..2c3e02d278a524850b7a17e34c2f2092a414c812 100644 (file)
--- a/wxPython/wx/tools/XRCed/params.py
+++ b/wxPython/wx/tools/XRCed/params.py
@@ -282,7 +282,7 @@ class ParamFont(PPanel):
                      fontFamiliesWx2Xml.get(font.GetFamily(), "default"),
                      fontStylesWx2Xml.get(font.GetStyle(), "normal"),
                      fontWeightsWx2Xml.get(font.GetWeight(), "normal"),
                      fontFamiliesWx2Xml.get(font.GetFamily(), "default"),
                      fontStylesWx2Xml.get(font.GetStyle(), "normal"),
                      fontWeightsWx2Xml.get(font.GetWeight(), "normal"),

-                     str(font.GetUnderlined()),
+                     str(int(font.GetUnderlined())),

                      font.GetFaceName().encode(),
                      encName
                      ]
                      font.GetFaceName().encode(),
                      encName
                      ]

diff --git a/wxPython/wx/tools/XRCed/xxx.py b/wxPython/wx/tools/XRCed/xxx.py
index bd0c72a08d24aff9fb68ecdedf896a66d37f4418..03bb4f70bc905bca0d1638bf2c09c41b502b94ee 100644 (file)
--- a/wxPython/wx/tools/XRCed/xxx.py
+++ b/wxPython/wx/tools/XRCed/xxx.py
@@ -296,7 +296,7 @@ class xxxObject:
 
 # This is a little special: it is both xxxObject and xxxNode
 class xxxParamFont(xxxObject, xxxNode):
 
 # This is a little special: it is both xxxObject and xxxNode
 class xxxParamFont(xxxObject, xxxNode):

-    allParams = ['size', 'style', 'weight', 'family', 'underlined',
+    allParams = ['size', 'family', 'style', 'weight', 'underlined',

                  'face', 'encoding']
     def __init__(self, parent, element):
         xxxObject.__init__(self, parent, element)
                  'face', 'encoding']
     def __init__(self, parent, element):
         xxxObject.__init__(self, parent, element)