[Bug #3239768] tk8.4.19 (and later) WIN32 menu font support

2 files changed, 480 insertions, 461 deletions

diff --git a/ChangeLog b/ChangeLog
index d37e003..3fca135 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2010-03-12  Jan Nijtmans  <nijtmans@users.sf.net>
+2011-03-24  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/tkWinMenu.c: [Bug #3239768] tk8.4.19 (and later) WIN32
+	menu font support.
+
+2011-03-12  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* win/tkWin32Dll.c:  SEH-emulation for AMD64
 	* win/tkWinX.c:      mingw-w64 does not accept _WIN32_IE < 0x0501
@@ -292,8 +297,8 @@
 
 2007-12-12  Jeff Hobbs  <jeffh@ActiveState.com>
 
-	* generic/tkText.c (DeleteChars, TextEditCmd, updateDirtyFlag): 
-	* tests/text.test (text-25.10.1,25.11.[12]): 
+	* generic/tkText.c (DeleteChars, TextEditCmd, updateDirtyFlag):
+	* tests/text.test (text-25.10.1,25.11.[12]):
 	Don't require [update idle] to trigger Modified event [Bug 1809538]
 	Modified virtual event should only fire on state change [Bug 1799782]
 	Make sure we delete chars before triggering <<Modified>> [Bug 1737288]
@@ -309,15 +314,15 @@
 	* win/tkWinDraw.c: Applied [Patch 1723362] for transparent bitmaps.
 
 2007-11-26  Kevin Kenny  <kennykb@acm.org>
-	
+
 	Backport from HEAD of [Bug #1822391]:
-	
+
 	* generic/tkImgPPM.c (StringReadPPM): Corrected a comparison
 	whose sense was reversed that resulted in reading beyond the
 	end of the input buffer on malformed PPM data. [Bug #1822391]
 	* tests/imgPPM.test (imgPPM-4.1): Added test case that
 	exercises [Bug #1822391].
-	
+
 2007-11-09  Daniel Steffen  <das@users.sourceforge.net>
 
 	Backport from HEAD of Aqua changes from 2007-10-12 to 2007-11-09:
@@ -385,7 +390,7 @@
 	* library/demos/widget:		Aqua GOOBE.
 
 	* macosx/tkMacOSXEvent.c (TkMacOSXProcessCommandEvent): fix boolean arg
-	
+
 	* macosx/tkMacOSXColor.c (GetThemeColor): improve translation of RGB
 					pixel values into RGBColor.
 
@@ -716,9 +721,9 @@
 	* macosx/tkMacOSXEntry.c: formatting cleanup.
 
 	* unix/configure.in (Darwin): link the Tk and Wish plists into their
-	binaries in all cases; fix 64bit arch removal in fat 32&64bit builds. 
+	binaries in all cases; fix 64bit arch removal in fat 32&64bit builds.
 
-	* unix/tcl.m4 (Darwin): fix CF checks in fat 32&64bit builds. 
+	* unix/tcl.m4 (Darwin): fix CF checks in fat 32&64bit builds.
 	* unix/configure: autoconf-2.13
 
 2007-06-05  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
@@ -1070,7 +1075,7 @@
 
 	* macosx/tkMacOSXBitmap.c: fix macRoman encoding leak.
 	* macosx/tkMacOSXCursor.c:
-	
+
 	* macosx/tkMacOSXDebug.c (TkMacOSXCarbonEventToAscii): use static
 	* macosx/tkMacOSXDebug.h: buffer to simplify callers; const fixes.
 
@@ -1107,7 +1112,7 @@
 	* macosx/tkMacOSXScale.c: replace TrackControl() by modern
 	* macosx/tkMacOSXScrlbr.c: HandleControlClick() API (using new
 	TkMacOSXModifierState()).
-	
+
 	* macosx/tkMacOSXInt.h:		move all constant #defines needed to
 	* macosx/tkMacOSXColor.c:	support building on older OS X releases
 	* macosx/tkMacOSXEvent.h:	to a central location in tkMacOSXInt.h.
@@ -1599,7 +1604,7 @@
 
 2006-06-15  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
-	* win/makefile.vc:  Sync with tcl to enable building with 
+	* win/makefile.vc:  Sync with tcl to enable building with
 	* win/rules.vc:     VC8 (VS2005 C compiler)
 	* win/nmakehlp.c:
 
@@ -1628,7 +1633,7 @@
 
 2006-06-05  Don Porter	<dgp@users.sourceforge.net>
 
-	* generic/tkInt.h:      Thread safety for the data structures of 
+	* generic/tkInt.h:      Thread safety for the data structures of
 	* generic/tkConsole.c:  the wish [console].  [Bug 1188340].
 
 2006-06-01  Don Porter	<dgp@users.sourceforge.net>
@@ -1741,7 +1746,7 @@
 	* macosx/tkMacOSXInt.h:      use improvements above to avoid calls to
 	* macosx/tkMacOSXKeyEvent.c: GlobalToLocal() when the current port might
 	* macosx/tkMacOSXMenu.c:     not be set correctly. May fix [Bug 1243318]
-	* macosx/tkMacOSXMenus.c:    
+	* macosx/tkMacOSXMenus.c:
 	* macosx/tkMacOSXScale.c:
 	* macosx/tkMacOSXScrlbr.c:
 
@@ -1796,7 +1801,7 @@
 	* win/tkWinEmbed.c (TkpGetOtherWindow):   do not panic if no window
 	* win/tkWinWm.c (UpdateGeometryInfo):     is found - handle it in
 	* unix/tkUnixEmbed.c (TkpGetOtherWindow): the caller. [Bug 1212056]
-	* unix/tkUnixWm.c (Tk_CoordsToWindow, UpdateGeometryInfo): 
+	* unix/tkUnixWm.c (Tk_CoordsToWindow, UpdateGeometryInfo):
 
 2006-04-11  Daniel Steffen  <das@users.sourceforge.net>
 
@@ -1812,7 +1817,7 @@
 
 	* macosx/tkMacOSXHLEvents.c:    call ::tk::mac::* procs for all
 	* macosx/tkMacOSXWindowEvent.c: registered appleevents [FR 1105284],
-	implement print applevent handling, style/whitespace cleanup. 
+	implement print applevent handling, style/whitespace cleanup.
 
 	* macosx/tkMacOSXDraw.c (TkMacOSXInitCGDrawing): prevent multiple init.
 
@@ -1842,11 +1847,11 @@
 
 	* macosx/tkMacOSXWm.c (TkMacOSXGrowToplevel): ensure QD port is set
 	correctly before using API relying on it.
-	
+
 2006-04-06  Vince Darley <vincentdarley@users.sourceforge.net>
 
 	* macosx/tkMacOSXMouseEvent.c: now that [wm attributes -titlepath]
-	works correctly, add OS support for dragging proxy icons and 
+	works correctly, add OS support for dragging proxy icons and
 	using the titlepath menu.
 
 2006-04-06  Daniel Steffen  <das@users.sourceforge.net>
@@ -1854,14 +1859,14 @@
 	* macosx/tkMacOSXWm.c (WmAttributesCmd, WmIconbitmapCmd): fix errors
 	in setting/removing window proxy icons via [wm attributes -titlepath]
 	and [wm iconbitmap], use HIWindow API on Tiger or later. [Bug 1455241]
-	
+
 	* unix/tcl.m4: remove TCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING
 	define on Darwin. [Tcl Bug 1457515]
 	* unix/configure: autoconf-2.13
 
 2006-04-05  Jeff Hobbs  <jeffh@ActiveState.com>
 
-	* win/tkWinMenu.c (FreeID, TkpNewMenu, MenuExitHandler) 
+	* win/tkWinMenu.c (FreeID, TkpNewMenu, MenuExitHandler)
 	(MenuThreadExitHandler, TkpMenuInit, TkpMenuThreadInit): rework
 	Windows menu init/finalization to better respect per-process and
 	per-thread boundaries.
@@ -2067,11 +2072,11 @@
 2006-02-09  Daniel Steffen  <das@users.sourceforge.net>
 
 	* generic/tk.decls:             fix signature of TkMacOSXInvalClipRgns
-	* generic/tkPlatDecls.h:        to use Tk_Window instead of internal	
-	* macosx/tkMacOSXSubwindows.c:  type TkWindow (which led to any include 
+	* generic/tkPlatDecls.h:        to use Tk_Window instead of internal
+	* macosx/tkMacOSXSubwindows.c:  type TkWindow (which led to any include
 	* macosx/tkMacOSXWindowEvent.c: of public header tkMacOSX.h requiring
 	* macosx/tkMacOSXWm.c:          prior include of tkInt.h).
-	
+
 	* generic/tk.h:          move TkAqua specific REDO_KEYSYM_LOOKUP define
 	* macosx/tkMacOSXPort.h: out of tk.h into platform header.
 
@@ -2108,7 +2113,7 @@
 
 2006-01-20  Joe English  <jenglish@users.sourceforge.net>
 
-	* generic/tkEvent.c, unix/tkUnixEvent.c:  XIM fixes 
+	* generic/tkEvent.c, unix/tkUnixEvent.c:  XIM fixes
 	[See #905830, patch tk84-xim-fixes.patch].
 	+ Revert 2005-12-05 patch disabling XIM when SCIM in use;
 	+ Make sure all X events get passed to XFilterEvent,
@@ -2198,7 +2203,7 @@
 2005-12-01  Kevin Kenny  <kennykb@acm.org>
 
 	* win/makefile.vc: restored buildability.
-	
+
 2005-12-01  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* library/menu.tcl (::tk::PostOverPoint): correct menu post near
@@ -2488,13 +2493,13 @@
 	* macosx/tkMacOSXMenubutton.c:
 	* macosx/tkMacOSXScale.c:
 	* macosx/tkMacOSXWindowEvent.c:
-	* macosx/tkMacOSXWm.c: 
+	* macosx/tkMacOSXWm.c:
 
 	* unix/configure.in: define TK_MAC_DEBUG on aqua when symbols enabled.
 	* unix/configure: autoconf-2.13
 
 	* library/listbox.tcl: corrected comments.
-	* library/text.tcl: 
+	* library/text.tcl:
 
 	* xlib/xcolors.c: fixed warning
 
@@ -2516,16 +2521,16 @@
 
 2005-08-16  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
-	* generic/tkOldConfig.c (Tk_ConfigureWidget, Tk_ConfigureInfo): 
+	* generic/tkOldConfig.c (Tk_ConfigureWidget, Tk_ConfigureInfo):
 	(Tk_ConfigureValue, DeleteSpecCacheTable): Keep per-interpreter (and
 	hence per-thread) copies of all the Tk_ConfigSpec tables so that
 	Tk_Uids do not leak across threads. [Bug 749908]
 
 2005-08-11  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
-	* generic/tkCanvLine.c, generic/tkCanvPoly.c, generic/tkCanvText.c: 
-	* generic/tkCanvas.c, generic/tkConfig.c, generic/tkFocus.c: 
-	* generic/tkFrame.c, generic/tkGrid.c, generic/tkImgPhoto.c: 
+	* generic/tkCanvLine.c, generic/tkCanvPoly.c, generic/tkCanvText.c:
+	* generic/tkCanvas.c, generic/tkConfig.c, generic/tkFocus.c:
+	* generic/tkFrame.c, generic/tkGrid.c, generic/tkImgPhoto.c:
 	* generic/tkPack.c, generic/tkPanedWindow.c: Don't pass size_t
 	arguments to Tcl_GetStringFromObj, even with casting; it's not
 	portable to 64-bit systems. [Bug 1252702]
@@ -2710,7 +2715,7 @@
 	* macosx/tkMacOSXEntry.c (TkpDrawEntryBorderAndFocus): set
 	oldWidth to avoid warning
 
-	* macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent): 
+	* macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent):
 	corrected if expression error (use of = instead of ==)
 
 2005-07-06  Jeff Hobbs  <jeffh@ActiveState.com>
@@ -2775,7 +2780,7 @@
 2005-06-04  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
 	* generic/tkCanvas.c (SearchUids): Move all global data into
-	protected storage to stop cross-thread issues. [Bug 1114977] 
+	protected storage to stop cross-thread issues. [Bug 1114977]
 
 2005-06-03  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
@@ -2792,14 +2797,14 @@
 2005-06-02  Jim Ingham  <jingham@apple.com>
 
         Another patch from M. Kirkham.
-	
+
 	* macosx/tkMacOSXScrlbr.c (ThumbActionProc, ScrollBarBindProc):
 	Record the first mouse down point, and compute differences from
 	that, rather than getting the mouse down each time through the
 	loop.  The old method would get fooled if you moved the mouse less
 	than a text line height in the text widget.
 	[Bug 1083728]
-	
+
 2005-06-02  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* changes: update for 8.4.10 release (porter)
@@ -2863,7 +2868,7 @@
 	and tk version vars to properly support tk/x11 framework version
 	overriding, rewrite tkConfig.sh when overriding tk version, corrected
 	Wish.app symlink in tk build dir.
-	
+
 	* unix/configure.in: corrected framework finalization to softlink
 	stub library to Versions/8.x subdir instead of Versions/Current.
 	* unix/configure: autoconf-2.13
@@ -2916,17 +2921,17 @@
 
 	Fixes from Michael Kirkham:
 
-	* macosx/tkMacOSXMenu.c (TkpConfigureMenuEntry): Thinko in clearing 
+	* macosx/tkMacOSXMenu.c (TkpConfigureMenuEntry): Thinko in clearing
 	the ENTRY_ACCEL_MASK before re-parsing it. [Tk Bug 1012852]
 
-	* macosx/tkMacOSXScrlbr.c (UpdateControlValues): Don't set the 
+	* macosx/tkMacOSXScrlbr.c (UpdateControlValues): Don't set the
 	control value BEFORE setting the min and max or the control manager
 	will reset it for you. [Tk Bug 1202181]
 
 	* macosx/tkMacOSXXStubs.c (TkMacOSXXGetPixel, TkMacOSXXPutPixel):
 	Restore the port to what it was before putting we were called.
 	[Tk Bug 1202223]
-	
+
 2005-05-14  Daniel Steffen  <das@users.sourceforge.net>
 
 	* macosx/tkMacOSXInit.c:
@@ -3008,10 +3013,10 @@
 
 	* macosx/tkMacOSXEntry.c (ComputeIncDecParameters): manually define
 	constants present only in 10.3 headers so that we can build on 10.2.
-	
-	* macosx/Wish.pbproj/project.pbxproj: fixed absolute path to 
+
+	* macosx/Wish.pbproj/project.pbxproj: fixed absolute path to
 	tkEntry.h that confused 10.2 PBX.
-	
+
 	* unix/tcl.m4 (Darwin): added -single_module linker flag to
 	TCL_SHLIB_LD_EXTRAS and TK_SHLIB_LD_EXTRAS.
 	* unix/configure: autoconf-2.13
@@ -3035,10 +3040,10 @@
 	and spinbox button drawing.
 	* tkMacOSXDefaults.h: Change the Mac OS X defaults so they fit
 	the native widget shapes.
-	
+
 	* xlib/xgc.c (XCreateGC): Set the default linewidth to 1, not
 	0.  Some extensions seem to expect this.
-	
+
 2005-03-15  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
 	* unix/tcl.m4:    Updated for OpenBSD and regenerated the configure
@@ -3047,30 +3052,30 @@
 2005-03-11  Jim Ingham  <jingham@apple.com>
 
 	* macosx/tkMacOSXButton.c (TkpDisplayButton): Set the port to
-	the Button window's port BEFORE you set the clip, otherwise you 
+	the Button window's port BEFORE you set the clip, otherwise you
 	are setting the clip on the wrong window!
 	Also, a little cleanup - move x & y into the branches where they are
-	used, and don't compute the TextAnchor if we are using the native 
+	used, and don't compute the TextAnchor if we are using the native
 	button text, since we aren't going to use it.
 	(TkMacOSXDrawControl): Call ShowControl & SetControlVisibility in a more
 	logical order.
 
 	* tkMacOSXInt.h: Add TkMacOSXGenerateFocusEvent.
 	* tkMacOSXSubwindows.c (XDestroyWindow): We don't get Activate events
-	for the remaining windows when a Floating window is destroyed.  This 
+	for the remaining windows when a Floating window is destroyed.  This
 	can cause the focus to disappear.  So catch this case when the window
 	is being destroyed and move the focus here.
 	* tkMacOSXWindowEvent.c (TkMacOSXGenerateFocusEvent): Make this public
-	(used to be GenerateFocusEvent) since we need it here and in 
+	(used to be GenerateFocusEvent) since we need it here and in
 	tkMacOSXSubwindows.c.  Then change the name everywhere it is used.
 	[Bug 1124237]
-	
+
 2005-03-10  Jim Ingham  <jingham@apple.com>
 
 	* macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent): In
 	the inDrag section, set the GrafPort to the drag window's GrafPort
 	before doing LocalToGlobal. [Bug 1160025]
-	
+
 2005-03-08  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* win/tkWinWm.c (WinSetIcon): fix GCLP_ICONSM -> GCLP_HICONSM.
@@ -3145,11 +3150,11 @@
 
 	* macosx/tkMacOSXInit.c (TkpInit): set tcl_interactive to 1 to show
 	console at startup instead of directly calling [console show].
-	
+
 	* unix/tcl.m4 (Darwin): fixed bug with static build linking to
 	dynamic library in /usr/lib etc instead of linking to static library
 	earlier in search path. [Tcl Bug 956908]
-	Removed obsolete references to Rhapsody. 
+	Removed obsolete references to Rhapsody.
 	* unix/configure: autoconf-2.13
 
 2005-01-18  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
@@ -3167,7 +3172,7 @@
 	Use Tcl_Panic() instead of "panic" [#865264]
 	Fixes: #632816 "cannot remove transient"
 	Fixes: #568861 "Fix for wm minsize and maxsize commands"
-	* tests/unixWm.test, tests/wm.test: Updated test suite for 
+	* tests/unixWm.test, tests/wm.test: Updated test suite for
 	#632816 (unixWm-37.3, unixWm-37.4, wm-grid-1.11, wm-grid-1.12)
 	and #742882 (unixWm-20.9, unixWm-20.11).
 
@@ -3313,7 +3318,7 @@
 
 	* generic/tkMain.c:
 	* macosx/tkMacOSXAppInit.c (removed):
-	* macosx/Wish.pbproj/project.pbxproj: 
+	* macosx/Wish.pbproj/project.pbxproj:
 	* macosx/tkMacOSXInit.c:
 	* macosx/tkMacOSXInt.h: changes to make TkAqua dynamically loadable,
 	enabling [package require Tk] from tclsh. Startup code from
@@ -3344,11 +3349,11 @@
 2004-11-10  Jim Ingham  <jingham@apple.com>
 
 	From Michael Kirkham (mikek@muonics.com):
-	
+
 	* macosx/tkMacOSXButton.c (TkpDisplayButton): Don't set
 	the text if compound is NONE and we have and image.
 	[Bug 1055023]
-	
+
 2004-10-29  Mo DeJong  <mdejong@users.sourceforge.net>
 
 	* tests/wm.test: Add Win32 test cases for attributes
@@ -3360,7 +3365,7 @@
 
 	* win/makefile.vc (DOTVERSION): Was installing 8.4 relabelled as 8.5
 
-	* library/tk.tcl (::tk::PlaceWindow): Backported the fix from 
+	* library/tk.tcl (::tk::PlaceWindow): Backported the fix from
 	#533519 to handle window placement on multi-monitor Windows.
 
 2004-10-28  Mo DeJong  <mdejong@users.sourceforge.net>
@@ -3416,7 +3421,7 @@
 	* generic/tkInt.decls:       Signature for tkWinXCleanup needed to be
 	* generic/tkIntPlatDecls.h:  changed so it matches the Tcl_ExitProc
 				     typedef to avoid a bad-style cast.
-	
+
 
 	* win/makefile.vc:  Backport to the most recent
 	* win/rules.vc:     changes on the HEAD.
@@ -3437,7 +3442,7 @@
 	* generic/tkEvent.c (Tk_HandleEvent): Call XSetICFocus whenever
 	the window receives focus. This fixes bug #905830 but avoids
 	#1000051.
-	
+
 2004-10-20  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* win/tkWinWm.c (UpdateWrapper): pass SWP_NOOWNERZORDER to
@@ -3489,7 +3494,7 @@
 	MF_POPUP flag is given, fixing a recently-introduced crash
 	when submenus are disabled.  Also better error checking for
 	this sort of situation in the future.
-	
+
 2004-09-22  Mo DeJong  <mdejong@users.sourceforge.net>
 
 	* win/tkWinMenu.c (ReconfigureWindowsMenu): Fix drawing of a disabled
@@ -3638,7 +3643,7 @@
 
 2004-08-10  Joe English  <jenglish@users.sourceforge.net>
 
-	* unix/tkUnixWm.c: Fix for #1006686 "wm resizable command 
+	* unix/tkUnixWm.c: Fix for #1006686 "wm resizable command
 	not working on Solaris/CDE" (patch from Colin McDonald).
 
 2004-08-09  Mo DeJong  <mdejong@users.sourceforge.net>
@@ -3663,7 +3668,7 @@
 2004-07-30  Daniel Steffen  <das@users.sourceforge.net>
 
 	* unix/configure:
-	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Darwin: instead of setting PLAT_OBJS 
+	* unix/tcl.m4 (SC_CONFIG_CFLAGS): Darwin: instead of setting PLAT_OBJS
 	to explict object files in tcl.m4, refer to MAC_OSX_OBJS makefile var.
 
 2004-07-29  Don Porter	<dgp@users.sourceforge.net>
@@ -3685,7 +3690,7 @@
 	fix to rounding in bounding box 'bloat' calculation to avoid drawing
 	outside of bounding box when CG drawing enabled. Fix probably
 	correct on other platforms as well?
-	
+
 	* macosx/tkMacOSXDraw.c (TkMacOSXInitCGDrawing): fixed LinkVar type
 	for tkMacOSXCGAntiAliasLimit.
 
@@ -3698,11 +3703,11 @@
 	* macosx/tkMacOSXDefault.h: Change the default -tearoff value
 	to 0.  It doesn't work at present, so it is silly to make
 	it the default.
-	
+
 	Mac OS X: Complete the implementation of the CG version of
 	the X drawing emulation layer.
-	
-	This was mostly done by James Tittle (tigital<at>mac<dot>com), 
+
+	This was mostly done by James Tittle (tigital<at>mac<dot>com),
 	with a little help from me.
 
 	* macosx/tkMacOSXint.h: Add declaration of TkMacOSXInitCGDrawing.
@@ -3722,8 +3727,8 @@
 	(TkMacOSXSetupCGContext): Make this actually work.
 	(TkMacOSXReleaseCGContext): Ditto.
 
-	Mac OS X: Add support for reading the wm attributes -titlepath 
-	command, and convert to using FSRef's.  
+	Mac OS X: Add support for reading the wm attributes -titlepath
+	command, and convert to using FSRef's.
 	This was done by Neil Madden (nem<at>cs<dot>nott<dot>ac<dot>uk).
 
 	* macosx/tkMacOSXWm.c (WmAttrGetModifiedStatus): New function.
@@ -3731,7 +3736,7 @@
 	(WmAttributesCmd): Convert command parsing to use the options index.
 	Use the two above functions to report results.  Convert the titlepath
 	code to use FSRef's.
-	
+
 2004-07-23  Benjamin Riefenstahl  <Benjamin.Riefenstahl@epost.de>
 
 	[Merge from HEAD]
@@ -3739,7 +3744,7 @@
 	Mac OS X: Fix several problems with Icelandic (and Faroese) keyboards
 	reported by J�r�me Gagnon-Voyer <gagnonje5000<at>mac<dot>com> on
 	tcl-mac on 2004-03-22.
-	
+
 	* macosx/tkMacOSXKeyEvent.c (KLSInit): Add.
 	(GetKeyboardLayout): Add calls to Keyboard Layout Services, if
 	present.  Rework classic handling.  Use GetKCHREncoding().  Add
@@ -3756,7 +3761,7 @@
 
 	* generic/tkEvent.c (TkQueueEventForAllChildren): Don't queue
 	events for unmapped windows.
-	
+
 2004-07-20  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* generic/tkEvent.c (Tk_HandleEvent): ensure IC focus is set after
@@ -3771,13 +3776,13 @@
 	* macosx/Makefile: added support to tk framework build to
 	optionally install tk manpages in addition to html help,
 	similarly to tcl/macosx/Makefile.
-	
+
 	* macosx/Wish.pbproj/project.pbxproj: fixes for building with
 	non-default SYMROOT/OBJROOT/SRCROOT, added support for using a
 	Tcl.framework in DYLIB_INSTALL_PATH != /Library/Frameworks,
-	added optional support for building html help without tcl sources 
+	added optional support for building html help without tcl sources
 	present by giving explicit location of tcltk-man2html script.
-	
+
 	* macosx/tkMacOSXMenu.c: fixed #include case sensitivity bug.
 
 2004-07-19  Jeff Hobbs  <jeffh@ActiveState.com>
@@ -3800,13 +3805,13 @@
 	when the current cursor was nulled out when the current cursor
 	gets freed.  So in the case where the input cursor was NULL, we
 	have to just always set it. [Bug #894550]
-	
+
 2004-07-14  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* generic/tkUndo.c (TkUndoSetDepth): correct -maxundo
 	segfault. [Bug #969358] (jiangwu)
 
-	* generic/tk.h (TK_PATCH_LEVEL): 
+	* generic/tk.h (TK_PATCH_LEVEL):
 	* README, macosx/Wish.pbproj/project.pbxproj:      bumped to
 	* unix/configure, unix/configure.in, unix/tk.spec: patchlevel 8.4.7
 	* win/configure, win/configure.in:
@@ -3902,9 +3907,9 @@
 
 2004-04-20  Joe English  <jenglish@users.sourceforge.net>
 
-	* unix/tkUnixWm.c: Backported fix for bug #915350  
-	"Tk sets min, max size in WM_HINTS when it shouldn't" 
-	and #922336 "Tk apps have no maximize window button under 
+	* unix/tkUnixWm.c: Backported fix for bug #915350
+	"Tk sets min, max size in WM_HINTS when it shouldn't"
+	and #922336 "Tk apps have no maximize window button under
 	KDE-3.2.1"
 
 2004-04-16  Jeff Hobbs  <jeffh@ActiveState.com>
@@ -3938,7 +3943,7 @@
 
 2004-03-17  Jim Ingham  <jingham@apple.com>
 
-	* macosx/tkMacOSXHLEvents.c (ApplicationCarbonEventsHandler): New 
+	* macosx/tkMacOSXHLEvents.c (ApplicationCarbonEventsHandler): New
 	function.
 	(tkMacOSXInitAppleEvents): Init the Application Event handler as
 	well.
@@ -3962,7 +3967,7 @@
 
 	* macosx/tkMacOSXDraw.c:
 	* macosx/tkMacOSXXStubs.c:
-	* xlib/ximage.c: fixed MacOSX XGetImage/XPutImage and related 
+	* xlib/ximage.c: fixed MacOSX XGetImage/XPutImage and related
 	functions to deal properly with XImages copied from screen.
 	* generic/tkCanvPs.c (TkImageGetColor): MacOSX fix.
 	* generic/tkImgPhoto.c (ImgPhotoDisplay): enabled alpha blending
@@ -3988,13 +3993,13 @@
 2004-02-17  Daniel Steffen  <das@users.sourceforge.net>
 
 	* macosx/tkMacOSXMouseEvent.c: fixed modifiers for MouseWheel events.
-	
+
 	* library/listbox.tcl:
 	* library/text.tcl:
 	* library/scrlbar.tcl: on Mac OS, add bindings for MouseWheel with
-	modifiers, according to platform convention: 
+	modifiers, according to platform convention:
 	Option increases scrolling speed 10 fold; Space scrolls horizontally.
-	
+
 	* macosx/Wish.pbproj/project.pbxproj:
 	* macosx/tkAboutDlg.r: changed year in copyright strings to 2004.
 
@@ -4012,7 +4017,7 @@
 	8.4 branch.
 	* library/text.tcl: Ditto.
 	* doc/bind.n: Update the docs to reflect the changes.
-	
+
 2004-02-15  Jim Ingham  <jingham@apple.com>
 
 	Backport Mac OS X specific fixes from TOT:
@@ -4027,17 +4032,17 @@
 	pinned to the scrollbar.  I also removed the glitch where the
 	scrollbar would jump get its middle over the mouse when you first
 	moved it.
-	
+
 	* macosx/tkMacOSXClipboard.c (TkSuspendClipboard, TkSelGetSelection):
-	add unicode clipboard support. [Patch #840107] (senn)	
-	
+	add unicode clipboard support. [Patch #840107] (senn)
+
 	* macosx/tkMacOSXDialog.c (NavServicesGetFile): Minor cleanups.
 	* (OpenFileFilterProc): Handle FSRef's as well as FSSpec's in the input
 	file.  Also convert the FSSpec filename to an C-string before passing
 	to MatchOneFile.  [bug 517600]
 	* (MatchOneFile): Require the input filename to be a C-string, not a
 	pascal string.
-	
+
 	* macosx/tkMacOSXDialog.c (MatchOneType): If the Macintosh filetype
 	is 0, then automatically pass the fileType check.
 
@@ -4057,11 +4062,11 @@
 
 	* macosx/tkMacOSXMouseEvent.c: improved handling of events in the
 	presence of grabs, particularly activation events. [Vince Darley]
-	
+
 	* macosx/tkMacOSXColor.c (GetControlPartColor): Use
 	the ThemeBrushes to get the control text color for
 	buttons.
-	
+
 	* tkMacOSXAppInit.c: Formatting cleanups.
 	* tkMacOSXButton.c: Ditto
 	* tkMacOSXClipboard.c: Ditto
@@ -4083,12 +4088,12 @@
 	* tkMacOSXSubwindows.c: Ditto
 	* tkMacOSXWindowEvent.c: Ditto
 	* tkMacOSXWm.c: Ditto
-	
+
 2004-02-13  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* win/tkWinFont.c (Tk_MeasureChars): backport fixes to bold/italic
 	font handling. [Patch 852669] [Bug 478568]
-	* tests/textDisp.test: added test for the font measurement 
+	* tests/textDisp.test: added test for the font measurement
 	problem.
 
 2004-02-13  Jim Ingham  <jingham@apple.com>
@@ -4105,8 +4110,8 @@
 	reflect that.
 
 	* macosx/tkMacOSXWm.c (TkSetWMName): Use CFStrings for the Window Title
-	name, not Pascal strings.  
-	
+	name, not Pascal strings.
+
 2004-02-12  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* README:       update to patchlevel 8.4.6
@@ -4128,7 +4133,7 @@
 
 2004-02-09  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
-	* generic/tkImgPhoto.c (Tk_PhotoPutBlock, Tk_PhotoPutZoomedBlock): 
+	* generic/tkImgPhoto.c (Tk_PhotoPutBlock, Tk_PhotoPutZoomedBlock):
 	* tests/imgPhoto.test (imgPhoto-16.1): Better handling of the case
 	when copying from one area of a photo to another triggers a
 	resizing of the image.  [Bug 877950]
@@ -4154,7 +4159,7 @@
 2003-12-31  Daniel Steffen  <das@users.sourceforge.net>
 
 	* macosx/Wish.pbproj/project.pbxproj: added missing private headers
-	to installed Tk.framework, so that tkInt.h can be included  
+	to installed Tk.framework, so that tkInt.h can be included
 	sucessfully from Tk.framework/PrivateHeaders.
 	* generic/tkPort.h: corrected include of tkMacOSXPort.h
 
@@ -4165,7 +4170,7 @@
 	pinned to the scrollbar.  I also removed the glitch where the
 	scrollbar would jump get its middle over the mouse when you first
 	moved it.
-	
+
 	Import from TOT.
 
 2003-12-11  David Gravereaux <davygrvy@pobox.com>
@@ -4226,8 +4231,8 @@
 
 	* generic/tkMenubutton.h: fixed compound menubutton handling like
 	* generic/tkMenubutton.c: *button corrections of 2003-04-25.
-	* mac/tkMacMenubutton.c (TkpDisplayMenuButton): 
-	* unix/tkUnixMenubu.c (TkpDisplayMenuButton): 
+	* mac/tkMacMenubutton.c (TkpDisplayMenuButton):
+	* unix/tkUnixMenubu.c (TkpDisplayMenuButton):
 
 2003-11-16  Don Porter	<dgp@users.sourceforge.net>
 
@@ -4423,7 +4428,7 @@
 
 	* library/scale.tcl: Fix for bug #787065 for Button-2 press.
 	* tests/scale.test:  Added test for this bug.
-	
+
 2003-08-12  Daniel Steffen  <das@users.sourceforge.net>
 
 	* macosx/tkMacOSXMenu.c: fixed C99'ism that breaks gcc 2.95.
@@ -4441,7 +4446,7 @@
 
 2003-07-19  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
-	* library/scale.tcl: Fix for bug 706765 to correctly handle the 
+	* library/scale.tcl: Fix for bug 706765 to correctly handle the
 	-sliderrelief option while moving the thumb.
 
 2003-07-18  Jeff Hobbs  <jeffh@ActiveState.com>
@@ -4467,7 +4472,7 @@
 
 2003-07-18  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
-	* tests/panedwindow.test (panedwindow-30.2): 
+	* tests/panedwindow.test (panedwindow-30.2):
 	* generic/tkPanedWindow.c (Tk_PanedWindowObjCmd): Ensure that we
 	can share GCs between a panedwindow and its sash proxy, even if
 	the panedwindow is in a toplevel with a different visual. [Bug 702230]
@@ -4558,11 +4563,11 @@
 
 	* generic/tkMenu.c
 	* generic/tkMenu.h
-	* generic/tkMenuDraw.c: 
+	* generic/tkMenuDraw.c:
 	* tests/menu.test: fixed complex bug in menu clone cleanup
 	[Bug#465324] and removed 'knownBug' from a test.
         (This was applied to cvs head on 2003-05-03).
-	
+
 2003-07-09  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
 	* tests/send.test: Strengthened constraints to stop accidental
@@ -4613,13 +4618,13 @@
 
 2003-05-13  Daniel Steffen  <das@users.sourceforge.net>
 
-	* macosx/tkMacOSXInit.c (TkpInit): use new versioned bundle 
+	* macosx/tkMacOSXInit.c (TkpInit): use new versioned bundle
 	resource API to get tk runtime library for TK_VERSION. [Bug 736774]
 
 2003-05-13  Daniel Steffen  <das@users.sourceforge.net>
 
 	backport of Mac OS X specific changes on trunk since 8.4.2:
-	
+
 	* macosx/tkMacOSXClipboard.c (TkSelGetSelection): Convert
 	'\r' to '\n' on the way into Tcl. (ingham)
 
@@ -4661,7 +4666,7 @@
 	* macosx/tkMacOSXButton.c (TkpDisplayButton): mixture of disabledfg,
 	* unix/tkUnixButton.c (TkpDisplayButton):     selectcolor, indicator,
 	* win/tkWinButton.c (TkpDisplayButton):       etc.  *buttons will
-	now only stipple the image, unless no disabledfg is given, in which 
+	now only stipple the image, unless no disabledfg is given, in which
 	case it will stipple the whole button.
 
 	* library/bgerror.tcl: make bgerror dialog topmost on Windows to
@@ -4703,7 +4708,7 @@
 	* win/rules.vc: Corrected several problems that prevented
 	OPTS=symbols from building properly. [Patch 707792] Thanks
 	to Joe Mistachkin for the fixes.
-	
+
 2003-03-18  Don Porter  <dgp@users.sourceforge.net>
 
 	* tests/unixWm.test (unixWm-41.2): Corrected typo in 2003-03-13
@@ -4734,19 +4739,19 @@
 
 	* win/makefile.vc: Backed the version to 8.4 on the 8.4 branch.
 	(I just loathe sticky tags).
-	
+
 2002-03-11  Kevin Kenny  <kennykb@users.sourceforge.net>
 
 	* win/makefile.vc: Backported the code that makes the makefile
 	build pkgIndex.tcl as part of the install step.
-	
+
 2003-03-03  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	*** 8.4.2 TAGGED FOR RELEASE ***
 
 2003-02-28  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
-	* tests/bind.test (bind-16.44): 
+	* tests/bind.test (bind-16.44):
 	* generic/tkBind.c (ExpandPercents): Only allow events to see
 	those expansions that are actually valid for them, and force the
 	substitution of the rest as "??".  This stops some crashes on
@@ -4772,21 +4777,21 @@
 
 	* macosx/tkMacOSXHLEvents.c: fixed conversion of apple event
 	parameters to posix style path names.
-	[Bug #621672] (steffen, Benjamin Riefenstahl) 
+	[Bug #621672] (steffen, Benjamin Riefenstahl)
 
-	* macosx/tkMacOSXDialog.c: 
+	* macosx/tkMacOSXDialog.c:
 	* macosx/tkMacOSXWm.c:
 	* macosx/Wish.pbproj/project.pbxproj:
 	* macosx/tkMacOSXUtil.c (removed):
 	* macosx/tkMacOSXUtil.h (removed): removed all references to
 	tkMacOSXUtil.{c,h}, made obsolete by the patch above. [Bug #621672]
-	
+
 2003-02-24  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* unix/tkUnixFont.c (CreateClosestFont, CanUseFallback): use the
 	first best font match in user font path. [Bug #647497] (dal zotto)
 
-	* generic/tkListbox.c (ListboxSelectionSubCmd): 
+	* generic/tkListbox.c (ListboxSelectionSubCmd):
 	* tests/listbox.test: Allow 'selection includes' to respond when
 	disabled (but only 'includes'). [Bug #632514]
 
@@ -4808,10 +4813,10 @@
 	* tkMacOSXDialog.c (NavServicesGetFile): Fix bug with
 	kNavCtlSetSelection - control data should be a pointer
 	not a handle.
-	
+
 2003-02-21  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
-	* library/clrpick.tcl (color::BuildDialog): 
+	* library/clrpick.tcl (color::BuildDialog):
 	* library/msgbox.tcl (MessageBox): Yet more places that did
 	complex and fragile width calculations instead of using grid,
 	though with these it is the -uniform option that saves the day.
@@ -4825,8 +4830,8 @@
 	long a file type item description string can get due to appending
 	of types. [Bug #617392]
 
-	* tests/panedwindow.test (panedwindow-30.1): 
-	* generic/tkPanedWindow.c (DisplayPanedWindow, DisplayProxyWindow): 
+	* tests/panedwindow.test (panedwindow-30.1):
+	* generic/tkPanedWindow.c (DisplayPanedWindow, DisplayProxyWindow):
 	Use the window's depth, not the screen's default depth. [Bug #671122]
 
 2003-02-20  Daniel Steffen  <das@users.sourceforge.net>
@@ -4834,7 +4839,7 @@
 	* library/console.tcl: (aqua & macintosh) added missing <Cmd-q>
 	binding for corresponding Quit menu item shortcut.
 
-	* macosx/README: updated instructions for embedded build, 
+	* macosx/README: updated instructions for embedded build,
 	added various improvements by Russell Owen.
 
 	* unix/tcl.m4: update from Tcl.
@@ -4846,7 +4851,7 @@
 	"disable" scrollbar when on Windows when there is nothing to
 	scroll.  This is Windows style, and fixes [Bug #624116].
 
-	* tests/panedwindow.test: 
+	* tests/panedwindow.test:
 	* generic/tkPanedWindow.c (ValidSashIndex): corrected to note that
 	2 panes must exist before any one sash does. [tcllib Bug #689258]
 
@@ -4876,38 +4881,38 @@
 	* macosx/tkMacOSXMouseEvents.c (GeneratePollingEvents): In the case
 	where there was a capture window, we were sending the events to
 	the capture window.  But the capture window (return value or
-	TkMacOSXGetCapture) is always a toplevel.  So this is wrong in 
+	TkMacOSXGetCapture) is always a toplevel.  So this is wrong in
 	the case that the Event's toplevel IS the capture window - in
 	which case the event should go to the subwindow most closely
 	containing the event.
-	
+
 2003-02-19  Benjamin Riefenstahl <Benjamin.Riefenstahl@epost.de>
 	       & Jim Ingham <jingham@apple.com>
 
 	This patch changes the default Tk behavior so that events
 	are by default routed to the standard event handlers after
 	Tk has looked at them.
-	
+
 	* macosx/tkMacOSXEvent.h: Rename "handledByTk" into
 	"stopProcessing".
-	
+
 	* macosx/tkMacOSXEvent.c: Update erroneous comments and
 	remove unused includes.
 	(TkMacOSXProcessAppleEvent): Don't declare events
 	handled that we didn't even look at.
 	(TkMacOSXProcessEvent): Add a comment on policy for
 	"stopProcessing".
-	(TkMacOSXProcessEvent): Remove "handling" of events that	
+	(TkMacOSXProcessEvent): Remove "handling" of events that
 	are not our business.
 	(TkMacOSXProcessEvent): Rename "handledByTk" into
 	"stopProcessing".
 	(ReceiveAndProcessEvent): Ditto.
 	(ReceiveAndProcessEvent): Tune error production of
 	message.
-	
+
 	* macosx/tkMacOSXKeyEvent.c (TkMacOSXProcessKeyboardEvent):
 	Rename "handledByTk" into "stopProcessing".
-	
+
 	* macosx/tkMacOSXWindowEvent.c: Ditto.
 
 	* macosx/tkMacOSXMouseEvent.c: Remove setting of
@@ -4919,7 +4924,7 @@
 
 	This patch changes the key event handling to use the MacOS
 	translation mechanisms.  It also improves dead key handling.
-	
+
 	* macosx/tkMacOSXKeyEvent.c (InitKeyData): Add.
 	(InitKeyEvent): Add.
 	(DecodeViaUnicodeResource): Rename
@@ -4941,17 +4946,17 @@
 	keyboard encoding instead of Tcl Tcl_ExternalToUtf() and fixed
 	TkMacOSXCarbonEncoding.
 	(TkMacOSXKeycodeToUnicode): Add.
-	
+
 	(TkMacOSXProcessKeyboardEvent): Add some heuristics to improve
 	keyup events.
 	(deadKeyState): Split into deadKeyStateUp and deadKeyStateDown.
 	(GenerateKeyEvent): Change interface and implementation to accept
 	a Unicode string instead of individual characters.
 	(GenerateKeyEvent): Don't generate string representations for
-	special characters. 
+	special characters.
 
 	* macosx/tkMacOSXEvent.h (TkMacOSXKeycodeToUnicode): Add
-	prototype. 
+	prototype.
 
 	* macosx/tkMacOSXKeyboard.c (KCHRPtr): Remove.
 	(XKeycodeToKeysym): Use TkMacOSXKeycodeToUnicode instead of
@@ -4961,17 +4966,17 @@
 	This patch reverts the hack to put icons in menus that Vince put
 	in yesterday (but preserves the bug fix in that submission.)
 
-	* macosx/tkMacOSXMenu.c (SetMenuTitle): revert treating 
+	* macosx/tkMacOSXMenu.c (SetMenuTitle): revert treating
 	"<bullet> number" as a request to put icon number <number> in
 	the menu.
-	
+
 2003-02-18  Mo DeJong  <mdejong@users.sourceforge.net>
 
 	* doc/entry.n:
 	* doc/text.n: Update double and triple click
 	docs to match implementation changes made on
 	2002-02-14.
-	
+
 2003-02-19  Daniel Steffen  <das@users.sourceforge.net>
 
 	* macosx/Wish.pbproj/project.pbxproj:
@@ -5057,7 +5062,7 @@
 
 	* doc/wish.n: Added language to describe the handling of
 	the end-of-file character \u001a in script files. [Bug 685505]
-	
+
 2003-02-10  Jim Ingham <jingham@apple.com>
 
 	* macosx/tkMacOSXCursor.c (TkMacOSXInstallCursor): Set all theme
@@ -5068,7 +5073,7 @@
 	* macosx/tkMacOSXMouseEvent.c (GeneratePollingEvents): Don't
 	directly call TkMacOSXInstallCursor, it gets called by the call
 	to Tk_UpdatePointer immediately above.
-	
+
 2003-02-05  Fred Fish  <fnf@intrinsity.com>
 
 	* macosx/tkMacOSXWm.c (Tk_SetGrid): Fix precedence problem with
@@ -5270,12 +5275,12 @@
 2002-11-19  Jim Ingham <jingham@apple.com>
 
 	* macosx/tkMacOSXScrlbr.c (TkpDisplayScrollbar): If the
-	scrollbar width is set to 12 or less (but 12 is what you 
+	scrollbar width is set to 12 or less (but 12 is what you
 	should use) use the small metric scrollbar.
 
 	(UpdateControlValues): Fix thinko in setting off AUTO_ADJUST for
 	the place geometry manager.
-	
+
 2002-11-19  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* unix/Makefile.in: add macosx/*.tcl (buildTkConfig.tcl in
@@ -5354,7 +5359,7 @@
 
 	* macosx/README: added info on new package searching in
 	Frameworks directories.
-	
+
 2002-10-22  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	*** 8.4.1 TAGGED FOR RELEASE ***
@@ -5365,12 +5370,12 @@
 
 	* macosx/README: revised according to Jim's suggestions
 	* macosx/tkMacOSXAppInit.c: use standard PATH_MAX from <limits.h>
-	
+
 2002-10-18  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* win/winMain.c (WinMain, main): remove obsolete SetMessageQueue call
 
-	* win/configure: Regen. 
+	* win/configure: Regen.
 	* win/tcl.m4 (SC_CONFIG_CFLAGS): Check for bug in Cygwin version
 	of windres and work around that case by passing a POSIX path
 	instead of a Windows native path. One can't always pass a POSIX
@@ -5419,7 +5424,7 @@
 
 	* macosx/tkMacOSXMenu.c: fix to accelerators shown in menus
 	with non-alphanumeric keys.
-	* macosx/tkMacOSXKeyEvent.c: 
+	* macosx/tkMacOSXKeyEvent.c:
 	* macosx/tkMacOSXKeyboard.c: applied first patch from [Patch
 	#622582] to fix some of [Bug #616988].  Further work is needed
 	in this area, but this will let foreign keyboards at least work
@@ -5471,7 +5476,7 @@
 2002-10-09  Daniel Steffen  <das@users.sourceforge.net>
 
 	* macosx/Makefile: don't remove tclsh after building embedded.
-	
+
 	* macosx/Wish.pbproj/project.pbxproj: bumped version to 8.4.1;
 	added missing library/mkpsenc.tcl to framework.
 
@@ -5487,9 +5492,9 @@
 	has -container option set (sync with other platforms).
 
 	* mac/tkMacBitmap.c:
-	* mac/tkMacFont.c: 
-	* mac/tkMacSend.c: 
-	* mac/tkMacTest.c: 
+	* mac/tkMacFont.c:
+	* mac/tkMacSend.c:
+	* mac/tkMacTest.c:
 	* mac/tkMacWm.c: CONSTification.
 
 	* mac/tkMacProjects.sea.hqx: added tkStyle.c and tkUndo.c to
@@ -5547,7 +5552,7 @@
 2002-09-30  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* tests/panedwindow.test: added panedwindow-28.[12]
-	* generic/tkPanedWindow.c (PanedWindowCmdDeletedProc): 
+	* generic/tkPanedWindow.c (PanedWindowCmdDeletedProc):
 	(Tk_PanedWindowObjCmd): when destroying the panedwindow, destroy
 	the proxy before the parent to avoid dependency conflicts.
 	[Bug #616589]
@@ -5593,7 +5598,7 @@
 	* win/tcl.m4 (SC_PATH_TCLCONFIG): Support one-tree build.
 	(SC_PATH_TKCONFIG): Likewise.
 	(SC_PROG_TCLSH): Likewise.
-	(SC_CONFIG_CFLAGS): Assume real Cygwin port and remove -mno-cygwin 
+	(SC_CONFIG_CFLAGS): Assume real Cygwin port and remove -mno-cygwin
 	flags.  Add -mwin32 to extra_cflags and extra_ldflags.
 	Remove ``-e _WinMain@16'' from LDFLAGS_WINDOW.
 	* win/configure: Regenerate.
@@ -5618,7 +5623,7 @@
 	Use tcl headers from built Tcl.framework instead of from tcl
 	source directory.
 
-	* macosx/tkMacOSXPort.h: added missing standard unix includes 
+	* macosx/tkMacOSXPort.h: added missing standard unix includes
 	and defines, similarly to tkUnixPort.h.
 	* macosx/tkMacOSXNotify.c: removed dependency on internal tcl
 	header "tclPort.h"
@@ -5662,7 +5667,7 @@
 	* macosx/tkAboutDlg.r:
 	* macosx/tkMacOSXApplication.r:
 	* macosx/tkMacOSXLibrary.r:
-	* macosx/tkMacOSXResource.r: unified use of the two equivalent 
+	* macosx/tkMacOSXResource.r: unified use of the two equivalent
 	resource compiler header inclusion defines RC_INVOKED and
 	RESOURCE_INCLUDED, now use RC_INVOKED throughout.
 
@@ -5757,7 +5762,7 @@
 2002-09-03  Vince Darley  <vincentdarley@users.sourceforge.net>
 
 	* macosx/tkMacOSXWm.c: fix to 'wm attributes' error-handling bug.
-	
+
 2002-09-03  Don Porter <dgp@users.sf.net>
 
 	* changes: Updated for 8.4.0 release
@@ -5822,8 +5827,8 @@
 	distinguish and build both "aqua" on MacOSX and "x11" on MacOSX.
 
 	* generic/tk.h: added a #ifnded RESOURCE_INCLUDED so that tk.h can
-	be passed to the resource compiler. 
-	
+	be passed to the resource compiler.
+
 	* generic/tkCmds.c (Tk_TkObjCmd): added [tk windowingsystem]
 	subcommand: returns "x11" when running on X11, "win32" on Windows,
 	"classic" on MacOS9 and "aqua" on MacOSX Aqua (i.e. Carbon)
@@ -5842,7 +5847,7 @@
 
 	* xlib/xcolors.c: changed xColors static initialization to more
 	standard C
-	
+
 	* macosx/Wish.pbproj/jingham.pbxuser (new):
 	* macosx/Wish.pbproj/project.pbxproj (new): project for Apple's
 	ProjectBuilder IDE.
@@ -5872,7 +5877,7 @@
 	handling functionality.
 
 	* macosx/tkMacOSX.h (new):
-	* macosx/tkMacOSXBitmap.c (new): 
+	* macosx/tkMacOSXBitmap.c (new):
 	* macosx/tkMacOSXButton.c (new):
 	* macosx/tkMacOSXClipboard.c (new):
 	* macosx/tkMacOSXColor.c (new):
@@ -5962,7 +5967,7 @@
 	* generic/tkIntDecls.h:
 	* generic/tkIntPlatDecls.h:
 	* generic/tkIntXlibDecls.h:
-	* generic/tkPlatDecls.h:	
+	* generic/tkPlatDecls.h:
 	* generic/tkStubInit.c: regen
 
 2002-08-27  D. Richard Hipp <drh@hwaci.com>
@@ -5986,7 +5991,7 @@
 	* unix/configure.in:
 	* win/configure.in:
 	* unix/tk.spec:
-	
+
 	* unix/configure:	autoconf
 	* win/configure:
 
@@ -6080,7 +6085,7 @@
 	* doc/GetBitmap.3: removed doc refs to deprecated
 	Tk_GetBitmapFromData. [Bug #590379]
 
-	* generic/tkPanedWindow.c (Tk_PanedWindowObjCmd): 
+	* generic/tkPanedWindow.c (Tk_PanedWindowObjCmd):
 	* library/panedwindow.tcl: changed class from PanedWindow to
 	Panedwindow to not conflict with existing bwidgets, but also to be
 	more regular with other names used in the core.
@@ -6108,7 +6113,7 @@
 
 2002-08-06  Don Porter <dgp@users.sf.net>
 
-	* tests/defs.tcl: removed file.  No longer needed now that Tk is 
+	* tests/defs.tcl: removed file.  No longer needed now that Tk is
 	using the tcltest package to do its testing.
 
 2002-08-05  Don Porter <dgp@users.sf.net>
@@ -6177,7 +6182,7 @@
 	* generic/tkInt.decls:
 	* generic/tkInt.h:
 	* generic/tkIntDecls.h:
-	* generic/tkIntPlatDecls.h:	
+	* generic/tkIntPlatDecls.h:
 	* generic/tkListbox.c:
 	* generic/tkMenu.c:
 	* generic/tkMenubutton.c:
@@ -6349,7 +6354,7 @@
 2002-07-17  Reinhard Max  <max@suse.de>
 
 	* library/unsupported.tcl: Extended ExposePrivateVariable, and
-	ExposePrivateCommand to accept patterns as well.	
+	ExposePrivateCommand to accept patterns as well.
 
 2002-07-17  Don Porter <dgp@users.sf.net>
 
@@ -6370,7 +6375,7 @@
 
 2002-07-16  Vince Darley  <vincentdarley@users.sourceforge.net>
 
-	* win/tkWinWm.c: 
+	* win/tkWinWm.c:
 	* doc/wm.n: fix for part of [Bug 581627], and made iconbitmap
 	code on Windows more flexible about reading in icons [Bug
 	220800].
@@ -6394,7 +6399,7 @@
 	* tests/event.test:	Fixes to enable testing of only userInteraction
 	* tests/visual_bb.test:	tests.
 
-	* README:		Bumped HEAD to version 8.4b2 in order to 
+	* README:		Bumped HEAD to version 8.4b2 in order to
 	* generic/tk.h:		distinguish it from the 8.4b1 release.
 	* unix/configure*:	Also extended LOCALES to cover all message
 	* unix/tk.spec:		catalogs.
@@ -6493,7 +6498,7 @@
 
 	* generic/tkFont.c (TkTextLayoutToPostscript): fixed potential
 	buffer overflow which could be intentionally triggered from
-	within safe interpreter -- malicious applet could modify 
+	within safe interpreter -- malicious applet could modify
 	tk::psglyphs array.
 
 2002-06-26  Anton Kovalenko <a_kovalenko@users.sourceforge.net>
@@ -6619,7 +6624,7 @@
 
 2002-06-21  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
-	* unix/tk.spec (version), README, win/configure.in, unix/configure.in: 
+	* unix/tk.spec (version), README, win/configure.in, unix/configure.in:
 	* generic/tk.h (TK_RELEASE_*, TK_PATCH_LEVEL): Bumped to beta1.
 
 2002-06-21  Jeff Hobbs  <jeffh@ActiveState.com>
@@ -6648,9 +6653,9 @@
 2002-06-20  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* doc/listbox.n:
-	* generic/tkListbox.c (DisplayListbox): 
+	* generic/tkListbox.c (DisplayListbox):
 	* mac/tkMacDefault.h:   TIP #94 implementation adding -activestyle
-	* tests/listbox.test:   option to the listbox.  This adds the ability 
+	* tests/listbox.test:   option to the listbox.  This adds the ability
 	* unix/tkUnixDefault.h: to have listboxes look native on Windows, and
 	* win/tkWinDefault.h:   "nicer" elsewhere using the 'dotbox' style.
 
@@ -6737,7 +6742,7 @@
 	* generic/tk.decls, generic/tk.h: Many declarations forming TIP#48
 	public interface.
 
-	* generic/tkInt.decls (TkStylePkgInit,TkStylePkgFree): 
+	* generic/tkInt.decls (TkStylePkgInit,TkStylePkgFree):
 	* generic/tkInt.h (TkGetOptionSpec): Supporting declarations.
 
 	* unix/Makefile.in, win/Makefile.in, win/makefile.vc: Added
@@ -6772,11 +6777,11 @@
 	* unix/Makefile.in (dist): correct installation of
 	wish.exe.manifest to DISTDIR target directory.
 
-	* generic/tkCmds.c (Tk_TkObjCmd): 
-	* generic/tkInt.h (struct TkCaret): 
-	* mac/tkMacXStubs.c (Tk_SetCaretPos): 
-	* unix/tkUnixKey.c (TkpGetString, Tk_SetCaretPos): 
-	* win/tkWinX.c (Tk_SetCaretPos): 
+	* generic/tkCmds.c (Tk_TkObjCmd):
+	* generic/tkInt.h (struct TkCaret):
+	* mac/tkMacXStubs.c (Tk_SetCaretPos):
+	* unix/tkUnixKey.c (TkpGetString, Tk_SetCaretPos):
+	* win/tkWinX.c (Tk_SetCaretPos):
 	* tests/tk.test:        Added 'tk caret' implementation of TIP#96
 	* doc/SetCaret.3 (new): which adds a TkCaret structure element to
 	* doc/tk.n:             TkDisplay for maintaining state.
@@ -6819,25 +6824,25 @@
 
 2002-06-14  Jeff Hobbs  <jeffh@ActiveState.com>
 
-	* generic/tkBind.c (HandleEventGenerate): 
+	* generic/tkBind.c (HandleEventGenerate):
 	* generic/tkInt.h: changed warpInProgress boolean from int to a
 	bit in the flags variable (TK_DISPLAY_IN_WARP)
 
-	* generic/tkCmds.c (Tk_TkObjCmd): 
-	* unix/tkUnixKey.c (TkpGetString): 
-	* generic/tkEvent.c (Tk_HandleEvent): 
+	* generic/tkCmds.c (Tk_TkObjCmd):
+	* unix/tkUnixKey.c (TkpGetString):
+	* generic/tkEvent.c (Tk_HandleEvent):
 	* generic/tkInt.h: changed useInputMethods boolean from int to a
 	bit in the flags variable (TK_DISPLAY_USE_IM)
 
 	* generic/tkInt.h:
-	* generic/tkCmds.c (Tk_WmObjCmd): 
-	* unix/tkUnixWm.c (Tk_WmCmd): 
+	* generic/tkCmds.c (Tk_WmObjCmd):
+	* unix/tkUnixWm.c (Tk_WmCmd):
 	* win/tkWinWm.c (Tk_WmCmd): changed wmTracing from being an int to
 	just a bit in the flags variable (TK_DISPLAY_WM_TRACING)
 
-	* generic/tkEvent.c (Tk_HandleEvent): 
-	* unix/tkUnixEvent.c (OpenIM): 
-	* unix/tkUnixKey.c (TkpGetString): 
+	* generic/tkEvent.c (Tk_HandleEvent):
+	* unix/tkUnixEvent.c (OpenIM):
+	* unix/tkUnixKey.c (TkpGetString):
 	* generic/tkInt.h: added TK_DISPLAY_XIM_SPOT flag bit for TkDisplay
 	and used this to allow a runtime check to see if over-the-spot XIM
 	is possible.  If not it will try and fallback to the old-style
@@ -6888,7 +6893,7 @@
 	* win/tkWinWindow.c:
 	* win/tkWinWm.c: Implementation of TIP #47 by Neil McKay
 	"Modifying Tk to Allow Writing X Window managers".
-	Add CirculateRequest, Create, MapRequest, ResizeRequest, 
+	Add CirculateRequest, Create, MapRequest, ResizeRequest,
 	and ConfigureRequest event types;
 	Split TK_TOPLEVEL flag into TK_TOPLEVEL, TK_HAS_WRAPPER,
 	TK_WIN_MANAGED, and TK_TOP_HIERARCHY. [Tk patch 572978]
@@ -6907,11 +6912,11 @@
 2002-06-14  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
 	Implement TIP 98  [Tk patch 566765]
-	
+
 	* doc/FindPhoto.3, generic/tk.h, generic/tk.decls:
 	* generic/tkImgPhoto.c: Changed *_Old to *_NoComposite and
 	USE_OLD_PHOTO_PUT_BLOCK to USE_COMPOSITELESS_PHOTO_PUT_BLOCK
-	following a suggestion from Don Porter. 
+	following a suggestion from Don Porter.
 
 	* tests/imgPhoto.test: Added tests of -compositingrule
 
@@ -6926,7 +6931,7 @@
 	maintain total backward-compatability.
 
 	* generic/tk.h (TK_PHOTO_COMPOSITE_*): Defined values for use as
-	compositing rules. 
+	compositing rules.
 	(USE_OLD_PHOTO_PUT_BLOCK): Added a way for users to select the old
 	interface to Tk_PhotoPutBlock to provide an easier upgrade path.
 
@@ -6937,9 +6942,9 @@
 	* generic/tkImgPhoto.c (ImgPhotoCmd): Updated "transparency set"
 	subcommand to use TkSubtractRegion().
 
-	* win/tkWinRegion.c (TkSubtractRegion): 
-	* mac/tkMacRegion.c (TkSubtractRegion): 
-	* generic/tkInt.decls (TkSubtractRegion): 
+	* win/tkWinRegion.c (TkSubtractRegion):
+	* mac/tkMacRegion.c (TkSubtractRegion):
+	* generic/tkInt.decls (TkSubtractRegion):
 	* unix/tkUnixPort.h (TkSubtractRegion): Added function to perform
 	the set-difference operation on regions; it seems all platforms
 	can support it, and it makes removing rectangular bits from
@@ -6985,7 +6990,7 @@
 2002-06-12  Mo DeJong  <mdejong@users.sourceforge.net>
 
 	* changes: Clearly label wm transient changes as
-	a POTENTIAL INCOMPATIBILITY. 
+	a POTENTIAL INCOMPATIBILITY.
 	* doc/wm.n: Remove "some window managers will" text
 	and explicitly state what behavior a transient
 	window will display. Also mention that it is an
@@ -7055,7 +7060,7 @@
 
 2002-06-11  Joe English  <jenglish@users.sf.net>
 
-	* library/menu.tcl: fix for bug report #530212 "Bad Window Path 
+	* library/menu.tcl: fix for bug report #530212 "Bad Window Path
 	  Name in tkMenuFind"
 
 2002-06-10  David Gravereaux <davygrvy@pobox.com>
@@ -7066,8 +7071,8 @@
 
 2002-06-10  Anton Kovalenko <a_kovalenko@users.sourceforge.net>
 
-	* library/tk.tcl: added utility functions to get "-underline" and 
-	"-text" for labels and buttons from translatable string containing 
+	* library/tk.tcl: added utility functions to get "-underline" and
+	"-text" for labels and buttons from translatable string containing
 	"magic ampersand" [patch #566605]
 	* library/clrpick.tcl:
 	* library/msgbox.tcl:
@@ -7077,7 +7082,7 @@
 	* library/msgs/ru.msg: russian translations added
 	* library/msgs/cs.msg:
 	* library/msgs/de.msg:
-	* library/msgs/el.msg: 
+	* library/msgs/el.msg:
 	* library/msgs/es.msg:
 	* library/msgs/fr.msg:
 	* library/msgs/it.msg:
@@ -7103,16 +7108,16 @@
 
 	* library/msgbox.tcl (MessageBox): Add -default normal
 	when creating non-default buttons for message box.
-	They already get -default normal when they're 
+	They already get -default normal when they're
 	unfocused, and dialog window size used to change suddenly
 	in such cases.
 
 2002-06-05  Anton Kovalenko <a_kovalenko@users.sourceforge.net>
 
 	* unix/tkUnixFont.c (Tk_DrawChars): Don't assume that
-	one char is always one byte, and that required 
-	subfont for the last character in any string is 
-	the same as for the previous character 
+	one char is always one byte, and that required
+	subfont for the last character in any string is
+	the same as for the previous character
 	[Bug #559435] [Patch #559437]
 
 2002-05-27  Mo DeJong  <mdejong@users.sourceforge.net>
@@ -7179,7 +7184,7 @@
 	* generic/tkCanvText.c (ComputeTextBbox): Negative
 	coordinates were rounded badly causing a 1 pixel
 	displacement. [Bug #556526]
-	
+
 2002-05-24  Mo DeJong  <mdejong@users.sourceforge.net>
 
 	* mac/tkMacWm.c (Tk_WmCmd):
@@ -7260,8 +7265,8 @@
 	implementations of ButtonLeave to check for Priv(relief) existing
 	before trying to use it. [Patch #541849]
 
-	* generic/tkTextDisp.c (DisplayLineBackground): 
-	* unix/tkUnix3d.c (Tk_3DHorizontalBevel): 
+	* generic/tkTextDisp.c (DisplayLineBackground):
+	* unix/tkUnix3d.c (Tk_3DHorizontalBevel):
 	* unix/tkUnixFont.c (Tk_DrawChars): applied fixes to not overrun
 	the X window 16-bit size limit. [Patch #541999] (bonfield)
 
@@ -7384,7 +7389,7 @@
 	* mac/tkMacAppInit.c: fixes to MSL stdin/stdout hookup to the
 	TkConsole when using shared MSL libraries; fix for crashing
 	bug on exit: writing to stdin/sterr when console has already
-	been destroyed. (both fixes need support in MSL, see 
+	been destroyed. (both fixes need support in MSL, see
 	'CW Pro6 changes' in tcl/mac/tcltkMacBuildSupport.sea.hqx)
 	* mac/tkMacDialog.c: fixes to Navigation Services Dialog filter.
 	* mac/tkMacDraw.c: add panic for overwide TkImages that would
@@ -7406,7 +7411,7 @@
 	also part of correct Accessibility style on Windows to make the
 	magnifier jump to the focus point.
 
-	* win/tkWinButton.c (TkpDisplayButton): 
+	* win/tkWinButton.c (TkpDisplayButton):
 	* generic/tkTextMark.c (TkTextInsertDisplayProc):
 	* generic/tkCanvText.c (DisplayCanvText):
 	* generic/tkEntry.c (DisplayEntry): added Tk_SetCaretPos calls
@@ -7465,13 +7470,13 @@
 
 2002-03-20  Don Porter  <dgp@users.sourceforge.net>
 
-	* generic/tkButton.c (ButtonTextVarProc,ButtonVarProc): 
+	* generic/tkButton.c (ButtonTextVarProc,ButtonVarProc):
 	* generic/tkCmds.c (WaitVariableProc):
 	* generic/tkEntry.c (EntryTextVarProc):
 	* generic/tkListbox.c (ListboxListVarProc):
 	* generic/tkMenu.c (MenuVarProc):
-	* generic/tkMenubutton.c (MenuButtonTextVarProc): 
-	* generic/tkMessage.c (MessageTextVarProc): 
+	* generic/tkMenubutton.c (MenuButtonTextVarProc):
+	* generic/tkMessage.c (MessageTextVarProc):
 	* generic/tkScale.c (ScaleVarProc): Updates to handle change in
 	type of part2 argument of Tcl_VarTraceProc typedef. [TIP 27]
 	[Patch 532644].
@@ -7514,9 +7519,9 @@
 
 2002-03-04  Jeff Hobbs  <jeffh@ActiveState.com>
 
-	* README: 
-	* mac/README: 
-	* unix/README: 
+	* README:
+	* mac/README:
+	* unix/README:
 	* win/README: updated to use www.tcl.tk URL.
 
 2002-03-03  Jeff Hobbs  <jeffh@ActiveState.com>
@@ -7833,14 +7838,14 @@
 
 2002-01-16  Don Porter  <dgp@users.sourceforge.net>
 
-	* generic/tk3d.c (Tk_GetReliefFromObj): 
-	* generic/tkBind.c (Tk_EventObjCmd,HandleEventGenerate): 
-	* generic/tkButton.c (ButtonWidgetObjCmd): 
-	* generic/tkCanvas.c (CanvasWidgetCmd,FindItems): 
-	* generic/tkClipboard.c (Tk_ClipboardObjCmd): 
+	* generic/tk3d.c (Tk_GetReliefFromObj):
+	* generic/tkBind.c (Tk_EventObjCmd,HandleEventGenerate):
+	* generic/tkButton.c (ButtonWidgetObjCmd):
+	* generic/tkCanvas.c (CanvasWidgetCmd,FindItems):
+	* generic/tkClipboard.c (Tk_ClipboardObjCmd):
 	* generic/tkCmds.c (Tk_BellObjCmd, Tk_TkObjCmd, Tk_TkwaitObjCmd,
-	  Tk_UpdateObjCmd, Tk_WinfoObjCmd, Tk_WmObjCmd): 
-	* generic/tkConfig.c (DoObjConfig): 
+	  Tk_UpdateObjCmd, Tk_WinfoObjCmd, Tk_WmObjCmd):
+	* generic/tkConfig.c (DoObjConfig):
 	* generic/tkEntry.c (EntryWidgetObjCmd, SpinboxWidgetObjCmd):
 	* generic/tkFocus.c (Tk_FocusObjCmd):
 	* generic/tkFont.c (Tk_FocusObjCmd, ConfigAttributesObj):
@@ -7857,14 +7862,14 @@
 	  GetListboxIndex):
 	* generic/tkMenu.c (MenuWidgetObjCmd, MenuAddOrInsert, MenuCmd,
 	  ConfigureMenu, CloneMenu):
-	* generic/tkMenubutton.c (MenuButtonWidgetObjCmd): 
-	* generic/tkMessage.c (MessageWidgetObjCmd): 
+	* generic/tkMenubutton.c (MenuButtonWidgetObjCmd):
+	* generic/tkMessage.c (MessageWidgetObjCmd):
 	* generic/tkOption.c (Tk_OptionObjCmd):
 	* generic/tkPack.c (Tk_PackObjCmd, ConfigureSlaves):
 	* generic/tkPlace.c (Tk_PlaceObjCmd):
-	* generic/tkScale.c (ScaleWidgetObjCmd): 
-	* generic/tkSelect.c (Tk_SelectionObjCmd): 
-	* generic/tkSquare.c (SquareWidgetObjCmd): 
+	* generic/tkScale.c (ScaleWidgetObjCmd):
+	* generic/tkSelect.c (Tk_SelectionObjCmd):
+	* generic/tkSquare.c (SquareWidgetObjCmd):
 	* generic/tkTest.c (TestobjconfigObjCmd, TrivialConfigObjCmd,
 	  TestfontObjCmd): Updates to handle change in type of tablePtr
 	argument of Tcl_GetIndexFromObj(Struct) from (char **) to
@@ -7893,7 +7898,7 @@
 	* generic/tkMain.c (Tk_MainEx):  Updated callers of CONSTified
 	Tcl interfaces Tcl_EvalFile and TclGetStartupScriptFileName.
 
-	* generic/tkConsole.c (ConsoleOutputProc, TkConsolePrint):  
+	* generic/tkConsole.c (ConsoleOutputProc, TkConsolePrint):
 	* generic/tkInt.h (TkConsolePrint):
 	* mac/tkMacAppInit.c (TkConsolePrint): Updated Tk's console to
 	CONSTified channel driver interface.  [Tcl Patch 503565, Tk Patch
@@ -7902,7 +7907,7 @@
 2002-01-11  Mo DeJong  <mdejong@users.sourceforge.net>
 
 	Use ${libdir} instead of ${exec_prefix}/lib. [Tcl bug 489370]
-	
+
 	* unix/configure: Regen.
 	* unix/configure.in: Define and use libdir.
 	* win/configure: Regen.
@@ -8002,8 +8007,8 @@
 	* generic/tkButton.c (ButtonTextVarProc): guard against being
 	called while the *button/label is being deleted. [Bug #490051]
 
-	* library/entry.tcl: 
-	* library/spinbox.tcl: 
+	* library/entry.tcl:
+	* library/spinbox.tcl:
 	* library/text.tcl: added extra checks against bug #220269 and
 	made spinbox reuse more of the entry procedure code.
 
@@ -8226,7 +8231,7 @@
 
 	* generic/tkMain.c: MAC_TCL: workaround for broken/non-standard isatty
 	on MW Pro6, #include <unistd.h> instead of defining isatty
-	
+
 	* generic/tkPointer.c: MAC_TCL: #include tkMacInt.h
 
 	* generic/tkStubLib.c: MAC_TCL: removed obsolete special casing of mac
@@ -8238,7 +8243,7 @@
 	* mac/tkMacMenu.c:
 	* mac/tkMacMenus.c:
 	* mac/tkMacFont.c:
-	* mac/tkMacDialog.c: 
+	* mac/tkMacDialog.c:
 	* mac/tkMacButton.c: renamed obsolete apple API names to modern
 	equivalents; UH3.4 support: added #include <ControlDefinitions.h>;
 	fixed munged non-ASCII chars in sources due to bungled latin1<->mac
@@ -8257,13 +8262,13 @@
 	strings, updated version strings to standard usage, added support for
 	'(Support Libraries)' subfolder for shared runtime libraries in
 	unmerged binaries, commented out demo setting of "Tcl Environment
-	Variables"; reorganized resources among these files to avoid 
+	Variables"; reorganized resources among these files to avoid
 	multiple copies in applications and shared libraries, the script
 	libraries/Xcursors etc are now no longer duplicated in Wish but are
 	only included in the resources of Tk.shlb.
 
-	* mac/tkMacMenu.c: 
-	* mac/tkMacMDEF.r: changes to support MW Pro 6 68k (vers 0x2400 only) 
+	* mac/tkMacMenu.c:
+	* mac/tkMacMDEF.r: changes to support MW Pro 6 68k (vers 0x2400 only)
 	compiler producing different offset to start of MDEF; fix to static 68k
 	presence testing when calling the custom MDEF
 
@@ -8296,7 +8301,7 @@
 	This changes the default size of buttons on Windows.
 	[Patch #463234] (nelson)
 		**** POTENTIAL VISUAL INCOMPATABILITY ****
-	
+
 2001-11-16  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* library/menu.tcl: corrected menu traversal code on Unix to
@@ -8397,7 +8402,7 @@
 2001-11-05  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
 	* library/demos/dialog2.tcl: Typo-fix.
-	* library/demos/browse, library/demos/ixset, library/demos/rolodex: 
+	* library/demos/browse, library/demos/ixset, library/demos/rolodex:
 	Installation does version number fixup, so we shouldn't.  Thanks
 	to wohnivec@iol.cz for pointing these (thankfully minor) problems
 	out.
@@ -8519,7 +8524,7 @@
 	* generic/tkGrid.c:
 	* tests/grid.test: Added -uniform option to grid's row/column-
 	configure. [TIP 37] [Patch 459343]
-	
+
 2001-09-26  Peter Spjuth <peter.spjuth@space.se>
 
 	* win/tkWinFont.c (Tk_DrawChars): Added support for clipping text.
@@ -8543,7 +8548,7 @@
 	* tests/pack.test:
 	* tests/place.test: Used labelframe to test geometry manager changes.
 	[TIP 18] [Patch 429164]
-	
+
 2001-09-26  Peter Spjuth <peter.spjuth@space.se>
 
 	* doc/GeomReq.3:
@@ -8563,7 +8568,7 @@
 	Allows a widget to set different internal border widths on
 	different sides, and to set a minimum requested size.
 	POTENTIAL INCOMPATIBILITY.  [Patch 429164]
-	
+
 2001-09-25  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tkBind.c:
@@ -8574,7 +8579,7 @@
 	TkpScanWindowId to handle situation where types Window and int
 	do not have the same number of bits.  CONST-ified too.
 
-	* generic/tkIntPlatDecls.h: 
+	* generic/tkIntPlatDecls.h:
 	* generic/tkStubInit.c: make genstubs
 
 2001-09-24  Don Porter  <dgp@users.sourceforge.net>
@@ -8594,7 +8599,7 @@
 	* win/tkWinWindow.c (TkpPrintWindowId, TkpScanWindowId): fixed to
 	work on Win64 with 64bit XIDs.
 
-	* generic/tkWindow.c (Tk_CreateAnonymousWindow): 
+	* generic/tkWindow.c (Tk_CreateAnonymousWindow):
 	* generic/tkEntry.c (GetSpinboxElement): fixed unreachable returns.
 
 	* win/tkWinX.c (TkGetServerInfo): added recognition of Win64.
@@ -8647,7 +8652,7 @@
 
 2001-09-17  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
-	* library/choosedir.tcl (DblClick): 
+	* library/choosedir.tcl (DblClick):
 	* library/tkfbox.tcl (OkCmd, ListInvoke): Rewrote so as to avoid
 	the highly confusing string "text" and to be consistent about what
 	is and what is not a list.  [Bug 459895, reported by fandom]
@@ -8749,7 +8754,7 @@
 	* generics/tkGrid.c (ConfigureSlaves):
 	* tests/grid.test: Fixed a bug where adjacent 'x' and '^' where
 	not handled properly. [Bug #452040]
-	
+
 2001-08-22  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* generic/tkPack.c (TkParsePadAmount): added lint init for sepChar.
@@ -8798,7 +8803,7 @@
 	* tests/grid.test:
 	* generic/tkGrid.c: Grid configure rejected initial "x" and "^".
 	[Bug #418664]
-	
+
 2001-08-17  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
 	* generic/tkObj.c (TkGetWindowFromObj): Was failing to reuse
@@ -8818,8 +8823,8 @@
 	* generic/tk{Util,Font,Cursor,Color,Bitmap,3d}.c: Modified
 	objtype declarations so that they can be picked up in tkObj.c and
 	the names are now prefixed with "tk" too.
-	* generic/tkObj.c (TkRegisterObjTypes): 
-	* generic/tkWindow.c (Initialize): 
+	* generic/tkObj.c (TkRegisterObjTypes):
+	* generic/tkWindow.c (Initialize):
 	* generic/tkInt.h: Added code to register Tk's object types with
 	the Tcl runtime.  [Tcl Bug 450545]
 
@@ -9167,8 +9172,8 @@
 
 	* library/demos/floor.tcl, library/demos/filebox.tcl,
 	* library/demos/clrpick.tcl, library/demos/vscale.tcl,
-	* library/demos/twind.tcl, library/demos/ruler.tcl, 
-	* library/demos/plot.tcl, library/demos/items.tcl, 
+	* library/demos/twind.tcl, library/demos/ruler.tcl,
+	* library/demos/plot.tcl, library/demos/items.tcl,
 	* library/demos/hscale.tcl, library/demos/ctext.tcl,
 	* library/demos/cscroll.tcl, library/demos/arrow.tcl,
 	* library/xmfbox.tcl, library/msgbox.tcl,
@@ -9182,7 +9187,7 @@
 
 2001-06-03  Jeff Hobbs  <jeffh@ActiveState.com>
 
-	* doc/selection.n: 
+	* doc/selection.n:
 	* doc/clipboard.n: added SEE ALSOs to cross-reference selection
 	and clipboard, with extra note for clipboard command in selection
 	docs.  [Patch #422256]
@@ -9326,10 +9331,10 @@
 	notes.
 
 	* generic/tk.h:
-	* unix/configure.in (TK_PATCH_LEVEL): 
+	* unix/configure.in (TK_PATCH_LEVEL):
 	* unix/configure:
 	* unix/tk.spec:
-	* win/configure.in (TK_PATCH_LEVEL): 
+	* win/configure.in (TK_PATCH_LEVEL):
 	* win/configure: updated patchlevel to 8.4a3
 
 2001-03-30  Jeff Hobbs  <jeffh@ActiveState.com>
@@ -9346,7 +9351,7 @@
 	* win/tkWinKey.c:
 	* win/tkWinX.c: added support for changing IME on the fly in
 	Windows (2000).  (lam) [Patch #402993]
-	
+
 	* tests/bind.test (bind-22.18):
 	* generic/tkBind.c (NameToWindow): handled the error case where a
 	valid-looking but invalid identifier could be passed in certain
@@ -9431,8 +9436,8 @@
 2001-03-08  Don Porter  <dgp@users.sourceforge.net>
 
 	BRANCH dgp-privates-into-namespace:
-	* generic/tkTextDisp.c: 
-	* library/unsupported.tcl: 
+	* generic/tkTextDisp.c:
+	* library/unsupported.tcl:
 	* tests/textDisp.test: Restored the global variables tk_textRedraw
 	and tk_textRelayout.  Since they match tk_*, they should remain
 	publicly available until at least Tk 9.
@@ -9495,7 +9500,7 @@
 	* tests/xmfbox.test:
 	* unix/tkUnixDialog.c:  All Tk commands matching ::tk[A-Z]* and
 	all Tk private variables in the global namespace were renamed to
-	live in the namespace ::tk or one of its children.  
+	live in the namespace ::tk or one of its children.
 
 2001-02-13  Eric Melski  <ericm@interwoven.com>
 
@@ -9524,7 +9529,7 @@
 	* win/tkWinWm.c (TkWmNewWindow, UpdateWrapper, TkWmDeadWindow, Tk_WmCmd):
 	  Added initialization and handling of the new fields.
 	* doc/wm.n: Documentation updated to explain the newly available
-	  functionality. 
+	  functionality.
 
 2000-12-13  jeff hobbs  <jhobbs@interwoven.com>
 
@@ -9548,14 +9553,14 @@
 
 2000-11-28  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
-	* doc/image.n: 
+	* doc/image.n:
 	* generic/tkImage.c (Tk_ImageObjCmd): Backed out previous change.
 	  Bug #120819 is back again in force.  Left the test in there
 	  though.
 
 2000-11-23  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
-	* doc/image.n: 
+	* doc/image.n:
 	* tests/image.test (image-1.10):
 	* generic/tkImage.c (Tk_ImageObjCmd): Prohibited image names that
 	  start with "." since they can cause some really obscure
@@ -9605,7 +9610,7 @@
 	* generic/tkDecls.h:
 	* generic/tkStubInit.c:
 	* generic/tkIntDecls.h: Regenned from tk.decls, tkInt.decls.
-	
+
 	* generic/tk.h: Added declaration of Tk_ClassProcs, with size
 	field.  Added typedef's for Tk_ClassCreateProc,
 	Tk_ClassWorldChangedProc, Tk_ClassModalProc.  Added definition of
@@ -9694,7 +9699,7 @@
 	Removed CommDlgExtendedError() checks for color and choosedir
 	dialogs, and removed all except the explicit invalid filename
 	checks for the file dialogs.
-	
+
 2000-10-30  David Gravereaux  <davygrvy@ajubasolutions.com>
 
 	* win/configure.in:
@@ -9702,7 +9707,7 @@
 	* win/makefile.vc:
 	* win/rc/tk.rc:
 	* win/rc/tk_base.rc (new):
-	* win/rc/wish.rc: Added logic to derive filenames better in the 
+	* win/rc/wish.rc: Added logic to derive filenames better in the
 	resource scripts based on compile options along with better
 	support for building a static wish shell with cursor resources.
 
@@ -9710,7 +9715,7 @@
 
 	* unix/tcl.m4: added support for AIX-5.
 
-	* tests/tk.test: 
+	* tests/tk.test:
 	* doc/tk.n: updated to reflect default on status of useinputmethods.
 	* library/tk.tcl: tk useinputmethods is set to 1 by default.  This
 	enables Kanji and dead-char input by default.  Intro'd in
@@ -9725,7 +9730,7 @@
 	* win/tkWinDraw.c (RenderObject): Applied patch from [Bug: 6368],
 	which corrects rendering of 1-pixel wide stippled lines on Windows.
 
-	* generic/tkCanvLine.c (DisplayLine): Applied patch from 
+	* generic/tkCanvLine.c (DisplayLine): Applied patch from
 	[Bug: 6368], corrects bugs relating to use of active- and
 	disabledwidth values for displaying lines (disabledwidth was never
 	used, and activewidth/disablewidths would only possibly be used
@@ -9736,7 +9741,7 @@
 	which adds safety for directory names containing spaces or which
 	are non-lists.
 
-	* win/tkWinDialog.c (GetFileNameW, GetFileNameA, 
+	* win/tkWinDialog.c (GetFileNameW, GetFileNameA,
 	Tk_ChooseColorObjCmd, Tk_ChooseDirectoryObjCmd): Added error
 	checking for the return value from the common dialog functions, so
 	that the commands will not silently fail if the common dialog
@@ -9762,7 +9767,7 @@
 
 	* doc/CrtWindow.3: Added entry for Tk_CreateAnonymousWindow.
 
-	* generic/tkWindow.c 
+	* generic/tkWindow.c
 	(Tk_CreateAnonymousWindow): New API for creating anonymous
 	windows.  These windows are manipulable from C, but not from Tcl,
 	because they have no pathname associated with them.  They are used
@@ -9772,7 +9777,7 @@
 	(Tk_DestroyWindow): Added check for TK_ANONYMOUS_WINDOW flag when
 	determining whether to generate a DestroyNotify event.
 
-	* generic/tkStubInit.c: 
+	* generic/tkStubInit.c:
 	* generic/tkDecls.h: Regen'd from tk.decls.
 
 	* generic/tk.decls: Added Tk_CreateAnonymousWindow declaration.
@@ -9835,7 +9840,7 @@
 	* generic/tkTest.c: Fixed tests to use updated API.
 
 	* doc/SetOptions.3:
-	* generic/tk.h: 
+	* generic/tk.h:
 	* generic/tkConfig.c: Changed interface for Tk_CustomOptionSetProc
 	and Tk_CustomOptionGetProc; these now take a pointer to the start
 	of the widget record, and an integer offset to the slot for the
@@ -9875,7 +9880,7 @@
 
 2000-09-06  Eric Melski  <ericm@ajubasolutions.com>
 
-	* doc/HWNDToWindow.3: 
+	* doc/HWNDToWindow.3:
 	* doc/GetHWND.3: Changed synopsis to indicate the tkPlatDecls.h
 	should be included, not tk.h.
 
@@ -9908,8 +9913,8 @@
 
 2000-09-01  Eric Melski  <ericm@ajubasolutions.com>
 
-	* win/makefile.vc (install-libraries): 
-	* win/Makefile.in (install-libraries): 
+	* win/makefile.vc (install-libraries):
+	* win/Makefile.in (install-libraries):
 	* unix/Makefile.in (install-libraries): Added tkPlatDecls.h to
 	list of header files to install.
 
@@ -9919,7 +9924,7 @@
 2000-08-29  Eric Melski  <ericm@ajubasolutions.com>
 
 	* win/tkWinMenu.c (DrawWindowsSystemBitmap): Use scratchDC
-	for determining the source's logical coordinates.  Patch from 
+	for determining the source's logical coordinates.  Patch from
 	[Bug: 6134 (Markus Oberhumer)].
 
 	* win/tkWinMenu.c (SetDefaults): Compute the indicatorDimensions[]
@@ -9935,21 +9940,21 @@
 
 2000-08-24  Eric Melski  <ericm@ajubasolutions.com>
 
-	* doc/toplevel.n: 
-	* doc/spinbox.n: 
-	* doc/scrollbar.n: 
-	* doc/scale.n: 
-	* doc/menubutton.n: 
-	* doc/menu.n: 
-	* doc/listbox.n: 
-	* doc/entry.n: 
-	* doc/frame.n: 
-	* doc/message.n: 
-	* doc/checkbutton.n: 
-	* doc/radiobutton.n: 
-	* doc/button.n: 
-	* doc/label.n: 
-	* doc/canvas.n: 
+	* doc/toplevel.n:
+	* doc/spinbox.n:
+	* doc/scrollbar.n:
+	* doc/scale.n:
+	* doc/menubutton.n:
+	* doc/menu.n:
+	* doc/listbox.n:
+	* doc/entry.n:
+	* doc/frame.n:
+	* doc/message.n:
+	* doc/checkbutton.n:
+	* doc/radiobutton.n:
+	* doc/button.n:
+	* doc/label.n:
+	* doc/canvas.n:
 	* doc/text.n: Fixed Standard Options section to make best use of
 	new tab settings in man.macros.
 
@@ -9958,7 +9963,7 @@
 	* unix/README: Update to account for removal of --enable-gcc.
 	* unix/configure.in:
 	* unix/tcl.m4 (SC_ENABLE_GCC): Remove --enable-gcc option.
-	* win/configure.in: 
+	* win/configure.in:
 	* win/tcl.m4 (SC_ENABLE_GCC): Remove --enable-gcc option.
 	Remove quick hack that provided cross compile support for
 	windows builds.
@@ -10054,7 +10059,7 @@
 	* generic/tkInt.h: Removed Tk_AfterCmd function prototype; the
 	function does not exist (since 4.0p3).  Cleaned up some line
 	wrapping.
-	
+
 	* generic/tk.h: Removed "#define Tk_AfterCmd Tcl_AfterCmd";
 	nothing in the core uses Tk_AfterCmd, and Tcl_AfterCmd doesn't exist
 	anymore anyway.
@@ -10133,7 +10138,7 @@
 	* doc/label.n: Added -disabledforeground to list of options [Bug:
 	6053].
 
-	* mac/tkMacDefault.h: 
+	* mac/tkMacDefault.h:
 	* unix/tkUnixDefault.h: Added default values for listbox
 	disabledforeground and state.
 
@@ -10156,7 +10161,7 @@
 	in win/tkConfig.sh, fix that.
 
 2000-07-25  Joe English  <jenglish@flightlab.com>
-	* doc: CanvPsY.3, ConfigWidg.3, CrtImgType.3, CrtItemType.3, 
+	* doc: CanvPsY.3, ConfigWidg.3, CrtImgType.3, CrtItemType.3,
 	FontId.3, GetFont.3, canvas.n, font.n, options.n, text.n:
 	Documentation fix: Replaced references to XFontStruct *
 	and Tk_FontStruct with Tk_Font.
@@ -10213,9 +10218,9 @@
 
 	* unix/configure.in: Properly quote LOCALES variable. Properly quote
 	argument to m4 macro.
-	
+
 	* unix/tcl.m4: Add updated file from tcl.
-	
+
 	* win/tcl.m4: Updated file from tcl.
 
 2000-07-18  Eric Melski  <ericm@ajubasolutions.com>
@@ -10224,7 +10229,7 @@
 
 	* unix/configure.in (MAKE_LIB): Corrected definition of MAKE_LIB
 	for shared builds, with patch from Mike Hopkirk.
-	
+
 2000-07-18  Mo DeJong  <mdejong@redhat.com>
 
 	* win/Makefile.in: Fix TCL_GENERIC_DIR variable
@@ -10245,7 +10250,7 @@
 	useNewImage to 0 when the new image system is not to be used,
 	instead of leaving it at -1, which causes the check to be
 	performed more times than is really necessary.
-	
+
 	* library/bgerror.tcl: Fixed a typo in one of the bgerror dialog
 	label.
 
@@ -10271,16 +10276,16 @@
 	Remove unused declarations.
 	* win/tkWinColor.c (GetColorByName, GetColorByValue): Remove unused
 	function declarations.
-	* win/tkWinDialog.c (TrySetDirectory): Remove unused function 
+	* win/tkWinDialog.c (TrySetDirectory): Remove unused function
 	declaration.
-	* win/tkWinEmbed.c (TkWinEmbeddedEventProc): Cast to match function 
+	* win/tkWinEmbed.c (TkWinEmbeddedEventProc): Cast to match function
 	prototype.
 	* win/tkWinMenu.c (winMenuMutex, MenuExitProc): Remove unused
 	declaration.
 	* win/tkWinWindow.c (StackWindow): Remove unused declaration.
 	* win/tkWinWm.c (ConfigureEvent): Remove unused declaration.
 	* win/tkWinX.c (winXMutex): Remove unused declaration.
-	* xlib/ximage.c (XCreateBitmapFromData): Cast to match function 
+	* xlib/ximage.c (XCreateBitmapFromData): Cast to match function
 	prototype.
 
 2000-07-05  Eric Melski  <ericm@ajubasolutions.com>
@@ -10300,7 +10305,7 @@
 
 2000-06-30  Eric Melski  <ericm@scriptics.com>
 
-	* doc/keysyms.n: 
+	* doc/keysyms.n:
 	* doc/colors.n: Added extra .CE/.CS pairs to break up the large
 	text block, so that the generated Windows help file could
 	accomodate the manual entry. [Bug: 5862]
@@ -10319,15 +10324,15 @@
 2000-06-29  Eric Melski  <ericm@scriptics.com>
 
 	* library/msgs/de.msg: German message catalog.
-	
+
 	* library/msgs/en.msg: English message catalog.
 
 	* library/msgs/es.msg: Spanish message catalog.
 
 	* library/msgs/fr.msg: French message catalog.
 
-	* unix/Makefile.in: 
-	* unix/configure.in: 
+	* unix/Makefile.in:
+	* unix/configure.in:
 	* library/tk.tcl:
 	* library/clrpick.tcl:
 	* library/choosedir.tcl:
@@ -10335,7 +10340,7 @@
 	* library/msgbox.tcl:
 	* library/tkfbox.tcl:
 	* library/xmfbox.tcl:
-	* library/bgerror.tcl: Applied patches from Laurent Duperval to 
+	* library/bgerror.tcl: Applied patches from Laurent Duperval to
 	provide localization of Tk dialogs. [RFE: 2671].
 
 2000-06-27  Eric Melski  <ericm@scriptics.com>
@@ -10378,8 +10383,8 @@
 
 2000-06-13  Eric Melski  <ericm@scriptics.com>
 
-	* win/aclocal.m4: 
-	* win/configure.in: 
+	* win/aclocal.m4:
+	* win/configure.in:
 	* win/Makefile.in: Applied patch from [RFE: 5844], to provide
 	support for the mingw compile environment for Windows.
 
@@ -10485,10 +10490,10 @@
 	* win/Makefile.in (install-libraries): corrected to install X
 	headers [Bug: 5516]
 
-	* doc/bind.n: 
-	* doc/canvas.n: 
-	* doc/entry.n: 
-	* doc/listbox.n: 
+	* doc/bind.n:
+	* doc/canvas.n:
+	* doc/entry.n:
+	* doc/listbox.n:
 	* doc/photo.n: doc fix-ups [Bug: 5396]
 
 2000-05-17  Jeff Hobbs  <hobbs@scriptics.com>
@@ -10554,8 +10559,8 @@
 	* generic/tk.h: Added TK_RELIEF_NULL definition, removed
 	TK_RELIEF_LINK.
 
-	* mac/tkMacDefault.h (DEF_BUTTON_OVER_RELIEF): 
-	* win/tkWinDefault.h (DEF_BUTTON_OVER_RELIEF): 
+	* mac/tkMacDefault.h (DEF_BUTTON_OVER_RELIEF):
+	* win/tkWinDefault.h (DEF_BUTTON_OVER_RELIEF):
 	* unix/tkUnixDefault.h (DEF_BUTTON_OVER_RELIEF): Added default
 	value for the -overrelief option.
 
@@ -10610,9 +10615,9 @@
 
 2000-05-12  Eric Melski  <ericm@scriptics.com>
 
-	* unix/tkUnixButton.c (TkpDisplayButton, TkpComputeButtonGeometry): 
-	* mac/tkMacButton.c (TkpDisplayButton, TkpComputeButtonGeometry): 
-	* win/tkWinButton.c (TkpDisplayButton, TkpComputeButtonGeometry): 
+	* unix/tkUnixButton.c (TkpDisplayButton, TkpComputeButtonGeometry):
+	* mac/tkMacButton.c (TkpDisplayButton, TkpComputeButtonGeometry):
+	* win/tkWinButton.c (TkpDisplayButton, TkpComputeButtonGeometry):
 	Added code for drawing compound buttons.
 
 	* tests/button.test: Added configuration tests for -repeatdelay,
@@ -10670,11 +10675,11 @@
 
 	* generic/tk3d.c: Added support for link relief. [RFE: 4348]
 
-	* mac/tkMacButton.c (TkpDisplayButton): 
+	* mac/tkMacButton.c (TkpDisplayButton):
 	* unix/tkUnixButton.c (TkpDisplayButton): Added support for link
 	relief. [RFE: 4348]
 
-	* generic/tkOldConfig.c (Tk_ConfigureWidget): 
+	* generic/tkOldConfig.c (Tk_ConfigureWidget):
 	* generic/tkConfig.c (DoObjConfig): Added understanding of link
 	relief, which is allowed only for widgets that have
 	TK_OPTION_LINK_OK or TK_CONFIG_LINK_OK set for the "-relief"
@@ -10749,19 +10754,19 @@
 
 	* generic/tkMain.c: Fixed function header comment for Tk_MainEx.
 
-	* unix/mkLinks: 
+	* unix/mkLinks:
 	* doc/GetScroll.3: Added information about Tk_GetScrollInfoObj
 	[Bug: 1866].
 
 2000-04-24  Eric Melski  <ericm@scriptics.com>
 
-	* unix/mkLinks: 
+	* unix/mkLinks:
 	* doc/Grab.3: Man page for Tk_Grab and Tk_Ungrab [Bug: 1868, 1889]
 
-	* unix/mkLinks: 
+	* unix/mkLinks:
 	* doc/MainWin.3: Added entry for Tk_GetNumMainWindows [Bug: 1865].
 
-	* unix/mkLinks: 
+	* unix/mkLinks:
 	* doc/GetHINSTANCE.3: Man page for Tk_GetHINSTANCE [Bug: 1862].
 
 2000-04-24  Jeff Hobbs  <hobbs@scriptics.com>
@@ -10785,18 +10790,18 @@
 
 2000-04-24  Eric Melski  <ericm@scriptics.com>
 
-	* unix/mkLinks: 
+	* unix/mkLinks:
 	* doc/GetHWND.3: Man page for Tk_GetHWND [Bug: 1863].
 
-	* unix/mkLinks: 
+	* unix/mkLinks:
 	* doc/HWNDToWindow.3: Man page for Tk_HWNDToWindow [Bug: 1869].
 
-	* unix/mkLinks: 
+	* unix/mkLinks:
 	* doc/AddOption.3: Man page for Tk_AddOption [Bug: 1854]
 
 2000-04-22  Jim Ingham	<jingham@cygnus.com>
 
-	* mac/tkMacDialog.c (Tk_MacGetOpenFile): Add empty bodies for the 
+	* mac/tkMacDialog.c (Tk_MacGetOpenFile): Add empty bodies for the
 	"-initialfile" and "-defaultextension" options.
 
 	* mac/tkMacDialog.c (NavServicesGetFile): Only cons the result up
@@ -10812,15 +10817,15 @@
 
 2000-04-19  Eric Melski  <ericm@scriptics.com>
 
-	* doc/WinViewable.3: 
+	* doc/WinViewable.3:
 	* unix/mkLinks: Removed docs for Tk_IsViewable.
 
 	* win/tkWinDialog.c: Removed calls to Tk_IsViewable.
 
-	* generic/tkUtil.c: 
-	* generic/tkStubInit.c: 
-	* generic/tkDecls.h: 
-	* generic/tkCmds.c: 
+	* generic/tkUtil.c:
+	* generic/tkStubInit.c:
+	* generic/tkDecls.h:
+	* generic/tkCmds.c:
 	* generic/tk.decls: Removed Tk_IsViewable function (it was not
 	actually needed).
 
@@ -10900,7 +10905,7 @@
 
 	* tests/msgbox.test: Added tests for patch from [Bug: 4997].
 
-	* library/msgbox.tcl: 
+	* library/msgbox.tcl:
 	* library/dialog.tcl: Applied patch from [Bug: 4997]; detaches
 	dialog window from parent if parent is not viewable.
 
@@ -10911,8 +10916,8 @@
 	function to determine visibility of windows instead of inlining
 	the code.
 
-	* generic/tkStubInit.c: 
-	* generic/tkDecls.h: 
+	* generic/tkStubInit.c:
+	* generic/tkDecls.h:
 	* generic/tk.decls: Added Tk_IsViewable declaration.
 
 2000-04-17  Eric Melski  <ericm@scriptics.com>
@@ -10934,7 +10939,7 @@
 	checkbuttons/commands/radiobuttons in menubars [Bug: 630].
 
 	* tests/grid.test: Added test for [grid propagate . 0] to not toggle.
-	
+
 	* generic/tkGrid.c: Fixed bogus logic in [grid propagate] that
 	caused [grid propagate . 0] to act as a toggle instead of an
 	absolute set. [Bug: 2286].
@@ -11020,7 +11025,7 @@
 	the widget background.  Now, we draw the separators ourselves (as
 	we do with every other kind of menu item already). [Bug: 1166].
 
-	* win/tkWin3d.c: 
+	* win/tkWin3d.c:
 	* unix/tkUnix3d.c: Applied patch from [RFE: 2501]: adds more
 	sophisticated smarts to TkpGetShadows, so that the highlight of a
 	very bright color is actually distinguishable from the color, and
@@ -11049,7 +11054,7 @@
 
 	* msgcat.test: Added tests for new behavior from patch in [Bug:
 	4158].
-	
+
 	* msgcat.tcl: Applied patch from [Bug: 4158], which enables
 	msgcat::mc to search the entire namespace ancestry chain for
 	message translations (ie, first it checks the current namespace,
@@ -11075,12 +11080,12 @@
 	* tests/choosedir.test: Changed "namespace import ::tcltest" to
 	"namespace import -force ::tcltest".
 
-	* win/tkWinKey.c: 
-	* unix/tkUnixKey.c: 
+	* win/tkWinKey.c:
+	* unix/tkUnixKey.c:
 	* mac/tkMacKeyboard.c: Changed InitKeymapInfo to
 	TkpInitKeymapInfo. [Bug: 4611].
 
-	* generic/tkStubInit.c: 
+	* generic/tkStubInit.c:
 	* generic/tkIntDecls.h: Re-gen'd from tkInt.decls.
 
 	* generic/tkInt.decls: Added TkpInitKeymapInfo to list of function
@@ -11153,7 +11158,7 @@
 
 	* win/tkWinInt.h:
 	* win/tkWinX.c:
-	* win/tkWinDraw.c (SetUpGraphicsPort): 
+	* win/tkWinDraw.c (SetUpGraphicsPort):
 	* win/tkWinScrlbr.c (UpdateScrollbar): removed use of tkpIsWin32s
 
 	* win/tkWinInt.h (TkWinDCState struct): added bkmode value
@@ -11195,7 +11200,7 @@
 
 2000-03-24  Eric Melski  <ericm@scriptics.com>
 
-	* tests/filebox.test: 
+	* tests/filebox.test:
 	* tests/choosedir.test: Updated tests.
 
 	* library/xmfbox.tcl: Updated to stash data array in
@@ -11209,7 +11214,7 @@
 	anybody (the tk_getOpenFile and tk_getSaveFile commands still
 	exist at the global scope).
 
-	* library/tk.tcl: 
+	* library/tk.tcl:
 	* library/tclIndex: Updated function names for tkFDialog*
 	functions and choosedir functions.
 
@@ -11218,7 +11223,7 @@
 
 2000-03-23  Eric Melski  <ericm@scriptics.com>
 
-	* generic/tkWindow.c: 
+	* generic/tkWindow.c:
 	* generic/tkInt.h: Updated Tcl_OptionCmd -> Tcl_OptionObjCmd
 
 	* generic/tkOption.c: Tcl_Obj'ectified the "option" command.
@@ -11251,12 +11256,12 @@
 2000-03-08  Eric Melski  <ericm@scriptics.com>
 
 	* tests/choosedir.test: Modified test 3.1 (-mustexist works) to be
-	more careful about cleaning up its potentially troublesome after 
+	more careful about cleaning up its potentially troublesome after
 	events.
 
 2000-03-07  Eric Melski  <ericm@scriptics.com>
 
-	* tests/button.test: 
+	* tests/button.test:
 	* generic/tkButton.c: Added -disabledforeground/-state to labels.
 
 2000-03-07  Jeff Hobbs  <hobbs@scriptics.com>
@@ -11320,7 +11325,7 @@
 
 2000-03-01  Eric Melski  <ericm@scriptics.com>
 
-	* tests/clrpick.test: 
+	* tests/clrpick.test:
 	* library/clrpick.tcl: Added code to make color chooser dialog
 	inherit screen setting from parent (bug #2334)
 
@@ -11392,7 +11397,7 @@
 	* mac/tkMacButton.c: Stop removing the appearance window from the
 	Window List.  It is not clear why Ray did this, and it causes the
 	Appearance manager to crash at random times.
-	
+
 	* mac/tkMacWM.c: Add support in unsupported1 style for the Appearance
 	specification of window styles, including floating window support.
 	* mac/tkMacWindowMgr.c: Operate on the front non-floating window,
@@ -11400,18 +11405,18 @@
 	keystrokes go to the front non-floating window.
 	* mac/tkMacAppInit.c: Initialize floating window support.
 	* mac/tkMacScrlbr.c:
-	* mac/tkMacmenu.c: Fixes for floating windows - operate on the 
+	* mac/tkMacmenu.c: Fixes for floating windows - operate on the
 	FrontNonFloatingWindow.
 	* mac/tkMacLibrary.r: Fix typo in File info string.
 	* mac/tkMacApplication.r: Fix typo in file info string.  Add
 	Finder balloon help for no apparent reason.
-	
+
 	* mac/tkMacSubwindows.c: Change panic in tkMacGetDrawablePort to
 	Debugger.  This is only a temporary fix.  The panic is only
 	triggered when a safeTk interpreter is torn down, and ignoring it
 	does no harm.  I haven't figured out how to avoid it yet, however.
 	Also use the Appearance MoveWindowStructure call when available.
-	
+
 	New Files:
 	* MW_TkOldImageHeader.h: Handle #defining USE_OLD_IMAGE for tkImgPPM.c.
 	* MW_TkTestHeader.h:
@@ -11419,16 +11424,16 @@
 	* MW_TkHeader.h: Add separate prefix files for test & release
 	versions of Tk, so we can just have separate targets w/o having to
 	edit files.
-	
+
 	* tclets.r: The D&D Tclets icon in rez form so we can have a
 	target for this.
 
 	The above are curtesy of Daniel Steffen (steffen@math.mq.edu.au)
-	
+
 	* tkMacAppearanceStubs.c: Stubs of the Mac Appearance calls I use
 	so I can link the static 68K Shell without putting ifdef's all
 	over the code.
-	
+
 2000-02-08  Jeff Hobbs  <hobbs@scriptics.com>
 
 	* generic/tk.decls:
@@ -11443,7 +11448,7 @@
 	Split functions into platform specific files:
 	Static functions GetKeySym(), SetKeycodeAndState() and InitKeymapInfo()
 	from tkBind.c moved into platform files tkWinKey.c tkUnixKey.c and
-	tkMacKeyboard.c.  GetKeySym() and SetKeycodeAndState() renamed to 
+	tkMacKeyboard.c.  GetKeySym() and SetKeycodeAndState() renamed to
 	Tkp* and made public (as private functions) in tkInt.decls.
 
 	Step 2, fixes in tkWinKey.c
@@ -11477,7 +11482,7 @@
 	* generic/tk.h: moved new public functions created in dash patch
 	to the stubs interface [Bug: 4062]
 
-	* generic/tk.h: 
+	* generic/tk.h:
 	* doc/CrtImgType.3:
 	* doc/CrtPhImgFmt.3:
 	* generic/tk.h:
@@ -11527,7 +11532,7 @@
 	huge number, instead of 0; this was interfering with things like
 	the canvas find enclosed feature. (bug #2525).
 
-	* tests/text.test: 
+	* tests/text.test:
 	* generic/tkText.c (DumpLine/DumpSegment): Changed DumpSegment to
 	take a TkTextIndex instead of two integer offsets, so that it
 	could use TkTextPrintIndex to format the offsets into an index,
@@ -11535,8 +11540,8 @@
 
 2000-02-01  Eric Melski  <ericm@scriptics.com>
 
-	* library/tk.tcl: 
-	* library/tclIndex: 
+	* library/tk.tcl:
+	* library/tclIndex:
 	* library/choosedir.tcl: Moved choosedir functions into the
 	::tk::dialog::chooseDir namespace instead of a toplevel
 	::tkChooseDirectory namespace.  Additional cleanup on the
@@ -11559,9 +11564,9 @@
 	correct for possible loss of control in parent Tk toplevel
 	[Bug: 1212 et al]
 
-	* generic/tkRectOval.c (ConfigureRectOval): 
-	* generic/tkCanvLine.c (ConfigureLine): 
-	* generic/tkCanvPoly.c (ConfigurePoly): 
+	* generic/tkRectOval.c (ConfigureRectOval):
+	* generic/tkCanvLine.c (ConfigureLine):
+	* generic/tkCanvPoly.c (ConfigurePoly):
 	* generic/tkCanvArc.c (Configure/DisplayArc): fixed handling for
 	negative dash values [Bug: 4104]
 
@@ -11578,7 +11583,7 @@
 
 2000-01-27  Eric Melski  <ericm@scriptics.com>
 
-	* generic/tkImgPhoto.c: Removed unneccesary object translation in 
+	* generic/tkImgPhoto.c: Removed unneccesary object translation in
 	MatchStringFormat (bug #4103).
 
 2000-01-27  Eric Melski  <ericm@scriptics.com>
@@ -11588,11 +11593,11 @@
 
 2000-01-26  Eric Melski  <ericm@scriptics.com>
 
-	* doc/getOpenFile.n: 
+	* doc/getOpenFile.n:
 	* doc/chooseDirectory.n: Man page/cross links for
 	tk_chooseDirectory (bug #1786).
 
-	* library/tk.tcl: 
+	* library/tk.tcl:
 	* library/tclIndex: Added hooks for tk_chooseDirectory. (bug #1786)
 
 	* library/choosedir.tcl: tk_chooseDirectory implementation for
@@ -11617,7 +11622,7 @@
 	values for error message boxes displayed by the file dialog (bug
 	#3616).
 
-	* tests/text.test: 
+	* tests/text.test:
 	* generic/tkText.c: Fixed bug relating to regexp searching for
 	empty lines; previously, the starting line was ignored. (bug #1643).
 
@@ -12007,7 +12012,7 @@
 1999-12-01  Scott Redman <redman@scriptics.com>
 
 	* generic/tkMain.c :
-	* unix/tkAppInit.c: 
+	* unix/tkAppInit.c:
 	* win/winMain.c: Added added hooks into the main() code for
 	supporting TclPro and other "big" shells more easily without
 	requiring a copy of the main() code.
@@ -12112,8 +12117,8 @@
 	* tests/listbox.test: Fixed tests to comply with new objectified
 	error messages.  No -listvar specific tests yet.
 
-	* win/tkWinDefault.h: 
-	* unix/tkUnixDefault.h: 
+	* win/tkWinDefault.h:
+	* unix/tkUnixDefault.h:
 	* mac/tkMacDefault.h: Added default value for -listvar option.
 
 	* generic/tkWindow.c: Changed "listbox" mapping from old-school to
@@ -12261,8 +12266,8 @@
 	* mac/tkMacMenu.c: Tk_DrawChars ends up setting the menu background
 	wrong.	There is no clean way to stop it, so I use lower level routines
 	here to draw the text.
-	* mac/tkMacProjects.sea.hqx: Rearrange the projects so that the build 
-	directory is separate from the sources.  Much more convenient! 
+	* mac/tkMacProjects.sea.hqx: Rearrange the projects so that the build
+	directory is separate from the sources.  Much more convenient!
 
 1999-08-10  Jeff Hobbs  <hobbs@scriptics.com>
 
@@ -12293,7 +12298,7 @@
 	* mac/tkMacPort.h: wrapped panic in #ifndef panic to avoid
 	compiler errors when used with stubs-#defines, from Vince Darley.
 	[Bug: 2389]
-	
+
 1999-07-31  Scott Redman  <redman@scriptics.com>
 
 	* xlib/X11/Xlib.h: Remove XFillRectangle since it is now in the
@@ -12327,13 +12332,13 @@
 
 	* win/tkWinPort.h: Block out include of sys/stat.h in order to
 	build extensions with MetroWerks compiler for Win32. [Bug: 2385]
-	
+
 	* unix/Makefile.in: Need to make install-sh executable before
 	calling (with chmod +x).  [Bug: 2413]
-	
+
 	* library/menu.tcl: Applied patch from Jeff Hobbs to fix typo.
 	[Bug: 2425]
-	
+
 1999-07-21    <redman@scriptics.com>
 
 	* unix/Makefile.in: Add Windows configure script to distribution.
@@ -12351,7 +12356,7 @@
 
 	* tests/unixSelect.test: Fixed broken test.
 
-	* win/makefile.vc: Added special case target to ensure that 
+	* win/makefile.vc: Added special case target to ensure that
 	tkStubLib.obj is built with -DSTATIC_BUILD.
 
 	* win/tkWinX.c (TkWinChildProc): Changed to pass
@@ -12376,7 +12381,7 @@
 	* win/tkWinWm.c: Applied patch from Don Porter to prevent the
 	windows code from calling the Tcl functions when the stub table
 	has not been initialized in TkWinWmCleanup.  [Bug: 2269]
-	
+
 1999-06-16    <wart@scriptics.com>
 
 	* unix/configure.in:
@@ -12390,16 +12395,16 @@
 
 1999-06-03    <stanton@scriptics.com>
 
-	* unix/tkUnixSelect.c: 
-	* tests/unixSelect.test: 
+	* unix/tkUnixSelect.c:
+	* tests/unixSelect.test:
 	* generic/tkSelect.c: Fixed selection code to handle Unicode data
 	in COMPOUND_TEXT and STRING selections. [Bug: 1791]
 
 1999-06-02    <stanton@scriptics.com>
 
-	* generic/tkIntXlibDecls.h: 
+	* generic/tkIntXlibDecls.h:
 	* xlib/X11/Xlib.h: Added Mac specific defines to help with
-	compilation. 
+	compilation.
 
 	* generic/tkFont.c: lint
 
@@ -12417,12 +12422,12 @@
 
 1999-05-24    <stanton@scriptics.com>
 
-	* generic/tkStubLib.c: 
+	* generic/tkStubLib.c:
 	* generic/tkStubInit.c:
-	* generic/tkIntXlibDecls.h: 
-	* generic/tkIntPlatDecls.h: 
-	* generic/tkIntDecls.h: 
-	* generic/tkInt.decls: 
+	* generic/tkIntXlibDecls.h:
+	* generic/tkIntPlatDecls.h:
+	* generic/tkIntDecls.h:
+	* generic/tkInt.decls:
 	* generic/tkConsole.c: Various changes to try to get the Mac
 	builds working.
 
@@ -12435,7 +12440,7 @@
 
 	* library/console.tcl: Changed copyright string to read 1999
 	Scriptics Corp. in wish console about box.
-	
+
 1999-05-19    <redman@scriptics.com>
 
 	* generic/tk.h: Add extern "C" block around entire header file for
@@ -12444,7 +12449,7 @@
 
 1999-05-18    <stanton@scriptics.com>
 
-	* tests/winClipboard.test: 
+	* tests/winClipboard.test:
 	* win/tkWinClipboard.c: Fixed clipboard code so it handles Unicode
 	data properly on Windows NT and 95. [Bug: 1791]
 
@@ -12461,11 +12466,11 @@
 
 	* Merged changes from 8.1.0 branch:
 
-	* generic/tkDecls.h: 
-	* generic/tkIntDecls.h: 
-	* generic/tkIntPlatDecls.h: 
-	* generic/tkIntXlibDecls.h: 
-	* generic/tkPlatDecls.h: 
+	* generic/tkDecls.h:
+	* generic/tkIntDecls.h:
+	* generic/tkIntPlatDecls.h:
+	* generic/tkIntXlibDecls.h:
+	* generic/tkPlatDecls.h:
 	* generic/tkStubInit.c: Changed to avoid the need for forward
 	declarations in stub initializers.  Added extern "C" blocks around
 	stub table pointer declarations so the stubs can be used from C++
@@ -12487,7 +12492,7 @@
 	* generic/tkImgPPM.c:
 	* generic/tkImgPhoto.c: Set the -translation and -encoding options
 	to binary for image files. (reported by Marco Gazzetta)
-	
+
 1999-04-23    <stanton@scriptics.com>
 
 	* generic/tkInt.decls: Added TkClipBox, XDrawSegments, and
@@ -12562,7 +12567,7 @@
 
 	* library/entry.tcl: Fixed so selection is returned using the
 	-show character during cut and paste operations. [Bug: 1687]
-	
+
 1999-04-5     <redman@scriptics.com>
 
 	* generic/tkInt.decls:
@@ -12572,7 +12577,7 @@
 	* xlib/X11/Xlib.h:
 	* xlib/X11/Xutil.h: Added more X functions to the Win & Mac stubs
 	tables.
-	
+
 1999-04-05    <stanton@scriptics.com>
 
 	* unix/configure.in:
@@ -12581,7 +12586,7 @@
 
 1999-04-02    <stanton@scriptics.com>
 
-	* tests/text.test: 
+	* tests/text.test:
 	* generic/tkText.c: Fixed handling of Unicode in text searches.
 	The -count option was returning byte counts instead of character
 	counts. [Bug: 1056, 1148, 1666]
@@ -12627,19 +12632,19 @@
 
 1999-03-29    <stanton@scriptics.com>
 
-	* doc/MeasureChar.3: 
-	* doc/TextLayout.3: 
-	* generic/tk.decls: 
-	* generic/tkCanvText.c: 
+	* doc/MeasureChar.3:
+	* doc/TextLayout.3:
+	* generic/tk.decls:
+	* generic/tkCanvText.c:
 	* generic/tkEntry.c:
-	* generic/tkFont.c: 
-	* generic/tkListbox.c: 
-	* generic/tkMessage.c: 
-	* mac/tkMacFont.c: 
-	* unix/tkUnixButton.c: 
-	* unix/tkUnixFont.c: 
-	* unix/tkUnixMenu.c: 
-	* win/tkWinFont.c: 
+	* generic/tkFont.c:
+	* generic/tkListbox.c:
+	* generic/tkMessage.c:
+	* mac/tkMacFont.c:
+	* unix/tkUnixButton.c:
+	* unix/tkUnixFont.c:
+	* unix/tkUnixMenu.c:
+	* win/tkWinFont.c:
 	* win/tkWinMenu.c: Standardized text layout and font interfaces
 	so they are consistent with respect to byte versus character
 	oriented indices.  The layout functions all manipulate character
@@ -12653,12 +12658,12 @@
 
 	* generic/tkFont.c: Changes to named fonts were not being
 	propagated in some cases. [Bug: 1144]
-	
+
 	* xlib/X11/Xlib.h:
 	* generic/tkInt.decls: Added XParseColor to xlib stub
-	tables. [Bug: 1574] 
+	tables. [Bug: 1574]
 
-	* doc/GetBitmap.3: 
+	* doc/GetBitmap.3:
 	* generic/tkBitmap.c (BitmapInit): Eliminated use of Tk_Uid's in
 	bitmaps.  Added a few CONST declarations.
 
@@ -12673,7 +12678,7 @@
 	* generic/tkPlatDecls.h:
 	* generic/tkIntXlibDecls.h: Removed stub functions. Always use the
 	Tcl stubs when building with --enable-shared.
-	
+
 
 1999-03-26    <redman@scriptics.com>
 
@@ -12681,13 +12686,13 @@
 	* tests/testIndex.test: Avoid looking past the beginning of the
 	array storing data for the text widget (.t index end-2c).  Added
 	test case to check for the bug.  [Bug 991]
-	
+
 	* generic/tkConsole.c: Copy static strings into a Tcl_DString
 	before passing to Tcl_Eval, in case the compiler puts static
 	strings into read-only memory.
 
 1999-03-26    <suresh@scriptics.com>
-	
+
 	* unix/configure.in:
 	--nameble-shared is now the default and builds Tk as a shared
 	library; specify --disable-shared to build a static Tk library
@@ -12697,7 +12702,7 @@
 
 	* library/menu.tcl: Fixed bug reported by Bryan Oakley in the
 	menubutton bindings.  There was a false assumption that there was
-	always a menu attached to the button.  [Bug 1116] 
+	always a menu attached to the button.  [Bug 1116]
 
 1999-03-26    <redman@scriptics.com>
 
@@ -12715,20 +12720,20 @@
  	to be 32bit numbers, although on some 64bit systems (including 64bit
  	Solaris 7) they are packed into a 64bit value where the upper 32bits
  	are zero. The normal method of sizeof(XID)/sizeof(int) causes the
- 	hash table code to assume that the XID is a pointer to an array of 
+ 	hash table code to assume that the XID is a pointer to an array of
 	two ints, which it is not.  Tk now supports 64bit Solaris 7.
 
 1999-03-17    <stanton@scriptics.com>
 
-	* win/makefile.vc: 
+	* win/makefile.vc:
 	* generic/tk.h: Changed to use TCL_BETA_RELEASE macro, and fixed
 	so this works in rc files.
-	
-	* win/makefile.vc: 
-	* win/makefile.bc: 
-	* win/README: 
-	* unix/configure.in: 
-	* generic/tk.h: 
+
+	* win/makefile.vc:
+	* win/makefile.bc:
+	* win/README:
+	* unix/configure.in:
+	* generic/tk.h:
 	* README: Updated version to 8.1b3.
 
 1999-03-14    <stanton@GASPODE>
@@ -12779,7 +12784,7 @@
 	* generic/tkBind.c:
 	* generic/tkCmds.c:
 	* generic/tkConfig.c:
-	* generic/tkConsole.c: 
+	* generic/tkConsole.c:
 	* generic/tkCursor.c:
 	* generic/tkGrab.c:
 	* generic/tkImgPhoto.c:
@@ -12806,15 +12811,15 @@
 	functions. Most of the changes dealt with shifting around the
 	function declarations in the header files.  Mac code may not
 	compile, but it shouldn't take much work to fix this.
-	
+
 	* mac/tkMacMenu.c: Added dummy TkpMenuThreadInit for Mac to be
 	consistent with Unix and Windows versions.
-	
+
 1999-03-08    <lfb@scriptics.com>
 
-	* win/tkWinWm.c: Toplevel class no longer shared between 
+	* win/tkWinWm.c: Toplevel class no longer shared between
 	threads.
-	
+
 	* win/tkWinX.c: Multiple threads no longer share the same
 	TkDisplay structure.  Required because TkDisplay stores much
 	thread-specific data for a given thread.
@@ -12822,10 +12827,10 @@
 	* win/tkWinSend.c: Moved application instance handle out
 	out thread-local storage.  DDE was failing to initialize
 	when the instance handles were different between threads.
-	
+
 	* win/makefile.vc: Added THREADDEFINES for building with
 	threads enabled.
-	
+
 	* generic/tkMenu.c:
 	* win/tkWinMenu.c:
 	* unix/tkUnixMenu.c: Added TkpMenuThreadInit for initializing
@@ -12833,7 +12838,7 @@
 
 1999-03-01    <redman@scriptics.com>
 
-	* win/tkWinWm.c: 
+	* win/tkWinWm.c:
 	* win/tkWinPointer.c:
 	* win/tkWinInt.h: Fix "focus -force" for Windows.  The Win32 API
 	function SetForegroundWindow() does not work unless the window
@@ -12846,28 +12851,28 @@
 	* win/cat.c: Remove this file, use the one in the Tcl source directory.
 
 	* win/makefile.vc: Remove the wishc.exe from the default targets.  Add
-	a separate console-wish target to build it.  The need for a 
+	a separate console-wish target to build it.  The need for a
 	console-wish will go away soon, so we don't want to encourage its
 	use.
 
 1999-02-25    <redman@scriptics.com>
 
 	* win/tkWinWm.c: Properly initialize the tsdPtr->firstWindow field.
-	
+
 	* win/cat.c: Code for cat32.exe, copied from the Tcl sources. Required
 	in order to run the test suite from the makefile
 
 	* win/winMain.c: Add main() for a console-based wishc.exe, which meant
 	adding code to disable the call to Tk_ConsoleInit().
-	
+
 	* generic/tkConsole.c: Check the standard handles before creating the
 	new standard channels.	This allows a windows app that has stdin,
 	stdout, or stderr to correctly connect to them.
-	
+
 	* generic/tkMain.c: Add a proper check for the interactive mode, since
 	the standard channels may actually be connected in windows mode or
 	even in the console-based wish.
-	
+
 	* win/makefile.vc: Add targets for wishc.exe (console-based wish) and
 	cat32.exe (for testing). Fix the test suite target so it can be run
 	from the makefile (which can happen since the standard handles have
@@ -12882,39 +12887,39 @@
 	* unix/tkUnixMenubu.c: Eliminated Tk_Uids used by -state option.
 	* unix/tkUnixDefault.h
 	* win/tkWinDefault.h
-	
+
 
 	* generic/tk.h:
 	* generic/tkScale.h:
 	* generic/tkScale.c:
 	* generic/tkWindow.c:
-	* unix/tkUnixScale.c:	
+	* unix/tkUnixScale.c:
 	* unix/tkUnixDefault.h:
 	* unix/tkWinDefault.h:
 	* mac/tkMacDefault.h:  Objectified scale widget.
 
 	* win/tkWinX.c: Removed Thread-specific data from process
-	initialization code that was stopping the Tk Dll from 
+	initialization code that was stopping the Tk Dll from
 	loading.
 
 1999-02-11    <stanton@GASPODE>
 
 	* README:
-	* generic/tk.h: 
+	* generic/tk.h:
 	* unix/configure.in:
 	* win/README:
 	* win/makefile.bc:
 	* win/makefile.vc: Updated version to 8.1b2.
-	
+
 	* unix/tkUnixSend.c: Fixed one more Tcl_*ObjVar instance.
-	
+
 1999-02-04    <stanton@GASPODE>
 
 	* Various cleanup related to the Tcl_Eval and Tcl_ObjSetVar
 	changes in Tcl.
-	
-	INTEGRATED PATCHES FROM 8.0.5b2: 
-	
+
+	INTEGRATED PATCHES FROM 8.0.5b2:
+
 	* win/tkWinMenu.c (TkpDestroyMenu): Changed so modalMenuPtr is
 	cleared when it is being destroyed.
 
@@ -12950,10 +12955,10 @@
 
 	* win/makefile.vc: First stab at install target.  Fixed quoting so
 	paths with spaces work.
-	
+
 	* tests/main.test:
 	* tests/unixWm.test: Better cleanup of temporary files.
-	
+
 	* mac/tkMacAppInit.c:
 	* generic/tkTest.c:
 	* generic/tkAppInit.c:
@@ -12983,22 +12988,22 @@
 
 1999-01-06  <lfb@JUSTICE>
 
-	* generic/tk.h, generic/tkGet.c, generic/tkConfig.c, 
-	* generic/tkOldConfig.c, generic/tkEntry.c, generic/tkMenubutton.c, 
-	* generic/tkMenubutton.h, generic/tkScale.c, generic/tkScale.h, 
-	* generic/tkTextDisplay.c, generic/tkText.c, unix/tkUnixMenubu.c, 
-	* unix/tkUnixScale.c, mac/tkMacMenu.c, mac/tkMacMenubutton.c, 
-	
+	* generic/tk.h, generic/tkGet.c, generic/tkConfig.c,
+	* generic/tkOldConfig.c, generic/tkEntry.c, generic/tkMenubutton.c,
+	* generic/tkMenubutton.h, generic/tkScale.c, generic/tkScale.h,
+	* generic/tkTextDisplay.c, generic/tkText.c, unix/tkUnixMenubu.c,
+	* unix/tkUnixScale.c, mac/tkMacMenu.c, mac/tkMacMenubutton.c,
+
 	Removed global Tk_Uids dealing with "-state" configuration option
-	and added new TK_CONFIG_STATE configSpec that doesn't use 
+	and added new TK_CONFIG_STATE configSpec that doesn't use
 	Tk_Uids.
 
 1998-12-11    === Tk 8.1b1 Release ===
-	
+
 1998-12-11    <stanton@GASPODE>
 
 	* generic/tkMain.c (Tk_Main): Fixed improper command line encoding
-	handling. 
+	handling.
 
 1998-12-08    <stanton@GASPODE>
 
@@ -13016,7 +13021,7 @@
 	* Changed patchLevel to 8.1b1
 
 	* generic/tkMenu.c (ConfigureMenuCloneEntries): The -menu configuration
-	option was being incorrectly specified as just "menu". 
+	option was being incorrectly specified as just "menu".
 
 1998-11-30    <stanton@GASPODE>
 
@@ -13039,7 +13044,7 @@
 	external string to UTF [Bug: 869]
 
 	* integrated tk8.0.4 changes.
-	
+
 	* generic/tkBind.c: fixed deletion order bug where a crash would
 	result if a binding deleted "."
 
@@ -13063,7 +13068,7 @@
 1998-11-19    <stanton@GASPODE>
 
 	* tkMenu.c (DestroyMenuEntry): fixed memory leaks [Bug: 620]
-	
+
 	* tkWinX.c (GetTranslatedKey): fixed bad code merge
 
 	* tkWinWm.c, tkWinMenu.c: fixed titles and menus so they properly
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 744869f..a49742f 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -2485,7 +2485,7 @@ GetMenuLabelGeometry(mePtr, tkfont, fmPtr, widthPtr, heightPtr)
 					 * portion */
 {
     TkMenu *menuPtr = mePtr->menuPtr;
-    int haveImage = 0, haveText = 0;
+    int haveImage = 0;
  
     if (mePtr->image != NULL) {
     	Tk_SizeOfImage(mePtr->image, widthPtr, heightPtr);
@@ -2972,7 +2972,14 @@ SetDefaults(
     TEXTMETRIC tm;
     int pointSize;
     HFONT menuFont;
-    NONCLIENTMETRICS ncMetrics;
+    /* See: [Bug #3239768] tk8.4.19 (and later) WIN32 menu font support */
+    struct {
+        NONCLIENTMETRICS metrics;
+#if (WINVER < 0x0600)
+        int padding;
+#endif
+    } nc;
+    OSVERSIONINFO os;
 
     /*
      * Set all of the default options. The loop will terminate when we run 
@@ -2990,10 +2997,17 @@ SetDefaults(
     }
     Tcl_DStringInit(&menuFontDString);
 
-    ncMetrics.cbSize = sizeof(ncMetrics);
-    SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncMetrics),
-	    &ncMetrics, 0);
-    menuFont = CreateFontIndirect(&ncMetrics.lfMenuFont);
+    nc.metrics.cbSize = sizeof(nc);
+
+    os.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    GetVersionEx(&os);
+    if (os.dwMajorVersion < 6) {
+	nc.metrics.cbSize -= sizeof(int);
+    }
+
+    SystemParametersInfo(SPI_GETNONCLIENTMETRICS, nc.metrics.cbSize,
+	    &nc.metrics, 0);
+    menuFont = CreateFontIndirect(&nc.metrics.lfMenuFont);
     SelectObject(scratchDC, menuFont);
     GetTextMetrics(scratchDC, &tm);
     GetTextFace(scratchDC, LF_FACESIZE, faceName);