mirror of
https://github.com/python/cpython.git
synced 2025-07-24 19:54:21 +00:00
cleaned up ugly hack related to activate events and suspend/resume -- jvr
This commit is contained in:
parent
f09f6a5565
commit
5763e07ea3
1 changed files with 8 additions and 14 deletions
|
@ -357,17 +357,13 @@ class Application:
|
||||||
|
|
||||||
def do_activateEvt(self, event):
|
def do_activateEvt(self, event):
|
||||||
(what, message, when, where, modifiers) = event
|
(what, message, when, where, modifiers) = event
|
||||||
# XXXX Incorrect, should be fixed in suspendresume
|
wid = WhichWindow(message)
|
||||||
if type(message) == type(1):
|
|
||||||
wid = WhichWindow(message)
|
|
||||||
else:
|
|
||||||
wid = message
|
|
||||||
if wid and self._windows.has_key(wid):
|
if wid and self._windows.has_key(wid):
|
||||||
window = self._windows[wid]
|
window = self._windows[wid]
|
||||||
window.do_activate(modifiers & 1, event)
|
window.do_activate(modifiers & 1, event)
|
||||||
else:
|
else:
|
||||||
MacOS.HandleEvent(event)
|
MacOS.HandleEvent(event)
|
||||||
|
|
||||||
def do_osEvt(self, event):
|
def do_osEvt(self, event):
|
||||||
(what, message, when, where, modifiers) = event
|
(what, message, when, where, modifiers) = event
|
||||||
which = (message >> 24) & 0xff
|
which = (message >> 24) & 0xff
|
||||||
|
@ -377,16 +373,14 @@ class Application:
|
||||||
if DEBUG:
|
if DEBUG:
|
||||||
print 'unknown osEvt:',
|
print 'unknown osEvt:',
|
||||||
self.printevent(event)
|
self.printevent(event)
|
||||||
|
|
||||||
def do_suspendresume(self, event):
|
def do_suspendresume(self, event):
|
||||||
# Is this a good idea???
|
|
||||||
(what, message, when, where, modifiers) = event
|
(what, message, when, where, modifiers) = event
|
||||||
w = FrontWindow()
|
wid = FrontWindow()
|
||||||
if w:
|
if wid and self._windows.has_key(wid):
|
||||||
# XXXX Incorrect, should stuff windowptr into message field
|
window = self._windows[wid]
|
||||||
nev = (activateEvt, w, when, where, message&1)
|
window.do_activate(modifiers & 1, event)
|
||||||
self.do_activateEvt(nev)
|
|
||||||
|
|
||||||
def do_kHighLevelEvent(self, event):
|
def do_kHighLevelEvent(self, event):
|
||||||
(what, message, when, where, modifiers) = event
|
(what, message, when, where, modifiers) = event
|
||||||
if DEBUG:
|
if DEBUG:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue