[Python-checkins] r46999 - in python/trunk: Lib/lib-tk/Tkinter.py Misc/ACKS Misc/NEWS

[martin.v.loewis]

Author: martin.v.loewis
Date: Sat Jun 17 11:20:41 2006
New Revision: 46999

Modified:
   python/trunk/Lib/lib-tk/Tkinter.py
   python/trunk/Misc/ACKS
   python/trunk/Misc/NEWS
Log:
Patch #1096231: Add default argument to wm_iconbitmap.


Modified: python/trunk/Lib/lib-tk/Tkinter.py
==============================================================================
--- python/trunk/Lib/lib-tk/Tkinter.py	(original)
+++ python/trunk/Lib/lib-tk/Tkinter.py	Sat Jun 17 11:20:41 2006
@@ -1500,10 +1500,19 @@
         the group leader of this widget if None is given."""
         return self.tk.call('wm', 'group', self._w, pathName)
     group = wm_group
-    def wm_iconbitmap(self, bitmap=None):
+    def wm_iconbitmap(self, bitmap=None, default=None):
         """Set bitmap for the iconified widget to BITMAP. Return
-        the bitmap if None is given."""
-        return self.tk.call('wm', 'iconbitmap', self._w, bitmap)
+        the bitmap if None is given.
+
+        Under Windows, the DEFAULT parameter can be used to set the icon 
+        for the widget and any descendents that don't have an icon set
+        explicitely.  DEFAULT can be the relative path to a .ico file
+        (example: root.iconbitmap(default='myicon.ico') ).  See Tk
+        documentation for more information."""
+        if default:
+            return self.tk.call('wm', 'iconbitmap', self._w, '-default', default)
+        else:
+            return self.tk.call('wm', 'iconbitmap', self._w, bitmap)
     iconbitmap = wm_iconbitmap
     def wm_iconify(self):
         """Display widget as icon."""

Modified: python/trunk/Misc/ACKS
==============================================================================
--- python/trunk/Misc/ACKS	(original)
+++ python/trunk/Misc/ACKS	Sat Jun 17 11:20:41 2006
@@ -205,6 +205,7 @@
 Frederik Fix
 Hernán Martínez Foffani
 Doug Fort
+John Fouhy
 Martin Franklin
 Robin Friedrich
 Ivan Frohne

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sat Jun 17 11:20:41 2006
@@ -163,6 +163,8 @@
 Library
 -------
 
+- Patch #1096231: Add ``default`` argument to Tkinter.Wm.wm_iconbitmap.
+
 - Patch #763580: Add name and value arguments to Tkinter variable
   classes.