[Python-checkins] python/dist/src/Lib/lib-tk Tix.py,1.13,1.14

2002年12月09日 18:18:51 -0800

Update of /cvsroot/python/python/dist/src/Lib/lib-tk
In directory sc8-pr-cvs1:/tmp/cvs-serv8779/Lib/lib-tk
Modified Files:
	Tix.py 
Log Message:
Upgrade to Tix-8.1.4 from Mike Clarkson (the maintainer)
Index: Tix.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/Tix.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Tix.py	6 Dec 2002 10:33:44 -0000	1.13
--- Tix.py	10 Dec 2002 02:18:49 -0000	1.14
***************
*** 257,261 ****
 
 
- 
 Tkinter.Widget.__bases__ = Tkinter.Widget.__bases__ + (Form,)
 
--- 257,260 ----
***************
*** 378,381 ****
--- 377,400 ----
 for name in names:
 self.tk.call(name, 'configure', '-' + option, value)
+ # These are missing from Tkinter
+ def image_create(self, imgtype, cnf={}, master=None, **kw):
+ if not master:
+ master = Tkinter._default_root
+ if not master:
+ raise RuntimeError, 'Too early to create image'
+ if kw and cnf: cnf = _cnfmerge((cnf, kw))
+ elif kw: cnf = kw
+ options = ()
+ for k, v in cnf.items():
+ if callable(v):
+ v = self._register(v)
+ options = options + ('-'+k, v)
+ return master.tk.call(('image', 'create', imgtype,) + options)
+ def image_delete(self, imgname):
+ try:
+ self.tk.call('image', 'delete', imgname)
+ except TclError:
+ # May happen if the root was destroyed
+ pass
 
 # Subwidgets are child widgets created automatically by mega-widgets.
***************
*** 566,569 ****
--- 585,590 ----
 pass
 
+ # align
+ 
 def add_history(self, str):
 self.tk.call(self._w, 'addhistory', str)
***************
*** 1248,1253 ****
 class ResizeHandle(TixWidget):
 """Internal widget to draw resize handles on Scrolled widgets."""
- # FIXME: This is dangerous to expose to be called on its own.
- # Perhaps rename ResizeHandle to _ResizeHandle
 def __init__(self, master, cnf={}, **kw):
 # There seems to be a Tix bug rejecting the configure method
--- 1269,1272 ----