merge updates from HEAD

1 files changed, 98 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6f4aa52..4864d16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,100 @@
+2007-06-09  Joe English  <jenglish@users.sourceforge.net>
+
+	* generic/ttk/ttkPanedwindow.c, doc/ttk_panedwindow.n,
+	tests/ttk/panedwindow.test: Added -width and -height options.
+	Added 'panes' method, return list of managed windows.
+	'sashpos' method is now documented as part of the public
+	interface, and details clarified.  Should be easier 
+	to set initial sash positions now [Alleviates #1659067].
+
+2007-06-09  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* win/tkWinWm.c (WmIconphotoCmd): fix wm iconphoto RGBA issues.
+	[Bug 1467997] (janssen)
+
+	* win/tkWinMenu.c (TkWinHandleMenuEvent): improve handling to
+	allow for unicode char menu indices and not use CharUpper on Tcl
+	utf strings. [Bug #1734223]
+
+2007-06-09  Joe English  <jenglish@users.sourceforge.net>
+
+	* generic/ttk/ttkManager.h, generic/ttk/ttkManager.c, 
+	generic/ttk/ttkNotebook.c, generic/ttk/ttkPanedwindow.c,
+	generic/ttk/ttkFrame.c: Ttk_Manager API overhaul:
+	    + Ttk_Manager no longer responsible for managing slave records
+	    + Ttk_Manager structure now opaque
+	    + Ttk_Slave structure now private
+	    + Pass Ttk_Manager * to Tk_GeomMgr hooks instead of Ttk_Slave *
+
+	* generic/ttk/ttkFrame.c: Simplified -labelwidget management.
+
+	* doc/ttk_panedwindow.n, library/ttk/panedwindow.tcl:
+	Changed documentation of ttk::panedwindow 'identify' command
+	to match implementation.
+
+	* generic/ttk/ttkNotebook.c, tests/ttk/notebook.test:
+	BUGFIX: ttk::noteboook 'insert' command didn't correctly
+	maintain current tab.
+
+2007-06-09  Daniel Steffen  <das@users.sourceforge.net>
+
+	* macosx/tkMacOSXColor.c: fix issues with TK_{IF,ELSE,ENDIF} macros;
+	* macosx/tkMacOSXDraw.c:  implement Jaguar equivalent of unavailable
+	* macosx/tkMacOSXEntry.c: kHIToolboxVersion global; panic at startup
+	* macosx/tkMacOSXEvent.c: if MAC_OS_X_VERSION_MIN_REQUIRED constraint
+	* macosx/tkMacOSXInit.c:  is not satisfied.
+	* macosx/tkMacOSXInt.h:
+	* macosx/tkMacOSXWm.c:
+
+	* macosx/tkMacOSXDraw.c (XCopyArea, XCopyPlane, TkPutImage)
+	(TkMacOSXSetupDrawingContext): factor out common code and standardize
+	setup/restore of port, context and clipping; formatting cleanup.
+
+	* macosx/tkMacOSXWindowEvent.c:	add error checking.
+	* macosx/tkMacOSXMenu.c:	fix gcc3 warning.
+	* macosx/tkMacOSXScrlbr.c:	fix testsuite crash.
+	* macosx/tkMacOSXSubwindows.c:	formatting cleanup.
+	* macosx/tkMacOSXRegion.c:	fix typos.
+	* macosx/tkMacOSXScale.c:
+
+	* macosx/tkMacOSXXStubs.c (Tk_GetUserInactiveTime): remove superfluous
+							    CFRetain/CFRelease.
+
+	* macosx/Wish-Release.xcconfig: disable tktest release build stripping.
+
+	* macosx/Wish.xcodeproj/project.pbxproj: add new Tclsh-Info.plist.in.
+
+2007-06-06  Daniel Steffen  <das@users.sourceforge.net>
+
+	* macosx/tkMacOSXInt.h: use native debug message API when available.
+	* macosx/Wish-Debug.xcconfig:
+
+	* macosx/tkMacOSXMouseEvent.c (GenerateMouseWheelEvent): enable
+	processing of mousewheel events in background windows.
+
+	* macosx/tkMacOSXScrlbr.c: modernize checks for active/front window.
+	* macosx/tkMacOSXScale.c:
+	* macosx/tkMacOSXWm.c:
+
+	* macosx/tkMacOSXColor.c: factor out verbose #ifdef checks of
+	* macosx/tkMacOSXDraw.c:  MAC_OS_X_VERSION_{MAX_ALLOWED,MIN_REQUIRED}
+	* macosx/tkMacOSXEntry.c: and runtime checks of kHIToolboxVersion into
+	* macosx/tkMacOSXEvent.c: new TK_{IF,ELSE,ENDIF}_MAC_OS_X macros.
+	* macosx/tkMacOSXInit.c:
+	* macosx/tkMacOSXInt.h:
+	* macosx/tkMacOSXWm.c:
+
+	* macosx/tkMacOSXDraw.c:  factor out clip clearing in QD ports;
+	* macosx/tkMacOSXEntry.c: formatting cleanup.
+
+	* macosx/Wish.xcodeproj/project.pbxproj: add settings for Fix&Continue.
+
+	* 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. 
+
+	* unix/tcl.m4 (Darwin): fix CF checks in fat 32&64bit builds. 
+	* unix/configure: autoconf-2.59
+
 2007-06-05  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
 	* doc/photo.n: Clarified the fact that base64 support for the -data
@@ -51,7 +148,7 @@
 	to native button drawing calls.
 
 	* macosx/tkMacOSXWm.c (TkMacOSXIsWindowZoomed, TkMacOSXZoomToplevel):
-	correct handle gridded windows in max size calculations.
+	correct handling of gridded windows in max size calculations.
 
 	* macosx/tkMacOSXEvent.c (TkMacOSXFlushWindows): use HIWindowFlush API
 	when available.