mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Support delayed destroy. Use built-in remove.

Browse source 
Dispatch needn't check for win = self.win.
This commit is contained in:
Guido van Rossum 1991-04-21 19:28:44 +00:00
parent a82a27585a
commit fb9149c401
2 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Lib/lib-stdwin/WindowParent.py
View file

@ -29,14 +29,20 @@ class WindowParent() = ManageOneChild():
self.do_keybd = 0 self.do_keybd = 0
self.do_timer = 0 self.do_timer = 0
self.do_altdraw = 0 self.do_altdraw = 0
self.pending_destroy = 0
# #
def destroy(self): def destroy(self):
if self.win in WindowList: if self.win in WindowList:
import util WindowList.remove(self.win)
util.remove(self.win, WindowList)
if self.child: self.child.destroy() if self.child: self.child.destroy()
self._reset() self._reset()
# #
def delayed_destroy(self):
# This interface to be used by 'Close' buttons etc.;
# destroying a window from within a button hook
# is not a good idea...
self.pending_destroy = 1
#
def need_mouse(self, child): self.do_mouse = 1 def need_mouse(self, child): self.do_mouse = 1
def no_mouse(self, child): self.do_mouse = 0 def no_mouse(self, child): self.do_mouse = 0
# #
@ -57,9 +63,10 @@ class WindowParent() = ManageOneChild():
size = self.child.minsize(self.beginmeasuring()) size = self.child.minsize(self.beginmeasuring())
self.size = max(self.size[0], size[0]), \ self.size = max(self.size[0], size[0]), \
max(self.size[1], size[1]) max(self.size[1], size[1])
# XXX stdwin.setdefwinsize(self.size) stdwin.setdefscrollbars(0, 0)
# XXX Compensate stdwin bug: # XXX Compensate stdwin bug:
stdwin.setdefwinsize(self.size[0]+4, min(300, self.size[1]+2)) # XXX should really be stdwin.setdefwinsize(self.size)
stdwin.setdefwinsize(self.size[0]+4, self.size[1]+2)
self.win = stdwin.open(self.title) self.win = stdwin.open(self.title)
self.win.setdocsize(self.size) self.win.setdocsize(self.size)
if self.itimer: if self.itimer:
@ -109,12 +116,10 @@ class WindowParent() = ManageOneChild():
else: else:
self.itimer = itimer self.itimer = itimer
# #
# Only call dispatch if we have a child # Only call dispatch once we are realized
# #
def dispatch(self, (type, win, detail)): def dispatch(self, (type, win, detail)):
if win <> self.win: if type = WE_DRAW:
return
elif type = WE_DRAW:
d = self.win.begindrawing() d = self.win.begindrawing()
self.child.draw(d, detail) self.child.draw(d, detail)
del d del d
@ -132,6 +137,8 @@ class WindowParent() = ManageOneChild():
elif type = WE_SIZE: elif type = WE_SIZE:
self.fixup() self.fixup()
elif type = WE_CLOSE: elif type = WE_CLOSE:
self.delayed_destroy()
if self.pending_destroy:
self.destroy() self.destroy()
# #

23
Lib/stdwin/WindowParent.py
View file

@ -29,14 +29,20 @@ class WindowParent() = ManageOneChild():
self.do_keybd = 0 self.do_keybd = 0
self.do_timer = 0 self.do_timer = 0
self.do_altdraw = 0 self.do_altdraw = 0
self.pending_destroy = 0
# #
def destroy(self): def destroy(self):
if self.win in WindowList: if self.win in WindowList:
import util WindowList.remove(self.win)
util.remove(self.win, WindowList)
if self.child: self.child.destroy() if self.child: self.child.destroy()
self._reset() self._reset()
# #
def delayed_destroy(self):
# This interface to be used by 'Close' buttons etc.;
# destroying a window from within a button hook
# is not a good idea...
self.pending_destroy = 1
#
def need_mouse(self, child): self.do_mouse = 1 def need_mouse(self, child): self.do_mouse = 1
def no_mouse(self, child): self.do_mouse = 0 def no_mouse(self, child): self.do_mouse = 0
# #
@ -57,9 +63,10 @@ class WindowParent() = ManageOneChild():
size = self.child.minsize(self.beginmeasuring()) size = self.child.minsize(self.beginmeasuring())
self.size = max(self.size[0], size[0]), \ self.size = max(self.size[0], size[0]), \
max(self.size[1], size[1]) max(self.size[1], size[1])
# XXX stdwin.setdefwinsize(self.size) stdwin.setdefscrollbars(0, 0)
# XXX Compensate stdwin bug: # XXX Compensate stdwin bug:
stdwin.setdefwinsize(self.size[0]+4, min(300, self.size[1]+2)) # XXX should really be stdwin.setdefwinsize(self.size)
stdwin.setdefwinsize(self.size[0]+4, self.size[1]+2)
self.win = stdwin.open(self.title) self.win = stdwin.open(self.title)
self.win.setdocsize(self.size) self.win.setdocsize(self.size)
if self.itimer: if self.itimer:
@ -109,12 +116,10 @@ class WindowParent() = ManageOneChild():
else: else:
self.itimer = itimer self.itimer = itimer
# #
# Only call dispatch if we have a child # Only call dispatch once we are realized
# #
def dispatch(self, (type, win, detail)): def dispatch(self, (type, win, detail)):
if win <> self.win: if type = WE_DRAW:
return
elif type = WE_DRAW:
d = self.win.begindrawing() d = self.win.begindrawing()
self.child.draw(d, detail) self.child.draw(d, detail)
del d del d
@ -132,6 +137,8 @@ class WindowParent() = ManageOneChild():
elif type = WE_SIZE: elif type = WE_SIZE:
self.fixup() self.fixup()
elif type = WE_CLOSE: elif type = WE_CLOSE:
self.delayed_destroy()
if self.pending_destroy:
self.destroy() self.destroy()
# #