Upgrade to Tix-8.1.4 from Mike Clarkson (the maintainer)

diff --git a/Demo/tix/tixwidgets.py b/Demo/tix/tixwidgets.py
index 30507c468e9ca2ea775816d5013a8504d96878dd..f6bb70e438c1b138788040cc8b3c67490f82768f 100644 (file)
--- a/Demo/tix/tixwidgets.py
+++ b/Demo/tix/tixwidgets.py
@@ -1,6 +1,5 @@
 # -*-mode: python; fill-column: 75; tab-width: 8; coding: iso-latin-1-unix -*-
 #
-# Id: tixwidgets.py,v 1.7 2002/11/14 02:44:08 nnorwitz Exp
 # $Id$
 #
 # tixwidgets.py --
@@ -545,11 +544,7 @@ def MkSWindow(w):
 
     win = Tix.ScrolledWindow(top, scrollbar='auto')
 
-    global image1
-    # This image is not showing up in the Label unless it is set to a
-    # global variable - no problem under Tcl/Tix. It is being
-    # garbage collected at the end of this proecedure if not global
-    image1 = Tix.Image('photo', file=file)
+    image1 = win.window.image_create('photo', file=file)
     lbl = Tix.Label(win.window, image=image1)
     lbl.pack(expand=1, fill=Tix.BOTH)
 

diff --git a/Lib/lib-tk/Tix.py b/Lib/lib-tk/Tix.py
index 9d3f33f8d79cdd169435e1fd1fd1a58fa010ab39..57593568b7d5753c24ffc4318624c0f45810c1dd 100755 (executable)
--- a/Lib/lib-tk/Tix.py
+++ b/Lib/lib-tk/Tix.py
@@ -256,7 +256,6 @@ class Form:
 
 
 
-
 Tkinter.Widget.__bases__ = Tkinter.Widget.__bases__ + (Form,)
 
 class TixWidget(Tkinter.Widget):
@@ -377,6 +376,26 @@ class TixWidget(Tkinter.Widget):
         names = self._subwidget_names()
         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.
 # In python, we have to create these subwidgets manually to mirror their
@@ -565,6 +584,8 @@ class ComboBox(TixWidget):
             # unavailable when -fancy not specified
             pass
 
+    # align
+    
     def add_history(self, str):
         self.tk.call(self._w, 'addhistory', str)
 
@@ -1247,8 +1268,6 @@ class PopupMenu(TixWidget):
 
 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
         # Let's try making the flags -static