From de5ed00246a3dc6391ba695d126fb94c24bff4f1 Mon Sep 17 00:00:00 2001 From: dgp Date: Mon, 4 Jun 2007 15:19:00 +0000 Subject: merge updates from HEAD --- ChangeLog | 163 ++++++++++++++++++++-------------- macosx/Wish.xcodeproj/default.pbxuser | 2 + macosx/tkMacOSXDraw.c | 13 +-- macosx/tkMacOSXEmbed.c | 4 +- macosx/tkMacOSXEntry.c | 7 +- macosx/tkMacOSXFont.c | 7 +- macosx/tkMacOSXInit.c | 4 +- macosx/tkMacOSXKeyEvent.c | 9 +- macosx/tkMacOSXKeyboard.c | 7 +- macosx/tkMacOSXMenu.c | 13 +-- macosx/tkMacOSXMenus.c | 7 +- macosx/tkMacOSXSend.c | 12 ++- macosx/tkMacOSXSubwindows.c | 31 ++++--- macosx/tkMacOSXWindowEvent.c | 5 +- macosx/tkMacOSXWm.c | 12 ++- macosx/tkMacOSXXStubs.c | 7 +- unix/Makefile.in | 3 +- 17 files changed, 182 insertions(+), 124 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64b68a1..25f4cc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,21 +1,49 @@ +2007-06-03 Daniel Steffen + + * 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 + + * 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 * 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 - * generic/tk.h: Correct placement of #include [Bug 1723812]. + * generic/tk.h: Correct placement of #include . [Bug 1723812] 2007-05-30 Daniel Steffen @@ -67,15 +95,15 @@ 2007-05-28 Benjamin Riefenstahl - * 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 * 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 @@ -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 @@ -693,8 +721,8 @@ 2007-04-12 Jeff Hobbs - * 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 @@ -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 * 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 - * 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 @@ -790,8 +818,8 @@ 2007-02-02 Pat Thoyts - * 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 @@ -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 - * 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 - * 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 @@ -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 - * 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 * generic/tkText.c: - * tests/text.test: Fix for elaborations of [Bug 1414171] for - '$text dump -command