mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-04 11:00:07 +01:00
b143cff821
When binding events to multiple methods and then unbinding them later,
in the same order they were bound, the wrong method would get unbound.
For example:
self.btn.Bind(wx.EVT_BUTTON, self.onButton1)
self.btn.Bind(wx.EVT_BUTTON, self.onButton1)
followed by:
self.btn.Unbind(wx.EVT_BUTTON, handler=self.onButton2)
self.btn.Unbind(wx.EVT_BUTTON, handler=self.onButton1)
works, but the reverse fails:
self.btn.Unbind(wx.EVT_BUTTON, handler=self.onButton1)
self.btn.Unbind(wx.EVT_BUTTON, handler=self.onButton2)
The reason is that the wxPython Disconnect() method called the wxWidgets
Disconnect() method with the userData parameter set to NULL. In this
case, wxWidgets performs no filtering based on the userData parameter
and this could result in the wrong handler getting disconnected.
Fix this by setting the userData to a known value before calling
wxWidgets Disconnect() method so that it will disconnect the correct
handler.
This commit also adds a test that verifies the fix.
Fixes #2027.
310 lines
8.4 KiB
Python
310 lines
8.4 KiB
Python
import unittest
|
|
from unittests import wtc
|
|
import wx
|
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
class Events(wtc.WidgetTestCase):
|
|
|
|
# Test the constructors to make sure the classes are not abstract, except
|
|
# for wx.Event
|
|
|
|
def test_Event_ctor(self):
|
|
with self.assertRaises(TypeError):
|
|
# it's an abstract class, so it can't be instantiated
|
|
evt = wx.Event()
|
|
|
|
def test_CommandEvent_ctor(self):
|
|
evt = wx.CommandEvent()
|
|
|
|
def test_ActivateEvent_ctor(self):
|
|
evt = wx.ActivateEvent()
|
|
|
|
def test_ChildFocusEvent_ctor(self):
|
|
evt = wx.ChildFocusEvent()
|
|
|
|
def test_ClipboardTextEvent_ctor(self):
|
|
evt = wx.ClipboardTextEvent()
|
|
|
|
def test_CloseEvent_ctor(self):
|
|
evt = wx.CloseEvent()
|
|
|
|
def test_ContextMenuEvent_ctor(self):
|
|
evt = wx.ContextMenuEvent()
|
|
|
|
def test_DisplayChangedEvent_ctor(self):
|
|
evt = wx.DisplayChangedEvent()
|
|
|
|
def test_DropFilesEvent_ctor(self):
|
|
evt = wx.DropFilesEvent()
|
|
|
|
def test_EraseEvent_ctor(self):
|
|
evt = wx.EraseEvent()
|
|
|
|
def test_FocusEvent_ctor(self):
|
|
evt = wx.FocusEvent()
|
|
|
|
def test_HelpEvent_ctor(self):
|
|
evt = wx.HelpEvent()
|
|
|
|
def test_IconizeEvent_ctor(self):
|
|
evt = wx.IconizeEvent()
|
|
|
|
def test_IdleEvent_ctor(self):
|
|
evt = wx.IdleEvent()
|
|
|
|
def test_InitDialogEvent_ctor(self):
|
|
evt = wx.InitDialogEvent()
|
|
|
|
def test_JoystickEvent_ctor(self):
|
|
evt = wx.JoystickEvent()
|
|
|
|
def test_KeyEvent_ctor(self):
|
|
evt = wx.KeyEvent()
|
|
|
|
def test_KeyEvent_GetUnicodeKey(self):
|
|
evt = wx.KeyEvent()
|
|
unikey = evt.GetUnicodeKey()
|
|
self.assertTrue(isinstance(unikey, int))
|
|
|
|
def test_KeyEvent_SetUnicodeKey(self):
|
|
evt = wx.KeyEvent()
|
|
value = 666
|
|
evt.SetUnicodeKey(value)
|
|
self.assertTrue(evt.GetUnicodeKey() == value)
|
|
|
|
def test_KeyEvent_SetKeyCode(self):
|
|
evt = wx.KeyEvent()
|
|
value = wx.WXK_ADD
|
|
evt.SetKeyCode(value)
|
|
self.assertTrue(evt.GetKeyCode() == value)
|
|
|
|
def test_KeyEvent_SetRawKeyCode(self):
|
|
evt = wx.KeyEvent()
|
|
value = wx.WXK_ADD
|
|
evt.SetRawKeyCode(value)
|
|
self.assertTrue(evt.GetRawKeyCode() == value)
|
|
|
|
def test_KeyEvent_SetRawKeyFlags(self):
|
|
evt = wx.KeyEvent()
|
|
value = 3
|
|
evt.SetRawKeyFlags(value)
|
|
self.assertTrue(evt.GetRawKeyFlags() == value)
|
|
|
|
def test_MaximizeEvent_ctor(self):
|
|
evt = wx.MaximizeEvent()
|
|
|
|
def test_MenuEvent_ctor(self):
|
|
evt = wx.MenuEvent()
|
|
|
|
def test_MouseCaptureChangedEvent_ctor(self):
|
|
evt = wx.MouseCaptureChangedEvent()
|
|
|
|
def test_MouseCaptureLostEvent_ctor(self):
|
|
evt = wx.MouseCaptureLostEvent()
|
|
|
|
def test_MouseEvent_ctor(self):
|
|
evt = wx.MouseEvent()
|
|
|
|
def test_MoveEvent_ctor(self):
|
|
evt = wx.MoveEvent((1,1))
|
|
|
|
def test_NavigationKeyEvent_ctor(self):
|
|
evt = wx.NavigationKeyEvent()
|
|
|
|
def test_NotifyEvent_ctor(self):
|
|
evt = wx.NotifyEvent()
|
|
|
|
def test_PaletteChangedEvent_ctor(self):
|
|
evt = wx.PaletteChangedEvent()
|
|
|
|
def test_QueryNewPaletteEvent_ctor(self):
|
|
evt = wx.QueryNewPaletteEvent()
|
|
|
|
def test_ScrollEvent_ctor(self):
|
|
evt = wx.ScrollEvent()
|
|
|
|
def test_ScrollWinEvent_ctor(self):
|
|
evt = wx.ScrollWinEvent()
|
|
|
|
def test_SetCursorEvent_ctor(self):
|
|
evt = wx.SetCursorEvent()
|
|
|
|
def test_ShowEvent_ctor(self):
|
|
evt = wx.ShowEvent()
|
|
|
|
def test_SizeEvent_ctor(self):
|
|
evt = wx.SizeEvent((1,1))
|
|
|
|
def test_SysColourChangedEvent_ctor(self):
|
|
evt = wx.SysColourChangedEvent()
|
|
|
|
def test_UpdateUIEvent_ctor(self):
|
|
evt = wx.UpdateUIEvent()
|
|
|
|
def test_WindowCreateEvent_ctor(self):
|
|
evt = wx.WindowCreateEvent()
|
|
|
|
def test_WindowDestroyEvent_ctor(self):
|
|
evt = wx.WindowDestroyEvent()
|
|
|
|
|
|
def test_eventBinding(self):
|
|
class Frame(wx.Frame):
|
|
def __init__(self, *args, **kw):
|
|
wx.Frame.__init__(self, *args, **kw)
|
|
self.Bind(wx.EVT_SIZE, self.OnSize)
|
|
self.gotEvent = False
|
|
def OnSize(self, evt):
|
|
self.gotEvent = True
|
|
evt.EventObject.Close()
|
|
frm = Frame(None)
|
|
frm.Show()
|
|
frm.SetSize((200,100))
|
|
self.myYield()
|
|
self.assertTrue(frm.gotEvent)
|
|
|
|
|
|
def test_eventUnbinding1(self):
|
|
"Unbind without specifying handler"
|
|
self.gotEvent = False
|
|
|
|
def _onSize(evt):
|
|
self.gotEvent = True
|
|
|
|
self.frame.Bind(wx.EVT_SIZE, _onSize)
|
|
val = self.frame.Unbind(wx.EVT_SIZE)
|
|
assert val, "Unbind returned false"
|
|
|
|
self.frame.SetSize((200,200))
|
|
self.myYield()
|
|
assert not self.gotEvent, "Expected gotEvent to still be False"
|
|
|
|
|
|
def test_eventUnbinding2(self):
|
|
"Unbind with specifying handler, simple function object"
|
|
self.gotEvent = False
|
|
|
|
def _onSize(evt):
|
|
self.gotEvent = True
|
|
|
|
self.frame.Bind(wx.EVT_SIZE, _onSize)
|
|
val = self.frame.Unbind(wx.EVT_SIZE, handler=_onSize)
|
|
assert val, "Unbind returned False"
|
|
|
|
self.frame.SetSize((200,200))
|
|
self.myYield()
|
|
assert not self.gotEvent, "Expected gotEvent to still be False"
|
|
|
|
|
|
def test_eventUnbinding3(self):
|
|
"Unbind with specifying handler, a bound method"
|
|
|
|
class Frame(wx.Frame):
|
|
def __init__(self, *args, **kw):
|
|
wx.Frame.__init__(self, *args, **kw)
|
|
self.Bind(wx.EVT_SIZE, self.OnSize)
|
|
self.gotEvent = False
|
|
self.obj = self.OnSize
|
|
|
|
def doUnBind(self):
|
|
#assert id(self.obj) != id(self.OnSize) # Strange, but it's possible
|
|
val = self.Unbind(wx.EVT_SIZE, handler=self.OnSize)
|
|
assert val, "Unbind returned False"
|
|
|
|
def OnSize(self, evt):
|
|
self.gotEvent = True
|
|
evt.EventObject.Close()
|
|
|
|
frm = Frame(None)
|
|
frm.doUnBind()
|
|
frm.Show()
|
|
frm.SetSize((200,100))
|
|
self.myYield()
|
|
assert not frm.gotEvent, "Expected gotEvent to still be False"
|
|
|
|
|
|
def test_eventUnbinding4(self):
|
|
"Unbind by passing None to Bind()"
|
|
self.gotEvent = False
|
|
|
|
def _onSize(evt):
|
|
self.gotEvent = True
|
|
|
|
self.frame.Bind(wx.EVT_SIZE, _onSize)
|
|
self.frame.Bind(wx.EVT_SIZE, None)
|
|
|
|
self.frame.SetSize((200,200))
|
|
self.myYield()
|
|
assert not self.gotEvent, "Expected gotEvent to still be False"
|
|
|
|
|
|
|
|
def test_eventUnbinding5(self):
|
|
"Unbind in same order of binding"
|
|
|
|
class Frame(wx.Frame):
|
|
def __init__(self, *args, **kw):
|
|
wx.Frame.__init__(self, *args, **kw)
|
|
self.btn = wx.Button(self, label="Hello, wxPython!")
|
|
self.btn.Bind(wx.EVT_BUTTON, self.onButton1)
|
|
self.btn.Bind(wx.EVT_BUTTON, self.onButton2)
|
|
def onButton1(self, evt):
|
|
evt.Skip()
|
|
def onButton2(self, evt):
|
|
evt.Skip()
|
|
|
|
frm = Frame(None)
|
|
ub1 = frm.btn.Unbind(wx.EVT_BUTTON, handler=frm.onButton1)
|
|
ub2 = frm.btn.Unbind(wx.EVT_BUTTON, handler=frm.onButton2)
|
|
|
|
assert ub1, "Expected Unbind() success"
|
|
assert ub2, "Expected Unbind() success"
|
|
|
|
|
|
def test_DropFilesEvent_tweaks(self):
|
|
evt = wx.DropFilesEvent(123, 'one two three four five'.split())
|
|
self.assertTrue(evt.NumberOfFiles == 5)
|
|
f = evt.Files
|
|
self.assertTrue(isinstance(f, list))
|
|
self.assertTrue(len(f) == 5)
|
|
|
|
|
|
def test_EventCategory(self):
|
|
wx.EVT_CATEGORY_UI
|
|
wx.EVT_CATEGORY_USER_INPUT
|
|
wx.EVT_CATEGORY_SOCKET
|
|
wx.EVT_CATEGORY_TIMER
|
|
wx.EVT_CATEGORY_THREAD
|
|
wx.EVT_CATEGORY_ALL
|
|
|
|
|
|
def test_evtHandlerSubclass(self):
|
|
class MyEvtHandler(wx.EvtHandler):
|
|
def __init__(self, **kwds):
|
|
super(MyEvtHandler, self).__init__() #**kwds)
|
|
|
|
eh = MyEvtHandler()
|
|
eh.Destroy()
|
|
|
|
|
|
|
|
def test_ClientData1(self):
|
|
evt = wx.CommandEvent()
|
|
evt.SetClientData('hello')
|
|
assert evt.GetClientData() == 'hello'
|
|
|
|
|
|
def test_ClientData2(self):
|
|
evt = wx.CommandEvent()
|
|
evt.SetClientObject('hello')
|
|
assert evt.GetClientObject() == 'hello'
|
|
|
|
|
|
#---------------------------------------------------------------------------
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|