From de5ed00246a3dc6391ba695d126fb94c24bff4f1 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
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 <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>
diff --git a/macosx/Wish.xcodeproj/default.pbxuser b/macosx/Wish.xcodeproj/default.pbxuser
index f8ee8dd..1ab49ec 100644
--- a/macosx/Wish.xcodeproj/default.pbxuser
+++ b/macosx/Wish.xcodeproj/default.pbxuser
@@ -34,10 +34,12 @@
NO,
NO,
NO,
+ NO,
);
argumentStrings = (
"${SRCROOT}/../../tk/library/demos/widget",
"${SRCROOT}/../../tk/tests/all.tcl",
+ "${SRCROOT}/../../tk/tests/ttk/all.tcl",
"-geometry +0+0",
"-singleproc 1",
"-verbose \"bet\"",
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 258f992..ec825cb 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXDraw.c,v 1.21.2.2 2007/06/01 04:01:32 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXDraw.c,v 1.21.2.3 2007/06/04 15:19:00 dgp Exp $
*/
#include "tkMacOSXInt.h"
@@ -601,7 +601,11 @@ XDrawLines(
int i, lw = gc->line_width;
if (npoints < 2) {
- return; /* TODO: generate BadValue error. */
+ /*
+ * TODO: generate BadValue error.
+ */
+
+ return;
}
display->request++;
@@ -1560,9 +1564,8 @@ TkMacOSXSetUpGraphicsPort(
}
if (gc->line_style != LineSolid) {
/*
- * FIXME:
- * Here the dash pattern should be set in the drawing environment.
- * This is not possible with QuickDraw line drawing.
+ * FIXME: Here the dash pattern should be set in the drawing
+ * environment. This is not possible with QuickDraw line drawing.
*/
}
}
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index 04d0e4d..d6112bb 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -15,7 +15,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXEmbed.c,v 1.12 2007/05/09 12:55:15 das Exp $
+ * RCS: @(#) $Id: tkMacOSXEmbed.c,v 1.12.2.1 2007/06/04 15:19:00 dgp Exp $
*/
#include "tkMacOSXInt.h"
@@ -509,7 +509,7 @@ TkMacOSXGetHostToplevel(
contWinPtr = TkpGetOtherWindow(topWinPtr);
/*
- * NOTE: Here we should handle out of process embedding.
+ * TODO: Here we should handle out of process embedding.
*/
if (contWinPtr != NULL) {
diff --git a/macosx/tkMacOSXEntry.c b/macosx/tkMacOSXEntry.c
index f12f624..60e4a99 100644
--- a/macosx/tkMacOSXEntry.c
+++ b/macosx/tkMacOSXEntry.c
@@ -53,7 +53,7 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXEntry.c,v 1.8 2007/04/23 21:24:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXEntry.c,v 1.8.2.1 2007/06/04 15:19:00 dgp Exp $
*/
#include "tkMacOSXInt.h"
@@ -257,7 +257,10 @@ TkpDrawSpinboxButtons(Spinbox *sbPtr, Drawable d)
GC bgGC;
MacDrawable *macDraw = (MacDrawable *) d;
- /* FIXME RAISED really makes more sense */
+ /*
+ * FIXME: RAISED really makes more sense
+ */
+
if (sbPtr->buRelief != TK_RELIEF_FLAT) {
return 0;
}
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index 6e5fbba..798a111 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -35,7 +35,7 @@
* that such fonts can not be used for controls, because controls
* definitely require a family id (this assertion needs testing).
*
- * RCS: @(#) $Id: tkMacOSXFont.c,v 1.24.2.2 2007/05/30 13:47:43 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXFont.c,v 1.24.2.3 2007/06/04 15:19:00 dgp Exp $
*/
#include "tkMacOSXInt.h"
@@ -1057,7 +1057,10 @@ TkpDrawCharsInContext(
TkMacOSXSetupDrawingContext(drawable, gc, 1, &drawingContext);
#if 0
- /* TODO: implement stippled text drawing */
+ /*
+ * TODO: implement stippled text drawing
+ */
+
if ((gc->fill_style == FillStippled
|| gc->fill_style == FillOpaqueStippled)
&& gc->stipple != None) {
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 6625e4a..0dc3826 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXInit.c,v 1.28 2007/04/23 21:24:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.28.2.1 2007/06/04 15:19:00 dgp Exp $
*/
#include "tkMacOSXInt.h"
@@ -307,7 +307,7 @@ TkpInit(
}
/*
- * REMOVE ME: Close stdin & stdout for remote debugging otherwise we
+ * FIXME: Close stdin & stdout for remote debugging otherwise we
* will fight with gdb for stdin & stdout
*/
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 14bf641..3728ca1 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -54,7 +54,7 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXKeyEvent.c,v 1.21 2007/04/23 21:24:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXKeyEvent.c,v 1.21.2.1 2007/06/04 15:19:00 dgp Exp $
*/
#include "tkMacOSXInt.h"
@@ -178,7 +178,12 @@ TkMacOSXProcessKeyboardEvent(
case kHICommandPreferences:
case kHICommandQuit:
statusPtr->stopProcessing = 0;
- return 0; /* TODO: may not be on event on queue. */
+
+ /*
+ * TODO: may not be on event on queue.
+ */
+
+ return 0;
break;
default:
break;
diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c
index ce16324..3dc8e9c 100644
--- a/macosx/tkMacOSXKeyboard.c
+++ b/macosx/tkMacOSXKeyboard.c
@@ -10,12 +10,13 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXKeyboard.c,v 1.21 2007/04/23 21:24:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXKeyboard.c,v 1.21.2.1 2007/06/04 15:19:00 dgp Exp $
*/
#include "tkMacOSXInt.h"
-#include "tkMacOSXEvent.h" /* TkMacOSXKeycodeToUnicode() FIXME: That
- * function should probably move here. */
+#include "tkMacOSXEvent.h" /* for TkMacOSXKeycodeToUnicode()
+ * FIXME: That function should probably move
+ * here. */
/*
* A couple of simple definitions to make code a bit more self-explaining.
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index d1f8daf..25f414d 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.37.2.1 2007/05/30 13:47:43 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.37.2.2 2007/06/04 15:19:00 dgp Exp $
*/
#include "tkMacOSXInt.h"
@@ -1288,8 +1288,8 @@ ReconfigureIndividualMenu(
->menuPtr->platformData)->menuHdl;
if (childMenuHdl != NULL) {
- SetMenuItemHierarchicalID(macMenuHdl, base + index,
- GetMenuID(childMenuHdl));
+ ChkErr(SetMenuItemHierarchicalID, macMenuHdl,
+ base + index, GetMenuID(childMenuHdl));
}
/*
* If we changed the highligthing of this menu, its
@@ -1556,6 +1556,7 @@ TkpPostMenu(
Tcl_CancelIdleCall(DrawMenuBarWhenIdle, NULL);
DrawMenuBarWhenIdle(NULL);
}
+ RecursivelyInsertMenu(menuPtr);
TkMacOSXTrackingLoop(1);
popUpResult = PopUpMenuSelect(macMenuHdl, y, x, menuPtr->active);
@@ -4203,7 +4204,7 @@ HandleMenuHiliteMsg(
hidPtr->newItem);
#endif
GetPort(&macMDEFDrawable.grafPtr);
- macMDEFDrawable.context = (CGContextRef)hidPtr->context;
+ macMDEFDrawable.context = (CGContextRef) hidPtr->context;
err = ChkErr(GetMenuTrackingData, menu, mtdPtr);
if (err != noErr) {
@@ -4257,7 +4258,7 @@ HandleMenuDrawMsg(
GetPort(&macMDEFDrawable.grafPtr);
GetPortBounds(macMDEFDrawable.grafPtr, &bounds);
- macMDEFDrawable.context = (CGContextRef)ddPtr->context;
+ macMDEFDrawable.context = (CGContextRef) ddPtr->context;
#ifdef TK_MAC_DEBUG_MENUS
TkMacOSXDbgMsg("MDEF: DrawMsg %d - %d; %d - %d", menuRectPtr->top,
menuRectPtr->bottom, bounds.top, bounds.bottom);
@@ -4401,7 +4402,7 @@ HandleMenuFindItemMsg(
GetPort(&macMDEFDrawable.grafPtr);
GetPortBounds(macMDEFDrawable.grafPtr, &bounds);
- macMDEFDrawable.context = (CGContextRef)fiPtr->context;
+ macMDEFDrawable.context = (CGContextRef) fiPtr->context;
/*
* Now we need to take care of scrolling the menu.
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index 4bf138d..d33b0ab 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.16 2007/04/23 21:24:33 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.16.2.1 2007/06/04 15:19:00 dgp Exp $
*/
#include "tkMacOSXInt.h"
@@ -91,7 +91,10 @@ TkMacOSXHandleMenuSelect(
case kFileMenu:
switch (theItem) {
case kSourceItem:
- /* TODO: source script */
+ /*
+ * TODO: source script
+ */
+
SourceDialog();
break;
case kCloseItem:
diff --git a/macosx/tkMacOSXSend.c b/macosx/tkMacOSXSend.c
index 179beb6..076418d 100644
--- a/macosx/tkMacOSXSend.c
+++ b/macosx/tkMacOSXSend.c
@@ -33,7 +33,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXSend.c,v 1.6 2007/04/23 21:24:34 das Exp $
+ * RCS: @(#) $Id: tkMacOSXSend.c,v 1.6.2.1 2007/06/04 15:19:00 dgp Exp $
*/
#include "tkMacOSXInt.h"
@@ -297,8 +297,12 @@ Tk_SetAppName(
interpListPtr = riPtr;
strcpy(riPtr->name, actualName);
+ /*
+ * TODO: DeleteProc
+ */
+
Tcl_CreateObjCommand(interp, "send", Tk_SendObjCmd,
- (ClientData) riPtr, NULL /* TODO: DeleteProc */);
+ (ClientData) riPtr, NULL);
if (Tcl_IsSafe(interp)) {
Tcl_HideCommand(interp, "send", "send");
}
@@ -439,8 +443,8 @@ Tk_SendObjCmd(
Tcl_Release((ClientData) localInterp);
} else {
/*
- * This is a non-local request. Send the script to the server and poll
- * it for a result. TODO!!!
+ * TODO: This is a non-local request. Send the script to the server and
+ * poll it for a result.
*/
}
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 23bdec8..e71a05b 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.18.2.2 2007/06/01 04:01:39 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXSubwindows.c,v 1.18.2.3 2007/06/04 15:19:01 dgp Exp $
*/
#include "tkMacOSXInt.h"
@@ -472,7 +472,10 @@ MoveResizeWindow(
*/
}
} else {
- /* TODO: update all xOff & yOffs */
+ /*
+ * TODO: update all xOff & yOffs
+ */
+
macParent = macWin->winPtr->parentPtr->privatePtr;
parentBorderwidth = macWin->winPtr->parentPtr->changes.border_width;
}
@@ -558,7 +561,9 @@ XRaiseWindow(
if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
TkWmRestackToplevel(macWin->winPtr, Above, NULL);
} else {
- /* TODO: this should generate damage */
+ /*
+ * TODO: this should generate damage
+ */
}
}
@@ -590,7 +595,9 @@ XLowerWindow(
if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
TkWmRestackToplevel(macWin->winPtr, Below, NULL);
} else {
- /* TODO: this should generate damage */
+ /*
+ * TODO: this should generate damage
+ */
}
}
#endif
@@ -748,7 +755,7 @@ TkMacOSXUpdateClipRgn(
}
/*
- * NOTE: Here we should handle out of process embedding.
+ * TODO: Here we should handle out of process embedding.
*/
}
@@ -790,7 +797,7 @@ TkMacOSXUpdateClipRgn(
}
/*
- * NOTE: Here we should handle out of process embedding.
+ * TODO: Here we should handle out of process embedding.
*/
}
SetEmptyRgn(tkMacOSXtmpRgn1);
@@ -956,10 +963,8 @@ TkMacOSXGetDrawablePort(
if (resultPort == NULL) {
/*
- * FIXME:
- *
- * So far as I can tell, the only time that this happens is when
- * we are tearing down an embedded child interpreter, and most
+ * FIXME: So far as I can tell, the only time that this happens is
+ * when we are tearing down an embedded child interpreter, and most
* of the time, this is harmless... However, we really need to
* find why the embedding loses.
*/
@@ -968,7 +973,7 @@ TkMacOSXGetDrawablePort(
}
/*
- * NOTE: Here we should handle out of process embedding.
+ * TODO: Here we should handle out of process embedding.
*/
}
return resultPort;
@@ -1083,7 +1088,7 @@ TkMacOSXInvalClipRgns(
}
/*
- * NOTE: Here we should handle out of process embedding.
+ * TODO: Here we should handle out of process embedding.
*/
}
}
@@ -1174,7 +1179,7 @@ UpdateOffsets(
}
/*
- * NOTE: Here we should handle out of process embedding.
+ * TODO: Here we should handle out of process embedding.
*/
}
}
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index b4c458b..c73d8ae 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -54,7 +54,7 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.22.2.2 2007/06/01 04:01:39 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.22.2.3 2007/06/04 15:19:01 dgp Exp $
*/
#include "tkMacOSXInt.h"
@@ -573,9 +573,8 @@ GenerateUpdates(
}
/*
- * NOTE: Here we should handle out of process embedding.
+ * TODO: Here we should handle out of process embedding.
*/
-
}
return 1;
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 971f5c6..9c96537 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXWm.c,v 1.49.2.2 2007/06/01 04:01:39 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.49.2.3 2007/06/04 15:19:01 dgp Exp $
*/
#include "tkMacOSXInt.h"
@@ -3340,7 +3340,7 @@ UpdateGeometryInfo(
TkWindow *contWinPtr = TkpGetOtherWindow(winPtr);
/*
- * NOTE: Here we should handle out of process embedding.
+ * TODO: Here we should handle out of process embedding.
*/
if (contWinPtr != NULL) {
@@ -3743,11 +3743,9 @@ Tk_CoordsToWindow(
}
}
-
/*
- * NOTE: Here we should handle out of process embedding.
+ * TODO: Here we should handle out of process embedding.
*/
-
} else {
for (childPtr = winPtr->childList; childPtr != NULL;
childPtr = childPtr->nextPtr) {
@@ -3836,7 +3834,7 @@ Tk_TopCoordsToWindow(
}
/*
- * NOTE: Here we should handle out of process embedding.
+ * TODO: Here we should handle out of process embedding.
*/
} else {
for (childPtr = winPtr->childList; childPtr != NULL;
@@ -5181,7 +5179,7 @@ TkMacOSXMakeRealWindowExist(
return;
/*
- * NOTE: Here we should handle out of process embedding.
+ * TODO: Here we should handle out of process embedding.
*/
}
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index 53bafb7..805d07d 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.17.2.1 2007/05/30 13:47:43 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.17.2.2 2007/06/04 15:19:01 dgp Exp $
*/
#include "tkMacOSXInt.h"
@@ -605,7 +605,10 @@ GContext
XGContextFromGC(
GC gc)
{
- /* TODO - currently a no-op */
+ /*
+ * TODO: currently a no-op
+ */
+
return 0;
}
diff --git a/unix/Makefile.in b/unix/Makefile.in
index ee03061..9bed599 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.128.2.1 2007/05/26 04:06:07 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.128.2.2 2007/06/04 15:19:01 dgp Exp $
# Current Tk version; used in various names.
@@ -36,6 +36,7 @@ exec_prefix = @exec_prefix@
bindir = @bindir@
libdir = @libdir@
includedir = @includedir@
+datarootdir = @datarootdir@
mandir = @mandir@
# The following definition can be set to non-null for special systems
--
cgit v0.12