merge updates from HEAD

1 files changed, 95 insertions, 68 deletions

diff --git a/ChangeLog b/ChangeLog
index 64b68a1..25f4cc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,21 +1,49 @@
+2007-06-03  Daniel Steffen  <das@users.sourceforge.net>
+
+	* unix/Makefile.in: add datarootdir to silence autoconf-2.6x warning.
+
+	* macosx/Wish.xcodeproj/default.pbxuser: add ttk tests.
+
+	* macosx/tkMacOSXMenu.c: add error checking; whitespace cleanup.
+
+	* macosx/tkMacOSXDraw.c:	comment formatting fixes for Xcode 3.0.
+	* macosx/tkMacOSXEmbed.c:
+	* macosx/tkMacOSXEntry.c:
+	* macosx/tkMacOSXFont.c:
+	* macosx/tkMacOSXInit.c:
+	* macosx/tkMacOSXKeyEvent.c:
+	* macosx/tkMacOSXKeyboard.c:
+	* macosx/tkMacOSXMenus.c:
+	* macosx/tkMacOSXSend.c:
+	* macosx/tkMacOSXSubwindows.c:
+	* macosx/tkMacOSXWindowEvent.c:
+	* macosx/tkMacOSXWm.c:
+	* macosx/tkMacOSXXStubs.c:
+
+2007-06-02  Daniel Steffen  <das@users.sourceforge.net>
+
+	* macosx/tkMacOSXMenu.c (TkpPostMenu): ensure cascade menus display in
+	posted menus that are not part of the menubar or attached to a
+	menubutton (fixes bug reported on tcl-mac by Linus Nyberg).
+
 2007-05-31  Daniel Steffen  <das@users.sourceforge.net>
 
 	* macosx/tkMacOSXWindowEvent.c (GenerateUpdateEvent): complete all
 	pending idle-time redraws before newly posted Expose events are
-	processed; add bounds of redrawn windows to update region to ensure all
-	child windows overdrawn by parents are redrawn.
+	processed; add bounds of redrawn windows to update region to ensure
+	all child windows overdrawn by parents are redrawn.
 
 	* macosx/tkMacOSXWindowEvent.c:	centralize clip and window invalidation
 	* macosx/tkMacOSXSubwindows.c: 	after location/size changes in the
 	* macosx/tkMacOSXWm.c:		BoundsChanged carbon event handler;
 	correct/add window invalidation after window attribute changes.
 
-	* macosx/tkMacOSXSubwindows.c (XResizeWindow, XMoveResizeWindow,
-	XMoveWindow): factor out common code dealing with embedded and
+	* macosx/tkMacOSXSubwindows.c (XResizeWindow, XMoveResizeWindow)
+	(XMoveWindow): factor out common code dealing with embedded and
 	non-toplevel windows; remove unnecessary clip and window invalidation.
 
-	* macosx/tkMacOSXButton.c (TkpDisplayButton): move clip setup closer to
-	native button drawing calls.
+	* macosx/tkMacOSXButton.c (TkpDisplayButton): move clip setup closer
+	to native button drawing calls.
 
 	* macosx/tkMacOSXWm.c (TkMacOSXIsWindowZoomed, TkMacOSXZoomToplevel):
 	correct handle gridded windows in max size calculations.
@@ -33,7 +61,7 @@
 
 2007-05-30  Don Porter  <dgp@users.sourceforge.net>
 
-	* generic/tk.h: Correct placement of #include <tcl.h> [Bug 1723812].
+	* generic/tk.h: Correct placement of #include <tcl.h>. [Bug 1723812]
 
 2007-05-30  Daniel Steffen  <das@users.sourceforge.net>
 
@@ -67,15 +95,15 @@
 
 2007-05-28  Benjamin Riefenstahl  <b.riefenstahl@turtle-trading.net>
 
-	* macosx/tkMacOSXFont.c (TkpMeasureCharsInContext): Fix short
-	measures with flags=TK_WHOLE_WORDS|TK_AT_LEAST_ONE [Bug 1716141].
-	Make some casts unnecessary by changing variable types.
-	
+	* macosx/tkMacOSXFont.c (TkpMeasureCharsInContext): Fix short measures
+	with flags=TK_WHOLE_WORDS|TK_AT_LEAST_ONE [Bug 1716141]. Make some
+	casts unnecessary by changing variable types.
+
 2007-05-25  Joe English  <jenglish@users.sourceforge.net>
 
 	* library/ttk/ttk.tcl: Omit ttk::dialog and dependencies.
 	* library/ttk/dialog.tcl, library/ttk/icons.tcl,
-	library/ttk/keynav.tcl: Removed.
+	* library/ttk/keynav.tcl: Removed.
 	* tests/ttk/misc.test: Removed.
 	* doc/ttk_dialog.tcl: Removed.
 
@@ -103,7 +131,7 @@
 	* generic/ttk/ttkEntry.c(EntrySetValue):  Ensure that widget is in a
 	consistent state before setting the linked -textvariable. Previously,
 	it was possible for [$e index insert] to point past the end of the
-	string, leading to heap corruption [Bug 1721532].
+	string, leading to heap corruption. [Bug 1721532]
 	* tests/ttk/entry.test(entry-9.1): Add test case for the above.
 
 2007-05-18  Don Porter  <dgp@users.sourceforge.net>
@@ -177,8 +205,8 @@
 	* generic/tkOldTest.c (new):	New file used to create testing
 	* generic/tkTest.c:		commands for testing various Tk
 	* tests/constraints.tcl:	legacy interfaces where a separate
-	* tests/image.test:		compilation unit is needed in order
-	to #define suitable macros during compilation. Only the effect of
+	* tests/image.test:		compilation unit is needed in order to
+	#define suitable macros during compilation. Only the effect of
 	USE_OLD_IMAGE on Tk_CreateImageType() is currently tested, but more
 	similar testing commands can be added to this same file. New
 	constraint defined to detect presence of the image type provided by
@@ -676,8 +704,8 @@
 	* macosx/tkMacOSXKeyEvent.c, macosx/tkMacOSXMenu.c:
 	* macosx/tkMacOSXMenubutton.c, macosx/tkMacOSXMouseEvent.c:
 	* macosx/tkMacOSXScale.c, macosx/tkMacOSXWindowEvent.c:
-	* macosx/tkMacOSXWm.c: Revert of commits from 2007-04-13 which
-	broke the OS X build.
+	* macosx/tkMacOSXWm.c: Revert of commits from 2007-04-13 which broke
+	the OS X build.
 
 2007-04-17  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
 
@@ -693,8 +721,8 @@
 
 2007-04-12  Jeff Hobbs  <jeffh@ActiveState.com>
 
-	* library/ttk/panedwindow.tcl (ttk::panedwindow::Press): handle
-	Press triggering outside sash element boundaries.
+	* library/ttk/panedwindow.tcl (ttk::panedwindow::Press): handle Press
+	triggering outside sash element boundaries.
 
 2007-04-10  Joe English  <jenglish@users.sourceforge.net>
 
@@ -757,20 +785,20 @@
 	* unix/tcl.m4: use SHLIB_SUFFIX=".so" on HP-UX ia64 arch.
 	* unix/configure: autoconf-2.59
 
-	* library/tkfbox.tcl (::tk::IconList_Goto): avoid goto issues in
-	empty dirs.  [Bug 1662959]
+	* library/tkfbox.tcl (::tk::IconList_Goto): avoid goto issues in empty
+	dirs. [Bug 1662959]
 
 2007-02-09  Joe Mistachkin  <joe@mistachkin.com>
 
 	* win/nmakehlp.c: Properly cleanup after nmakehlp, including the
-	* win/makefile.vc: vcX0.pch file.  Sync up fixed nmakehlp usage
-	from Tcl.
+	* win/makefile.vc: vcX0.pch file. Sync up fixed nmakehlp usage from
+	Tcl.
 
 2007-02-06  Joe English  <jenglish@users.sourceforge.net>
 
-	* library/ttk/ttk.tcl: Add no-op [package ifneeded] script
-	for tile 0.8.0, so that existing applications that use
-	"package require tile" won't fail when run under Tk 8.5.
+	* library/ttk/ttk.tcl: Add no-op [package ifneeded] script for tile
+	0.8.0, so that existing applications that use "package require tile"
+	won't fail when run under Tk 8.5.
 
 2007-02-04  Daniel Steffen  <das@users.sourceforge.net>
 
@@ -790,8 +818,8 @@
 
 2007-02-02  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
-	* win/ttkWinXPTheme.c: Support IsAppThemed() call. This is what 
-	is used when theming is turned off just for an individual application.
+	* win/ttkWinXPTheme.c: Support IsAppThemed() call. This is what is
+	used when theming is turned off just for an individual application.
 
 2007-01-28  Daniel Steffen  <das@users.sourceforge.net>
 
@@ -809,7 +837,7 @@
 
 	* generic/tk.h: update location of version numbers in macosx files.
 
-	* macosx/Wish.xcode/project.pbxproj: restore 'tktest' target to working 
+	* macosx/Wish.xcode/project.pbxproj: restore 'tktest' target to working
 	* macosx/Wish.xcode/default.pbxuser: order by replicating applicable
 	changes to Wish.xcodeproj since 2006-07-20.
 
@@ -842,16 +870,15 @@
 
 2007-01-11  Joe English  <jenglish@users.sourceforge.net>
 
-	* win/tcl.m4 (CFLAGS_WARNING): Remove "-Wconversion".
-	This was removed from unix/tcl.m4 2004-07-16 but not from here.
+	* win/tcl.m4 (CFLAGS_WARNING): Remove "-Wconversion". This was removed
+	from unix/tcl.m4 2004-07-16 but not from here.
 	* win/configure: Regenerated.
 
 2007-01-11  Joe English  <jenglish@users.sourceforge.net>
 
-	* generic/ttk/ttkManager.h, generic/ttk/ttk*.c:
-	Revert addition of contravariant 'const' qualifiers,
-	to keep in sync with Tile codebase (which must remain 
-	compatible with Tk 8.4).
+	* generic/ttk/ttkManager.h, generic/ttk/ttk*.c: Revert addition of
+	contravariant 'const' qualifiers, to keep in sync with Tile codebase
+	(which must remain compatible with Tk 8.4).
 
 2007-01-03  Jan Nijtmans  <nijtmans@users.sf.net>
 
@@ -1488,11 +1515,11 @@
 	default for text widget -inactiveselectbackground to implement platform
 	standard look for inactive text selections.
 
-	* library/text.tcl (aqua): remove focus bindings to set selection color.
+	* library/text.tcl (aqua): remove focus bindings to set selection color
 
-	* generic/tkTextBTree.c (TkTextIsElided): on TkAqua, don't show inactive
-	* generic/tkTextDisp.c (GetStyle):        text selection when text
-	                                          widget is in disabled state.
+	* generic/tkTextBTree.c (TkTextIsElided): on TkAqua, don't show
+	* generic/tkTextDisp.c (GetStyle):        inactive text selection when
+						  text widget is disabled.
 
 	* generic/tkEntry.c (DisplayEntry): change default TkAqua selection
 	* macosx/tkMacOSXDefault.h:         relief to "flat" (platform std).
@@ -1702,9 +1729,9 @@
 
 2006-05-29  Jeff Hobbs  <jeffh@ActiveState.com>
 
-	* win/tkWinEmbed.c (TkpGetOtherWindow):   [Bug 1212056] Do not panic if
-	* unix/tkUnixEmbed.c (TkpGetOtherWindow): no window is found; handle it
-	* unix/tkUnixWm.c (Tk_CoordsToWindow, UpdateGeometryInfo): in caller.
+	* win/tkWinEmbed.c (TkpGetOtherWindow):   Do not panic if no window is
+	* unix/tkUnixEmbed.c (TkpGetOtherWindow): found; caller handles. [Bug
+	* unix/tkUnixWm.c (Tk_CoordsToWindow, UpdateGeometryInfo): 1212056]
 
 	* tests/entry.test (entry-22.1):
 	* tests/listbox.test (listbox-6.15):
@@ -1722,14 +1749,14 @@
 	* win/tkWinMenu.c (TkWinMenuKeyObjCmd): get eventPtr after we know the
 	window is still alive. [AS bug 45987] [Bug 1236306]
 
-	* generic/tkMenu.c (DeleteMenuCloneEntries): Modify entry index changes
-	to work around VC6 optimization bug. [Bug 1224330]
+	* generic/tkMenu.c (DeleteMenuCloneEntries): Modify entry index
+	changes to work around VC6 optimization bug. [Bug 1224330]
 
 	* generic/tkMessage.c (MessageWidgetObjCmd): Correct msgPtr
 	preserve/release pairing. [Bug 1485750] (afredd)
 
-	* generic/tkWindow.c (Initialize): Correct mutex (un)lock pairing. [Bug
-	1479587] (loewis)
+	* generic/tkWindow.c (Initialize): Correct mutex (un)lock pairing.
+	[Bug 1479587] (loewis)
 
 	* generic/tkBind.c (Tk_BindEvent, TkCopyAndGlobalEval): use Tcl_EvalEx
 	instead of Tcl_GlobalEval.
@@ -2000,9 +2027,9 @@
 2006-03-26  Vince Darley <vincentdarley@users.sourceforge.net>
 
 	* generic/tkText.c:
-	* tests/text.test: Fix for elaborations of [Bug 1414171] for
-	'$text dump -command <script>' where script deletes large portions of
-	the text widget, or even destroys the widget.
+	* tests/text.test: Fix for elaborations of [Bug 1414171] for '$text
+	dump -command <script>' where script deletes large portions of the
+	text widget, or even destroys the widget.
 
 2006-03-28  Daniel Steffen  <das@users.sourceforge.net>
 
@@ -2131,8 +2158,8 @@
 	* macosx/Wish.xcodeproj/default.pbxuser: env var setting to tktest.
 
 	* unix/configure.in: fix detection of symbols build when enabling
-	TkAqua debug code; filter nm output of libtclstub better to avoid error
-	on intel macs [Bug 1415789].
+	TkAqua debug code; filter nm output of libtclstub better to avoid
+	error on intel macs. [Bug 1415789]
 	* unix/configure: autoconf-2.59
 
 2006-03-20  Don Porter  <dgp@users.sourceforge.net>
@@ -2150,10 +2177,10 @@
 
 2006-03-17  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
-	* library/clrpick.tcl:   [Bug 1451587] Avoid using abbreviated
-	* library/palette.tcl:   sub-commands in core scripts as this can cause
-	* library/scale.tcl:     problems with mega-widget libraries like snit.
-	* library/scrlbar.tcl:
+	* library/clrpick.tcl:   Avoid using abbreviated sub-commands in core
+	* library/palette.tcl:   scripts as this can cause problems with
+	* library/scale.tcl:     mega-widget libraries like snit.
+	* library/scrlbar.tcl:	 [Bug 1451587]
 	* library/tkfbox.tcl:
 	* library/xmfbox.tcl:
 
@@ -2188,7 +2215,7 @@
 2006-03-13  Don Porter  <dgp@users.sourceforge.net>
 
 	* tests/scrollbar.test: Corrected several broken calls to [testmetrics]
-        that were crashing the test suite.
+	that were crashing the test suite.
 
 	* tests/constraints.tcl:        Added notAqua constraint to canvPs-3.1
 	* tests/canvPs.test:            to stop test suite crash on Mac OSX.
@@ -2211,7 +2238,7 @@
 2006-03-07  Joe English  <jenglish@users.sourceforge.net>
 
 	* unix/tcl.m4: Set SHLIB_LD_FLAGS='${LIBS}' on NetBSD, as per the other
-	*BSD variants [Bug 1334613].
+	*BSD variants. [Bug 1334613]
 	* unix/configure: Regenerated.
 
 2006-03-07  Donal K. Fellows  <dkf@users.sf.net>
@@ -2438,7 +2465,7 @@
 	* macosx/tkMacOSXInt.h:   event to watch for change in display size and
 	adjust internal state appropriately.
 
-	* doc/checkbutton.n: fix -selectcolor docs [Bug 1083838]
+	* doc/checkbutton.n: fix -selectcolor docs. [Bug 1083838]
 
 	* generic/tkImgGIF.c: cast calls to blockOut
 
@@ -2452,7 +2479,7 @@
 2005-11-29  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* library/console.tcl (::tk::ConsoleInit): improve work-around to avoid
-	'% ' from tclMain.c [Bug 1252259]
+	'% ' from tclMain.c. [Bug 1252259]
 
 2005-11-27  Daniel Steffen  <das@users.sourceforge.net>
 
@@ -2652,8 +2679,8 @@
 
 2005-11-14  Joe English  <jenglish@users.sourceforge.net>
 
-	* library/bgerror.tcl: Truncate error messages at 45 characters instead
-	of 30 [Bug 1224235].
+	* library/bgerror.tcl: Truncate error messages at 45 characters
+	instead of 30. [Bug 1224235]
 
 2005-11-14  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
 
@@ -2663,8 +2690,8 @@
 2005-11-13  Donal K. Fellows  <donal.k.fellows@manchester.ac.uk>
 
 	* unix/tkUnixSelect.c (SelCvtToX): Arrange for the parsing code to use
-	Tcl's list parsing code, another simplification that enables testing of
-	the [Bug 1353414] fix.
+	Tcl's list parsing code, another simplification that enables testing
+	of the [Bug 1353414] fix.
 
 	* unix/tkUnixSelect.c (SelCvtFromX): Generate string forms of the
 	advanced selection types in a Tcl_DString. This makes fixing [Bug
@@ -2699,7 +2726,7 @@
 
 	* generic/tkMain.c: Rewrote code that sets the ::argv value to be sure
 	conversion from the system encoding is complete before any processing
-	sensitive to list-special characters is done. [Bug 1328926].
+	sensitive to list-special characters is done. [Bug 1328926]
 
 2005-10-17  Jeff Hobbs  <jeffh@ActiveState.com>
 
@@ -2926,7 +2953,7 @@
 
 2005-08-13 Chengye Mao <chengye.geo@yahoo.com>
 
-	* generic/tkOldConfig.c Fixed [Bug 1258604]. This bug was introduced
+	* generic/tkOldConfig.c: Fixed [Bug 1258604]. This bug was introduced
 	into the modfied Tk_ConfigureWidget. It failed to properly handle the
 	specFlags' bit TK_CONFIG_OPTION_SPECIFIED.
 
@@ -3364,10 +3391,10 @@
 2005-05-10  Vince Darley <vincentdarley@users.sourceforge.net>
 
 	* library/text.tcl: test and fix to TextPrevPara to avoid infinite loop
-	* tests/textIndex.test: at start of widget [Bug 1191895]
+	* tests/textIndex.test: at start of widget. [Bug 1191895]
 
 	* generic/tkTextDisp.c: better synchronisation between explicit and
-	implicit pixel line-height calculations [Bug 1186558]
+	implicit pixel line-height calculations. [Bug 1186558]
 
 2005-05-10  Don Porter	<dgp@users.sourceforge.net>
 
@@ -3632,7 +3659,7 @@
 
 2005-02-28  Jeff Hobbs	<jeffh@ActiveState.com>
 
-	* win/tkWinX.c (GenerateXEvent): correct %A translation on MouseWheel
+	* win/tkWinX.c (GenerateXEvent): correct %A translation on MouseWheel.
 	[Bug 1118340]
 
 2005-02-24  Daniel Steffen  <das@users.sourceforge.net>