Thanks, Roger.  I did a quick smoke test of the patch on OS X 10.7 with Cocoa Tk.  I didn't see any obvious problems.  Of course, it needs to be tested on Windows and with X11 on a Unix platform.  Note, that there are some spurious spaces at a few ends-of-lines.  The main repositories on hg.python.org have whitespace prehooks that check for and reject patches with extra whitespace.  There's a script (reindent.py) included in Tools/scripts that will check for this and other problems.
    http://docs.python.org/devguide/committing.html