From 349f31431803574e0b28f4c9ec4b6178906445a1 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Sun, 7 Aug 2016 21:05:27 -0400 Subject: [PATCH] Fix fontdlg test on wxGTK Unfortunately, wx treats FONTFAMILY_MODERN and FONTFAMILY_TELETYPE as the same, and even worse, the underlying MSW and GTK implementations are different. Thus, we need to check for either MODERN or TELETYPE here. --- unittests/test_fontdlg.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/unittests/test_fontdlg.py b/unittests/test_fontdlg.py index e0d41a08..500a9a84 100644 --- a/unittests/test_fontdlg.py +++ b/unittests/test_fontdlg.py @@ -9,8 +9,10 @@ class fontdlg_Tests(wtc.WidgetTestCase): def test_fontdlg1(self): data = wx.FontData() # on Windows wx.FONTFAMILY_TELETYPE will actually use wx.FONTFAMILY_MODERN + # but on GTK wx.FONTFAMILY_MODERN uses wx.FONTFAMILY_TELETYPE data.SetInitialFont(wx.FFont(15, wx.FONTFAMILY_MODERN)) - self.assertEqual(data.InitialFont.Family, wx.FONTFAMILY_MODERN) + self.assertTrue(data.InitialFont.Family == wx.FONTFAMILY_MODERN or + data.InitialFont.Family == wx.FONTFAMILY_TELETYPE) data.SetInitialFont(wx.FFont(15, wx.FONTFAMILY_SWISS)) self.assertEqual(data.InitialFont.Family, wx.FONTFAMILY_SWISS)