PR 42 from Metallicow. Py3 and Phoenix updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2014-01-11 23:13:15 +00:00
parent b0fa504d1d
commit 2fb6f00867
38 changed files with 483 additions and 490 deletions

View File

@@ -106,7 +106,7 @@ class EventManager:
self.messageAdapterDict[topic] = {}
self.messageAdapterDict[topic][listener] = messageAdapter
if not self.eventAdapterDict.has_key(topic):
if not topic in self.eventAdapterDict:
self.eventAdapterDict[topic] = EventAdapter(event, win, id)
else:
# Throwing away a duplicate request
@@ -170,7 +170,7 @@ class EventManager:
for topic in topicList:
topicDict = self.messageAdapterDict[topic]
if topicDict.has_key(listener):
if listener in topicDict:
topicDict[listener].Destroy()
del topicDict[listener]
@@ -285,7 +285,7 @@ class EventManager:
with these specs.
"""
try:
return self.messageAdapterDict[topicPattern].has_key(eventHandler)
return eventHandler in self.messageAdapterDict[topicPattern]
except KeyError:
return 0