diff --git a/unittests/test_auiframemanager.py b/unittests/test_auiframemanager.py index 4993e6b4..b059be48 100644 --- a/unittests/test_auiframemanager.py +++ b/unittests/test_auiframemanager.py @@ -98,10 +98,6 @@ class auiframemanager_Tests(wtc.WidgetTestCase): obj = wx.aui.AuiDockUIPart() - def test_auiframemanager10(self): - obj = wx.aui.AuiPaneButton() - - #--------------------------------------------------------------------------- if __name__ == '__main__': diff --git a/unittests/test_event.py b/unittests/test_event.py index d5335aa5..3f343cd2 100644 --- a/unittests/test_event.py +++ b/unittests/test_event.py @@ -116,9 +116,6 @@ class Events(wtc.WidgetTestCase): def test_NotifyEvent_ctor(self): evt = wx.NotifyEvent() - def test_PaintEvent_ctor(self): - evt = wx.PaintEvent() - def test_PaletteChangedEvent_ctor(self): evt = wx.PaletteChangedEvent() diff --git a/unittests/test_htmlprint.py b/unittests/test_htmlprint.py index 25bc9fef..4c0b40d4 100644 --- a/unittests/test_htmlprint.py +++ b/unittests/test_htmlprint.py @@ -17,7 +17,7 @@ class htmlprint_Tests(wtc.WidgetTestCase): obj.SetSize(*size) obj.SetHtmlText('

Hello World

') - obj.Render(0,0, []) + obj.Render(0,0) def test_htmlprint2(self): diff --git a/unittests/test_listctrl.py b/unittests/test_listctrl.py index 25adabb8..c8c2d39a 100644 --- a/unittests/test_listctrl.py +++ b/unittests/test_listctrl.py @@ -124,18 +124,12 @@ class listctrl_Tests(wtc.WidgetTestCase): wx.LIST_STATE_FOCUSED wx.LIST_STATE_SELECTED wx.LIST_STATE_CUT - wx.LIST_STATE_DISABLED - wx.LIST_STATE_FILTERED - wx.LIST_STATE_INUSE - wx.LIST_STATE_PICKED - wx.LIST_STATE_SOURCE wx.LIST_HITTEST_ABOVE wx.LIST_HITTEST_BELOW wx.LIST_HITTEST_NOWHERE wx.LIST_HITTEST_ONITEMICON wx.LIST_HITTEST_ONITEMLABEL - wx.LIST_HITTEST_ONITEMRIGHT wx.LIST_HITTEST_ONITEMSTATEICON wx.LIST_HITTEST_TOLEFT wx.LIST_HITTEST_TORIGHT diff --git a/unittests/test_propgrideditors.py b/unittests/test_propgrideditors.py index 4946a8a3..36be5e64 100644 --- a/unittests/test_propgrideditors.py +++ b/unittests/test_propgrideditors.py @@ -9,12 +9,13 @@ class propgrideditors_Tests(wtc.WidgetTestCase): def test_propgrideditors01(self): - wl = pg.PGWindowList() - assert wl.m_primary is None - assert wl.m_secondary is None - wl = pg.PGWindowList(self.frame) - assert wl.m_primary is self.frame + assert wl.GetPrimary() is self.frame + assert wl.GetSecondary() is None + + wl = pg.PGWindowList(self.frame, None) + assert wl.GetPrimary() is self.frame + assert wl.GetSecondary() is None def test_propgrideditors02(self): diff --git a/unittests/test_propgridproperty.py b/unittests/test_propgridproperty.py index 4a60a4b5..83f94bde 100644 --- a/unittests/test_propgridproperty.py +++ b/unittests/test_propgridproperty.py @@ -15,12 +15,6 @@ class property_Tests(wtc.WidgetTestCase): d.m_drawnHeight - def test_propgridproperty02(self): - pg.PG_CUSTOM_IMAGE_SPACINGY - pg.PG_CAPRECTXMARGIN - pg.PG_CAPRECTYMARGIN - - def test_propgridproperty03(self): with self.assertRaises(TypeError): # it's an abstract class, so it can't be instantiated diff --git a/unittests/test_sizer.py b/unittests/test_sizer.py index af432fe5..29d1c60c 100644 --- a/unittests/test_sizer.py +++ b/unittests/test_sizer.py @@ -56,7 +56,7 @@ class sizer_Tests(wtc.WidgetTestCase): def test_sizerFlags(self): bs = wx.BoxSizer() bs.Add(wx.Panel(self.frame), - wx.SizerFlags(2).Border(wx.ALL, 5).Align(wx.ALIGN_RIGHT)) + wx.SizerFlags(2).Border(wx.ALL, 5).Align(wx.ALIGN_TOP)) def test_sizerAddMany(self): bs = wx.BoxSizer() diff --git a/unittests/test_uiaction.py b/unittests/test_uiaction.py index 0fa79ca1..f5584e99 100644 --- a/unittests/test_uiaction.py +++ b/unittests/test_uiaction.py @@ -186,7 +186,7 @@ class uiaction_KeyboardTests(wtc.WidgetTestCase): @unittest.skipIf(sys.platform == 'darwin', 'wx.UIActionSimulator.Text needs work...') def test_uiactionKeyboardText(self): uia = wx.UIActionSimulator() - uia.Text("This is a test") + uia.Text(b"This is a test") self.waitFor(WAIT*2) self.assertEqual(self.tc.GetValue(), "This is a test") diff --git a/wx/lib/agw/fmcustomizedlg.py b/wx/lib/agw/fmcustomizedlg.py index c4078529..db9ad439 100644 --- a/wx/lib/agw/fmcustomizedlg.py +++ b/wx/lib/agw/fmcustomizedlg.py @@ -219,7 +219,7 @@ class FMCustomizeDlg(wx.Dialog): hsizer = wx.BoxSizer(wx.HORIZONTAL) # add a separator between the book & the buttons area - hsizer.Add(wx.Button(self, wx.ID_OK, _("&Close")), 0, wx.EXPAND | wx.ALIGN_RIGHT) + hsizer.Add(wx.Button(self, wx.ID_OK, _("&Close")), 0, wx.EXPAND) sz.Add(wx.StaticLine(self), 0, wx.EXPAND | wx.TOP | wx.BOTTOM, 3) sz.Add(hsizer, 0, wx.ALIGN_RIGHT | wx.ALL, 2)