diff options
| author | stanton <stanton> | 1998-09-30 02:15:12 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1998-09-30 02:15:12 (GMT) |
| commit | 3c1a537631e7e5fdc7c237b92a582824afea1fda (patch) | |
| tree | 1da3d93d793cd6abb62cd2204f5e4f73406f2752 | |
| parent | c16d45ef706cbb616125e57ec8a1f809bae3c9df (diff) | |
| download | tk-3c1a537631e7e5fdc7c237b92a582824afea1fda.zip tk-3c1a537631e7e5fdc7c237b92a582824afea1fda.tar.gz tk-3c1a537631e7e5fdc7c237b92a582824afea1fda.tar.bz2 | |
Merged 8.0.3 changes into 8.1
505 files changed, 2339 insertions, 1278 deletions
@@ -1,6 +1,6 @@ The Tk Toolkit -SCCS: @(#) README 1.51 98/02/18 18:02:32 +RCS: @(#) $Id: README,v 1.1.4.2 1998/09/30 02:15:12 stanton Exp $ 1. Introduction --------------- @@ -39,6 +39,10 @@ books on Tcl and Tk: Exploring Expect, by Don Libes, O'Reilly and Associates, 1995, ISBN 1-56592-090-2 +Other books are listed at +http://www.scriptics.com/resource/doc/books/ +http://www.tclconsortium.org/resources/books.html + The "doc" subdirectory in this release contains a complete set of reference manual entries for Tk. Files with extension ".1" are for programs such as wish; files with extension ".3" are for C library @@ -60,7 +64,7 @@ that summarizes the new features and discusses how to deal with the changes in Tk 4.0 that are not backwards compatible. There is also an official home for Tcl and Tk on the Web: - http://sunscript.sun.com + http://www.scriptics.com/ These Web pages include release updates, reports on bug fixes and porting issues, HTML versions of the manual pages, and pointers to many other Tcl/Tk Web pages at other sites. Check them out! @@ -70,7 +74,7 @@ Tcl/Tk Web pages at other sites. Check them out! This release contains everything you should need to compile and run Tk under UNIX, Macintoshes, and PCs (either Windows NT, Windows 95, -or Win 3.1 with Win32s). +or Windows 98.) Before trying to compile Tk you should do the following things: @@ -78,9 +82,9 @@ Before trying to compile Tk you should do the following things: available now for PCs and Macintoshes, and several flavors of UNIX. Binary releases are much easier to install than source releases. To find out whether a binary release is available for - your platform, check the Tcl/Tk 8.1 Web page at - http://sunscript.sun.com/TclTkCore/8.1.html. Also, check in the - FTP directory from which you retrieved the base distribution. + your platform, check the home page for Tcl/Tk + (http://www.scriptics.com/) and also check in the FTP + directory from which you retrieved the base distribution. (b) Make sure you have the most recent patch release. Look in the FTP directory from which you retrieved this distribution to see @@ -157,19 +161,11 @@ reading software to ensure that it is supplying valid e-mail addresses. A couple of Mailing List have been set up to discuss Macintosh or Windows related Tcl issues. In order to use these Mailing Lists you -must have access to the internet. If you have access to the WWW the -home pages for these mailing lists are located at the following URLs: - - http://www.sunlabs.com/people/raymond.johnson/mactcl-list.html - - -and- - - http://sunscript.sun.com/win/wintcl-list.html - -The home pages contain information about the lists and an HTML archive -of all the past messages on the list. To subscribe send a message to: +must have access to the internet. To subscribe send a message to: - listserv@sunlabs.sun.com + wintcl-request@tclconsorium.org + or + mactcl-request@tclconsorium.org In the body of the message (the subject will be ignored) put: @@ -195,12 +191,21 @@ in the directory "/pub/tcl". The archive also contains several FAQ ("frequently asked questions") documents that provide solutions to problems that are commonly encountered by TCL newcomers. -9. Support and bug fixes +9. Tcl Resource Center +---------------------- +Visit http://www.scritics.com/resource/ to see an annotated index of +many Tcl resources available on the World Wide Web. This includes +papers, books, and FAQs, as well as extensions, applications, binary +releases, and patches. You can contribute patches by sending them +to <patches@scriptics.com>. You can also recommend more URLs for the +resource center using the forms labeled "Add a Resource". + +10. Support and bug fixes ------------------------ We're very interested in receiving bug reports and suggestions for improvements. We prefer that you send this information to the -comp.lang.tcl newsgroup rather than to any of us at Sun. We'll see +comp.lang.tcl newsgroup rather than to any of us at Scriptics. We'll see anything on comp.lang.tcl, and in addition someone else who reads comp.lang.tcl may be able to offer a solution. The normal turn-around time for bugs is 3-6 weeks. Enhancements may take longer and may not @@ -226,12 +231,16 @@ support for users. If you need help we suggest that you post questions to comp.lang.tcl. We read the newsgroup and will attempt to answer esoteric questions for which no-one else is likely to know the answer. In addition, Tcl/Tk support and training are available commercially from -NeoSoft (info@neosoft.com), Computerized Processes Unlimited -(gwl@cpu.com), and Data Kinetics (education@dkl.com). +Scriptics (info@scriptics.com), NeoSoft (info@neosoft.com), +Computerized Processes Unlimited (gwl@cpu.com), +and Data Kinetics (education@dkl.com). -10. Release organization +11. Release organization ------------------------ +The version numbers described below are available to Tcl scripts +as the tk_version and tk_patchLevel Tcl variables. + Each Tk release is identified by two numbers separated by a dot, e.g. 3.2 or 3.3. If a new release contains changes that are likely to break existing C code or Tcl scripts then the major release number increments @@ -264,7 +273,9 @@ incompatibility. Once the official release is made then there won't be any more incompatibilities until the next release with a new major version number. -Patch releases have a suffix such as p1 or p2. These releases contain -bug fixes only. A patch release (e.g Tk 4.1p2) should be completely -compatible with the base release from which it is derived (e.g. Tk -4.1), and you should normally use the highest available patch release. +Patch releases used to have a suffix such as p1 or p2. Now we use +a 3-part version number: major.minor.patchlevel. (e.g., 8.0.3) +These releases contain bug fixes only. A patch release (e.g Tk 4.1p2) +should be completely compatible with the base release from which it is +derived (e.g. Tk 4.1), and you should normally use the highest available +patch release. @@ -2,7 +2,7 @@ This file summarizes all changes made to Tk since version 1.0 was released on March 13, 1991. Changes that aren't backward compatible are marked specially. -SCCS: @(#) changes 1.268 98/02/18 18:06:42 +RCS: @(#) $Id: changes,v 1.1.4.2 1998/09/30 02:15:13 stanton Exp $ 3/16/91 (bug fix) Modified tkWindow.c to remove Tk's Tcl commands from the interpreter when the main window is deleted (otherwise there will @@ -4161,6 +4161,96 @@ the 'correct' tk_library). (DL) ---- Shipped as part of the plugin2.0 as 8.0p2Plugin2, Jan 15th 98 ---- +6/3/98 (bug fix) Fixed bugs in the tk_getOpenFile under Unix. + 1) If the -initialdir option was "." the result would be "././foo.tcl" + instead of an absolute path, like the Windows interface. + 2) There is a traceVar on the data(selectPath) where the script was + assumes the window exists. (BS) + +6/12/98 (feature change) Focus -force now sets the foreground window +on Windows platforms in addition to moving the focus. (SS) + +6/12/98 (bug fix) Fixed bug in Windows font measurement that did not +take kerning into account. (BS) + +6/24/98 (bug fix) On Unix, fixed -initialdir switch to tk_getOpenFile +and tk_getSaveFile to convert the specified directory to an absolute +path and to use the current working directory if the specified +directory does not exist. (SS) + +6/25/98 (bug fix) On Unix, both the Tk and the Motif file dialogs +would fail if the -parent flag changed between two parent windows that +had been previously used as file dialog parents. (SS) + +6/29/98 (compatibility patch) Added reserved fields to several Tk +structures to match additions made by Jan Nijtmans dash patch. This +means that extensions can be compiled against the dash patch +and still work with unpatched Tk, and vice versa. + +7/6/98 (bug fix) Added keysym definitions for the new keys on the +Microsoft keyboards. You can bind to <App>, <Win_L>, and <Win_R>, +but you cannot use the Win keys as modifiers. (SS, BW) + +7/6/98 (new feature) Added support for the Macintosh Appearance Manager. (JI) + +7/24/98 (feature change) Eliminated the static variable that sets +tk_library and simplified search order for tk.tcl. The tk_library +variable can now be set before calling Tk_Init to avoid doing any +searches. If it isn't set, then Tk checks env(TK_LIBRARY), relative +to tcl_library, an install directory relative to the executable, a +source directory relative to the executable, and a tk directory +relative to the source heirarchy containing the executable. See the +comment at the top of generic/tkInitScript.h for more details. (SS) + +7/27/98 (bug fix) The bbox for coords in the canvas were incorrectly +including the center of the coord as part of the bound area. (RJ) + +8/4/98 (bug fix) Fixed memory leak in Windows menu code. (SS) + +8/4/98 (bug fix) Fixed bug where bgerror's were not being generated +from menu callbacks on Windows. (SS) + +8/4/98 (bug fix) Alt-key bindings were not being handled properly +under Windows, resulting in annoying beeps. (SS) + +8/4/98 (bug fix) Fixed bug in Windows menubar handling that allowed +a shared menubar to be deleted when any window using it was deleted. (SS) + +8/4/98 (feature change) Introduced TkReadBitmapFile to replace +XReadBitmapFile so that all Tk file opens go through the Tcl channel +mechanism. This lets us wrap applications that define their own +bitmaps and cursors. Note that XReadBitmapFile is no longer +emulated for non-unix platforms platforms (RJ, BW) + +8/5/98 (bug fix) <Insert> binding in entries was masking the virtual +event <<Paste>> binding to Shift-Insert on Windows. (SS) + +8/5/98 (bug fix) wm frame would crash if the window had not been +mapped yet on Windows. (SS) + +8/5/98 (bug fix) Local grabs did not exclude menus or the caption bar +under Windows. (SS) + +8/5/98 (bug fix) Reduced message traffic by setting +WS_EX_NOPARENTNOTIFY on TkChild windows. (SS) + +8/6/98 (feature change) Changed tkInitScript.h to use the new +tcl_findLibrary procedure to locate its script library. (BW) + +8/10/98 (bug fix) Added special case to font code to limit the +length of displayed strings to avoid wrap-around bugs in some +PC X servers when the pixel length of the string exceeds 0x7fff. (SS) + +8/12/98 (bug fix) Macintosh, lock down some of the resources +associated with menus to try and stabilise the menu system +on memory limited machines. (JI) + +8/12/98 (windows build change) Moved the tkConsole.obj into the tk80.dll +on windows. If you build your own Tk main program, you no longer +need to compile and link this yourself. (SKS) + +-------- Released 8.0.3 to the Tcl Consortium CD-ROM project, 8/13/98 ------ + ---------------------------------------------------------- Changes for Tk 8.0 go above this line. Changes for Tk 8.1 go below this line. @@ -4251,4 +4341,3 @@ Mac (RJ) XLFD (no XA_FONT attribute) would lead to dereferencing NULL. (CCS) ----------------- Released 8.1a2, Feb 20 1998 ----------------------- - diff --git a/compat/limits.h b/compat/limits.h index ec7a909..e6368be 100644 --- a/compat/limits.h +++ b/compat/limits.h @@ -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. * - * SCCS: @(#) limits.h 1.8 96/07/08 18:00:13 + * RCS: @(#) $Id: limits.h,v 1.1.4.1 1998/09/30 02:15:14 stanton Exp $ */ #define LONG_MIN 0x80000000 diff --git a/compat/stdlib.h b/compat/stdlib.h index 5ffda0e..3f0ab0a 100644 --- a/compat/stdlib.h +++ b/compat/stdlib.h @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) stdlib.h 1.12 98/01/21 21:04:59 + * RCS: @(#) $Id: stdlib.h,v 1.1.4.2 1998/09/30 02:15:15 stanton Exp $ */ #ifndef _STDLIB diff --git a/compat/unistd.h b/compat/unistd.h index 3af430c..3324525 100644 --- a/compat/unistd.h +++ b/compat/unistd.h @@ -12,7 +12,7 @@ * software for any purpose. It is provided "as is" without * express or implied warranty. * - * SCCS: @(#) unistd.h 1.7 96/02/15 14:43:57 + * RCS: @(#) $Id: unistd.h,v 1.1.4.1 1998/09/30 02:15:15 stanton Exp $ */ #ifndef _UNISTD diff --git a/doc/3DBorder.3 b/doc/3DBorder.3 index 30b4f72..5bb6e24 100644 --- a/doc/3DBorder.3 +++ b/doc/3DBorder.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) 3DBorder.3 1.25 98/01/14 13:58:56 +'\" RCS: @(#) $Id: 3DBorder.3,v 1.1.4.2 1998/09/30 02:15:16 stanton Exp $ '\" .so man.macros .TH Tk_Alloc3DBorderFromObj 3 8.1 Tk "Tk Library Procedures" diff --git a/doc/BindTable.3 b/doc/BindTable.3 index bbcb64d..52099b8 100644 --- a/doc/BindTable.3 +++ b/doc/BindTable.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) BindTable.3 1.5 96/03/26 18:03:09 +'\" RCS: @(#) $Id: BindTable.3,v 1.1.4.1 1998/09/30 02:15:16 stanton Exp $ '\" .so man.macros .TH Tk_CreateBindingTable 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/CanvPsY.3 b/doc/CanvPsY.3 index 017b762..54c7fe3 100644 --- a/doc/CanvPsY.3 +++ b/doc/CanvPsY.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) CanvPsY.3 1.6 96/03/26 18:03:26 +'\" RCS: @(#) $Id: CanvPsY.3,v 1.1.4.1 1998/09/30 02:15:17 stanton Exp $ '\" .so man.macros .TH Tk_CanvasPsY 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/CanvTkwin.3 b/doc/CanvTkwin.3 index b421b5e..c1f0bb7 100644 --- a/doc/CanvTkwin.3 +++ b/doc/CanvTkwin.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) CanvTkwin.3 1.8 96/08/27 13:21:54 +'\" RCS: @(#) $Id: CanvTkwin.3,v 1.1.4.1 1998/09/30 02:15:18 stanton Exp $ '\" .so man.macros .TH Tk_CanvasTkwin 3 4.1 Tk "Tk Library Procedures" diff --git a/doc/CanvTxtInfo.3 b/doc/CanvTxtInfo.3 index 47b37f7..bb19744 100644 --- a/doc/CanvTxtInfo.3 +++ b/doc/CanvTxtInfo.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) CanvTxtInfo.3 1.8 96/03/26 18:03:51 +'\" RCS: @(#) $Id: CanvTxtInfo.3,v 1.1.4.1 1998/09/30 02:15:18 stanton Exp $ '\" .so man.macros .TH Tk_CanvasTextInfo 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/Clipboard.3 b/doc/Clipboard.3 index 10de58f..e28bb63 100644 --- a/doc/Clipboard.3 +++ b/doc/Clipboard.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) Clipboard.3 1.5 96/03/26 18:04:10 +'\" RCS: @(#) $Id: Clipboard.3,v 1.1.4.1 1998/09/30 02:15:18 stanton Exp $ '\" .so man.macros .TH Tk_ClipboardClear 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/ClrSelect.3 b/doc/ClrSelect.3 index 6100973..c5eb323 100644 --- a/doc/ClrSelect.3 +++ b/doc/ClrSelect.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) ClrSelect.3 1.10 96/08/27 13:21:16 +'\" RCS: @(#) $Id: ClrSelect.3,v 1.1.4.1 1998/09/30 02:15:19 stanton Exp $ '\" .so man.macros .TH Tk_ClearSelection 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/ConfigWidg.3 b/doc/ConfigWidg.3 index 733870c..a79726e 100644 --- a/doc/ConfigWidg.3 +++ b/doc/ConfigWidg.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) ConfigWidg.3 1.32 98/01/02 13:18:16 +'\" RCS: @(#) $Id: ConfigWidg.3,v 1.1.4.2 1998/09/30 02:15:19 stanton Exp $ '\" .so man.macros .TH Tk_ConfigureWidget 3 4.1 Tk "Tk Library Procedures" diff --git a/doc/ConfigWind.3 b/doc/ConfigWind.3 index bbfd929..18b3aa0 100644 --- a/doc/ConfigWind.3 +++ b/doc/ConfigWind.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) ConfigWind.3 1.27 96/08/27 13:21:19 +'\" RCS: @(#) $Id: ConfigWind.3,v 1.1.4.1 1998/09/30 02:15:20 stanton Exp $ '\" .so man.macros .TH Tk_ConfigureWindow 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/CoordToWin.3 b/doc/CoordToWin.3 index 8773095..93d7f42 100644 --- a/doc/CoordToWin.3 +++ b/doc/CoordToWin.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) CoordToWin.3 1.9 96/03/26 18:05:14 +'\" RCS: @(#) $Id: CoordToWin.3,v 1.1.4.1 1998/09/30 02:15:47 stanton Exp $ '\" .so man.macros .TH Tk_CoordsToWindow 3 "" Tk "Tk Library Procedures" diff --git a/doc/CrtErrHdlr.3 b/doc/CrtErrHdlr.3 index a28a77b..c427ff4 100644 --- a/doc/CrtErrHdlr.3 +++ b/doc/CrtErrHdlr.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) CrtErrHdlr.3 1.12 96/03/26 18:05:30 +'\" RCS: @(#) $Id: CrtErrHdlr.3,v 1.1.4.1 1998/09/30 02:15:47 stanton Exp $ '\" .so man.macros .TH Tk_CreateErrorHandler 3 "" Tk "Tk Library Procedures" diff --git a/doc/CrtGenHdlr.3 b/doc/CrtGenHdlr.3 index df3eca5..fbbc61a 100644 --- a/doc/CrtGenHdlr.3 +++ b/doc/CrtGenHdlr.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) CrtGenHdlr.3 1.9 96/03/26 18:06:21 +'\" RCS: @(#) $Id: CrtGenHdlr.3,v 1.1.4.1 1998/09/30 02:15:47 stanton Exp $ '\" .so man.macros .TH Tk_CreateGenericHandler 3 "" Tk "Tk Library Procedures" diff --git a/doc/CrtImgType.3 b/doc/CrtImgType.3 index 4ad5799..2d72fd5 100644 --- a/doc/CrtImgType.3 +++ b/doc/CrtImgType.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) CrtImgType.3 1.9 97/08/08 15:43:15 +'\" RCS: @(#) $Id: CrtImgType.3,v 1.1.4.1 1998/09/30 02:15:48 stanton Exp $ '\" .so man.macros .TH Tk_CreateImageType 3 8.0 Tk "Tk Library Procedures" diff --git a/doc/CrtItemType.3 b/doc/CrtItemType.3 index 7f26dc5..17ed9ff 100644 --- a/doc/CrtItemType.3 +++ b/doc/CrtItemType.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) CrtItemType.3 1.7 96/02/16 10:30:28 +'\" RCS: @(#) $Id: CrtItemType.3,v 1.1.4.1 1998/09/30 02:15:48 stanton Exp $ '\" .so man.macros .TH Tk_CreateItemType 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/CrtPhImgFmt.3 b/doc/CrtPhImgFmt.3 index 747b631..22346da 100644 --- a/doc/CrtPhImgFmt.3 +++ b/doc/CrtPhImgFmt.3 @@ -9,7 +9,7 @@ '\" Department of Computer Science, '\" Australian National University. '\" -'\" SCCS: @(#) CrtPhImgFmt.3 1.10 97/10/31 12:58:54 +'\" RCS: @(#) $Id: CrtPhImgFmt.3,v 1.1.4.1 1998/09/30 02:15:49 stanton Exp $ '\" .so man.macros .TH Tk_CreatePhotoImageFormat 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/CrtSelHdlr.3 b/doc/CrtSelHdlr.3 index 96cddca..32367c9 100644 --- a/doc/CrtSelHdlr.3 +++ b/doc/CrtSelHdlr.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) CrtSelHdlr.3 1.18 96/08/27 13:21:21 +'\" RCS: @(#) $Id: CrtSelHdlr.3,v 1.1.4.1 1998/09/30 02:15:49 stanton Exp $ '\" .so man.macros .TH Tk_CreateSelHandler 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/CrtWindow.3 b/doc/CrtWindow.3 index 561a2da..d13a07f 100644 --- a/doc/CrtWindow.3 +++ b/doc/CrtWindow.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" @(#) CrtWindow.3 1.21 96/11/01 09:42:20 +'\" RCS: @(#) $Id: CrtWindow.3,v 1.1.4.2 1998/09/30 02:15:49 stanton Exp $ '\" .so man.macros .TH Tk_CreateWindow 3 4.2 Tk "Tk Library Procedures" diff --git a/doc/DeleteImg.3 b/doc/DeleteImg.3 index 88b2d23..d9230b4 100644 --- a/doc/DeleteImg.3 +++ b/doc/DeleteImg.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) DeleteImg.3 1.4 96/03/26 18:07:21 +'\" RCS: @(#) $Id: DeleteImg.3,v 1.1.4.1 1998/09/30 02:15:50 stanton Exp $ '\" .so man.macros .TH Tk_DeleteImage 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/DrawFocHlt.3 b/doc/DrawFocHlt.3 index dfcc810..dee723a 100644 --- a/doc/DrawFocHlt.3 +++ b/doc/DrawFocHlt.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) DrawFocHlt.3 1.4 96/03/26 18:07:35 +'\" RCS: @(#) $Id: DrawFocHlt.3,v 1.1.4.1 1998/09/30 02:15:50 stanton Exp $ '\" .so man.macros .TH Tk_DrawFocusHighlight 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/EventHndlr.3 b/doc/EventHndlr.3 index c9222b4..b14661e 100644 --- a/doc/EventHndlr.3 +++ b/doc/EventHndlr.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) EventHndlr.3 1.15 96/03/14 10:55:08 +'\" RCS: @(#) $Id: EventHndlr.3,v 1.1.4.1 1998/09/30 02:15:51 stanton Exp $ '\" .so man.macros .TH Tk_CreateEventHandler 3 "" Tk "Tk Library Procedures" diff --git a/doc/FindPhoto.3 b/doc/FindPhoto.3 index 188477c..f2276a5 100644 --- a/doc/FindPhoto.3 +++ b/doc/FindPhoto.3 @@ -9,7 +9,7 @@ '\" Department of Computer Science, '\" Australian National University. '\" -'\" "@(#) FindPhoto.3 1.11 97/08/22 18:52:33" +'\" RCS: @(#) $Id: FindPhoto.3,v 1.1.4.1 1998/09/30 02:15:51 stanton Exp $ '\" .so man.macros .TH Tk_FindPhoto 3 8.0 Tk "Tk Library Procedures" diff --git a/doc/FontId.3 b/doc/FontId.3 index 71f39e1..e92313c 100644 --- a/doc/FontId.3 +++ b/doc/FontId.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) FontId.3 1.4 97/11/04 18:03:07 +'\" RCS: @(#) $Id: FontId.3,v 1.1.4.1 1998/09/30 02:15:51 stanton Exp $ '\" .so man.macros .TH Tk_FontId 3 8.0 Tk "Tk Library Procedures" diff --git a/doc/FreeXId.3 b/doc/FreeXId.3 index 904523a..98a0376 100644 --- a/doc/FreeXId.3 +++ b/doc/FreeXId.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) FreeXId.3 1.5 96/03/26 18:07:59 +'\" RCS: @(#) $Id: FreeXId.3,v 1.1.4.1 1998/09/30 02:15:52 stanton Exp $ '\" .so man.macros .TH Tk_FreeXId 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/GeomReq.3 b/doc/GeomReq.3 index d06b0f8..5982708 100644 --- a/doc/GeomReq.3 +++ b/doc/GeomReq.3 @@ -6,7 +6,7 @@ '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" '\" -'\" SCCS: @(#) GeomReq.3 1.11 96/03/26 18:08:21 +'\" RCS: @(#) $Id: GeomReq.3,v 1.1.4.1 1998/09/30 02:15:52 stanton Exp $ '\" .so man.macros .TH Tk_GeometryRequest 3 "" Tk "Tk Library Procedures" diff --git a/doc/GetAnchor.3 b/doc/GetAnchor.3 index 96ac879..74f749a 100644 --- a/doc/GetAnchor.3 +++ b/doc/GetAnchor.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetAnchor.3 1.11 98/01/28 13:00:43 +'\" RCS: @(#) $Id: GetAnchor.3,v 1.1.4.2 1998/09/30 02:15:52 stanton Exp $ '\" .so man.macros .TH Tk_GetAnchorFromObj 3 8.1 Tk "Tk Library Procedures" diff --git a/doc/GetBitmap.3 b/doc/GetBitmap.3 index edc806c..b9a5ae8 100644 --- a/doc/GetBitmap.3 +++ b/doc/GetBitmap.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetBitmap.3 1.28 98/01/14 13:58:57 +'\" RCS: @(#) $Id: GetBitmap.3,v 1.1.4.2 1998/09/30 02:15:53 stanton Exp $ '\" .so man.macros .TH Tk_AllocBitmapFromObj 3 8.1 Tk "Tk Library Procedures" diff --git a/doc/GetCapStyl.3 b/doc/GetCapStyl.3 index a9b8ec9..692a6fa 100644 --- a/doc/GetCapStyl.3 +++ b/doc/GetCapStyl.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetCapStyl.3 1.9 96/03/26 18:09:14 +'\" RCS: @(#) $Id: GetCapStyl.3,v 1.1.4.1 1998/09/30 02:15:53 stanton Exp $ '\" .so man.macros .TH Tk_GetCapStyle 3 "" Tk "Tk Library Procedures" diff --git a/doc/GetClrmap.3 b/doc/GetClrmap.3 index 4a4121f..c25ae01 100644 --- a/doc/GetClrmap.3 +++ b/doc/GetClrmap.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetClrmap.3 1.5 96/03/26 18:09:27 +'\" RCS: @(#) $Id: GetClrmap.3,v 1.1.4.1 1998/09/30 02:15:53 stanton Exp $ '\" .so man.macros .TH Tk_GetColormap 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/GetColor.3 b/doc/GetColor.3 index f989cb0..da5017a 100644 --- a/doc/GetColor.3 +++ b/doc/GetColor.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetColor.3 1.24 98/01/14 13:58:58 +'\" RCS: @(#) $Id: GetColor.3,v 1.1.4.2 1998/09/30 02:15:54 stanton Exp $ '\" .so man.macros .TH Tk_AllocColorFromObj 3 8.1 Tk "Tk Library Procedures" diff --git a/doc/GetCursor.3 b/doc/GetCursor.3 index 329498a..690f876 100644 --- a/doc/GetCursor.3 +++ b/doc/GetCursor.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetCursor.3 1.24 98/01/14 13:58:59 +'\" RCS: @(#) $Id: GetCursor.3,v 1.1.4.2 1998/09/30 02:15:54 stanton Exp $ '\" .so man.macros .TH Tk_AllocCursorFromObj 3 8.1 Tk "Tk Library Procedures" diff --git a/doc/GetFont.3 b/doc/GetFont.3 index 006ea0d..32691c9 100644 --- a/doc/GetFont.3 +++ b/doc/GetFont.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetFont.3 1.12 98/01/14 13:58:59 +'\" RCS: @(#) $Id: GetFont.3,v 1.1.4.2 1998/09/30 02:15:55 stanton Exp $ '\" .so man.macros .TH Tk_AllocFontFromObj 3 8.1 Tk "Tk Library Procedures" diff --git a/doc/GetGC.3 b/doc/GetGC.3 index 6908e9d..7c19a26 100644 --- a/doc/GetGC.3 +++ b/doc/GetGC.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetGC.3 1.11 96/03/26 18:10:14 +'\" RCS: @(#) $Id: GetGC.3,v 1.1.4.1 1998/09/30 02:15:55 stanton Exp $ '\" .so man.macros .TH Tk_GetGC 3 "" Tk "Tk Library Procedures" diff --git a/doc/GetImage.3 b/doc/GetImage.3 index 4ac178a..49796cc 100644 --- a/doc/GetImage.3 +++ b/doc/GetImage.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetImage.3 1.8 96/03/26 18:10:29 +'\" RCS: @(#) $Id: GetImage.3,v 1.1.4.1 1998/09/30 02:15:55 stanton Exp $ '\" .so man.macros .TH Tk_GetImage 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/GetJoinStl.3 b/doc/GetJoinStl.3 index 8be41da..456936a 100644 --- a/doc/GetJoinStl.3 +++ b/doc/GetJoinStl.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetJoinStl.3 1.8 96/03/26 18:10:46 +'\" RCS: @(#) $Id: GetJoinStl.3,v 1.1.4.1 1998/09/30 02:15:56 stanton Exp $ '\" .so man.macros .TH Tk_GetJoinStyle 3 "" Tk "Tk Library Procedures" diff --git a/doc/GetJustify.3 b/doc/GetJustify.3 index 1d5622d..56f0791 100644 --- a/doc/GetJustify.3 +++ b/doc/GetJustify.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetJustify.3 1.12 98/01/14 13:59:00 +'\" RCS: @(#) $Id: GetJustify.3,v 1.1.4.2 1998/09/30 02:15:56 stanton Exp $ '\" .so man.macros .TH Tk_GetJustifyFromObj 3 8.1 Tk "Tk Library Procedures" diff --git a/doc/GetOption.3 b/doc/GetOption.3 index d00fd9b..8dd9939 100644 --- a/doc/GetOption.3 +++ b/doc/GetOption.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetOption.3 1.9 96/03/26 18:11:11 +'\" RCS: @(#) $Id: GetOption.3,v 1.1.4.1 1998/09/30 02:15:56 stanton Exp $ '\" .so man.macros .TH Tk_GetOption 3 "" Tk "Tk Library Procedures" diff --git a/doc/GetPixels.3 b/doc/GetPixels.3 index 07d94c8..dfd0e1e 100644 --- a/doc/GetPixels.3 +++ b/doc/GetPixels.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetPixels.3 1.9 98/01/14 13:59:00 +'\" RCS: @(#) $Id: GetPixels.3,v 1.1.4.2 1998/09/30 02:15:57 stanton Exp $ '\" .so man.macros .TH Tk_GetPixelsFromObj 3 8.1 Tk "Tk Library Procedures" diff --git a/doc/GetPixmap.3 b/doc/GetPixmap.3 index f5d030e..6ca3016 100644 --- a/doc/GetPixmap.3 +++ b/doc/GetPixmap.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetPixmap.3 1.7 96/03/26 18:11:47 +'\" RCS: @(#) $Id: GetPixmap.3,v 1.1.4.1 1998/09/30 02:15:57 stanton Exp $ '\" .so man.macros .TH Tk_GetPixmap 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/GetRelief.3 b/doc/GetRelief.3 index 37a7cb9..ee2b01e 100644 --- a/doc/GetRelief.3 +++ b/doc/GetRelief.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetRelief.3 1.12 98/01/14 13:59:01 +'\" RCS: @(#) $Id: GetRelief.3,v 1.1.4.2 1998/09/30 02:15:57 stanton Exp $ '\" .so man.macros .TH Tk_GetReliefFromObj 3 8.1 Tk "Tk Library Procedures" diff --git a/doc/GetRootCrd.3 b/doc/GetRootCrd.3 index c9dea3c..1cef19c 100644 --- a/doc/GetRootCrd.3 +++ b/doc/GetRootCrd.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetRootCrd.3 1.9 96/03/26 18:12:16 +'\" RCS: @(#) $Id: GetRootCrd.3,v 1.1.4.1 1998/09/30 02:15:58 stanton Exp $ '\" .so man.macros .TH Tk_GetRootCoords 3 "" Tk "Tk Library Procedures" diff --git a/doc/GetScroll.3 b/doc/GetScroll.3 index 72b97f7..cb06b0b 100644 --- a/doc/GetScroll.3 +++ b/doc/GetScroll.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetScroll.3 1.7 96/03/26 18:12:29 +'\" RCS: @(#) $Id: GetScroll.3,v 1.1.4.1 1998/09/30 02:15:58 stanton Exp $ '\" .so man.macros .TH Tk_GetScrollInfo 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/GetSelect.3 b/doc/GetSelect.3 index f0780cc..85d8baa 100644 --- a/doc/GetSelect.3 +++ b/doc/GetSelect.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetSelect.3 1.16 96/08/27 13:21:28 +'\" RCS: @(#) $Id: GetSelect.3,v 1.1.4.1 1998/09/30 02:15:58 stanton Exp $ '\" .so man.macros .TH Tk_GetSelection 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/GetUid.3 b/doc/GetUid.3 index 7c6bb7c..b335af2 100644 --- a/doc/GetUid.3 +++ b/doc/GetUid.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetUid.3 1.10 96/03/26 18:12:55 +'\" RCS: @(#) $Id: GetUid.3,v 1.1.4.1 1998/09/30 02:15:59 stanton Exp $ '\" .so man.macros .TH Tk_GetUid 3 "" Tk "Tk Library Procedures" diff --git a/doc/GetVRoot.3 b/doc/GetVRoot.3 index 9895e42..b6f36f9 100644 --- a/doc/GetVRoot.3 +++ b/doc/GetVRoot.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetVRoot.3 1.10 96/08/27 13:21:28 +'\" RCS: @(#) $Id: GetVRoot.3,v 1.1.4.1 1998/09/30 02:15:59 stanton Exp $ '\" .so man.macros .TH Tk_GetVRootGeometry 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/GetVisual.3 b/doc/GetVisual.3 index cf54c2c..93da46d 100644 --- a/doc/GetVisual.3 +++ b/doc/GetVisual.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) GetVisual.3 1.9 96/03/26 18:13:20 +'\" RCS: @(#) $Id: GetVisual.3,v 1.1.4.1 1998/09/30 02:15:59 stanton Exp $ '\" .so man.macros .TH Tk_GetVisual 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/HandleEvent.3 b/doc/HandleEvent.3 index 4fb0a7f..4616df2 100644 --- a/doc/HandleEvent.3 +++ b/doc/HandleEvent.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) HandleEvent.3 1.6 96/03/26 18:13:34 +'\" RCS: @(#) $Id: HandleEvent.3,v 1.1.4.1 1998/09/30 02:16:00 stanton Exp $ '\" .so man.macros .TH Tk_HandleEvent 3 "" Tk "Tk Library Procedures" diff --git a/doc/IdToWindow.3 b/doc/IdToWindow.3 index fd7af7d..487ff8e 100644 --- a/doc/IdToWindow.3 +++ b/doc/IdToWindow.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) IdToWindow.3 1.4 96/03/26 18:14:08 +'\" RCS: @(#) $Id: IdToWindow.3,v 1.1.4.1 1998/09/30 02:16:00 stanton Exp $ '\" .so man.macros .TH Tk_IdToWindow 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/ImgChanged.3 b/doc/ImgChanged.3 index 5210e82..6367bd9 100644 --- a/doc/ImgChanged.3 +++ b/doc/ImgChanged.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) ImgChanged.3 1.6 96/03/26 18:14:18 +'\" RCS: @(#) $Id: ImgChanged.3,v 1.1.4.1 1998/09/30 02:16:01 stanton Exp $ '\" .so man.macros .TH Tk_ImageChanged 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/InternAtom.3 b/doc/InternAtom.3 index e6eff2c..eb2bf7c 100644 --- a/doc/InternAtom.3 +++ b/doc/InternAtom.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) InternAtom.3 1.8 96/03/26 18:14:31 +'\" RCS: @(#) $Id: InternAtom.3,v 1.1.4.1 1998/09/30 02:16:01 stanton Exp $ '\" .so man.macros .TH Tk_InternAtom 3 "" Tk "Tk Library Procedures" diff --git a/doc/MainLoop.3 b/doc/MainLoop.3 index 339f7e1..f6123e0 100644 --- a/doc/MainLoop.3 +++ b/doc/MainLoop.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) MainLoop.3 1.3 96/03/26 18:15:01 +'\" RCS: @(#) $Id: MainLoop.3,v 1.1.4.1 1998/09/30 02:16:01 stanton Exp $ '\" .so man.macros .TH Tk_MainLoop 3 "" Tk "Tk Library Procedures" diff --git a/doc/MainWin.3 b/doc/MainWin.3 index 4144812..4599ac8 100644 --- a/doc/MainWin.3 +++ b/doc/MainWin.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) MainWin.3 1.5 96/03/26 18:15:15 +'\" RCS: @(#) $Id: MainWin.3,v 1.1.4.1 1998/09/30 02:16:02 stanton Exp $ '\" .so man.macros .TH Tk_MainWindow 3 7.0 Tk "Tk Library Procedures" diff --git a/doc/MaintGeom.3 b/doc/MaintGeom.3 index 159b3b7..d0149e2 100644 --- a/doc/MaintGeom.3 +++ b/doc/MaintGeom.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) MaintGeom.3 1.7 96/03/26 18:15:30 +'\" RCS: @(#) $Id: MaintGeom.3,v 1.1.4.1 1998/09/30 02:16:02 stanton Exp $ '\" .so man.macros .TH Tk_MaintainGeometry 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/ManageGeom.3 b/doc/ManageGeom.3 index 67ca5b4..561dc74 100644 --- a/doc/ManageGeom.3 +++ b/doc/ManageGeom.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) ManageGeom.3 1.18 96/08/27 13:21:30 +'\" RCS: @(#) $Id: ManageGeom.3,v 1.1.4.1 1998/09/30 02:16:03 stanton Exp $ '\" .so man.macros .TH Tk_ManageGeometry 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/MapWindow.3 b/doc/MapWindow.3 index 802ef7b..1b1329f 100644 --- a/doc/MapWindow.3 +++ b/doc/MapWindow.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) MapWindow.3 1.12 97/01/29 08:50:08 +'\" RCS: @(#) $Id: MapWindow.3,v 1.1.4.1 1998/09/30 02:16:03 stanton Exp $ '\" .so man.macros .TH Tk_MapWindow 3 "" Tk "Tk Library Procedures" diff --git a/doc/MeasureChar.3 b/doc/MeasureChar.3 index 3d54578..3f48e3c 100644 --- a/doc/MeasureChar.3 +++ b/doc/MeasureChar.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) MeasureChar.3 1.5 97/06/10 17:33:36 +'\" RCS: @(#) $Id: MeasureChar.3,v 1.1.4.1 1998/09/30 02:16:03 stanton Exp $ '\" .so man.macros .TH Tk_MeasureChars 3 "" Tk "Tk Library Procedures" diff --git a/doc/MoveToplev.3 b/doc/MoveToplev.3 index 4aec2b7..01cedb4 100644 --- a/doc/MoveToplev.3 +++ b/doc/MoveToplev.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) MoveToplev.3 1.8 96/03/26 18:16:11 +'\" RCS: @(#) $Id: MoveToplev.3,v 1.1.4.1 1998/09/30 02:16:04 stanton Exp $ '\" .so man.macros .TH Tk_MoveToplevelWindow 3 "" Tk "Tk Library Procedures" @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) Name.3 1.14 97/01/29 08:50:09 +'\" RCS: @(#) $Id: Name.3,v 1.1.4.1 1998/09/30 02:16:04 stanton Exp $ '\" .so man.macros .TH Tk_Name 3 "" Tk "Tk Library Procedures" diff --git a/doc/NameOfImg.3 b/doc/NameOfImg.3 index 4fd814c..9c7a7d9 100644 --- a/doc/NameOfImg.3 +++ b/doc/NameOfImg.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) NameOfImg.3 1.4 96/03/26 18:16:37 +'\" RCS: @(#) $Id: NameOfImg.3,v 1.1.4.1 1998/09/30 02:16:04 stanton Exp $ '\" .so man.macros .TH Tk_NameOfImage 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/OwnSelect.3 b/doc/OwnSelect.3 index 9473c76..4187482 100644 --- a/doc/OwnSelect.3 +++ b/doc/OwnSelect.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) OwnSelect.3 1.16 96/08/27 13:21:31 +'\" RCS: @(#) $Id: OwnSelect.3,v 1.1.4.1 1998/09/30 02:16:05 stanton Exp $ '\" .so man.macros .TH Tk_OwnSelection 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/ParseArgv.3 b/doc/ParseArgv.3 index 8a1e854..5c070e7 100644 --- a/doc/ParseArgv.3 +++ b/doc/ParseArgv.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) ParseArgv.3 1.17 97/10/31 12:58:44 +'\" RCS: @(#) $Id: ParseArgv.3,v 1.1.4.1 1998/09/30 02:16:05 stanton Exp $ '\" .so man.macros .TH Tk_ParseArgv 3 "" Tk "Tk Library Procedures" diff --git a/doc/QWinEvent.3 b/doc/QWinEvent.3 index 5bbb4f4..1b7c24e 100644 --- a/doc/QWinEvent.3 +++ b/doc/QWinEvent.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) QWinEvent.3 1.4 96/03/26 18:17:16 +'\" RCS: @(#) $Id: QWinEvent.3,v 1.1.4.1 1998/09/30 02:16:05 stanton Exp $ '\" .so man.macros .TH Tk_QueueWindowEvent 3 7.5 Tk "Tk Library Procedures" diff --git a/doc/Restack.3 b/doc/Restack.3 index 6f86c8e..abccf68 100644 --- a/doc/Restack.3 +++ b/doc/Restack.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) Restack.3 1.5 96/03/26 18:17:32 +'\" RCS: @(#) $Id: Restack.3,v 1.1.4.1 1998/09/30 02:16:06 stanton Exp $ '\" .so man.macros .TH Tk_RestackWindow 3 "" Tk "Tk Library Procedures" diff --git a/doc/RestrictEv.3 b/doc/RestrictEv.3 index 5daaac4..1d95fb7 100644 --- a/doc/RestrictEv.3 +++ b/doc/RestrictEv.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) RestrictEv.3 1.13 96/08/27 13:21:55 +'\" RCS: @(#) $Id: RestrictEv.3,v 1.1.4.1 1998/09/30 02:16:06 stanton Exp $ '\" .so man.macros .TH Tk_RestrictEvents 3 "" Tk "Tk Library Procedures" diff --git a/doc/SetAppName.3 b/doc/SetAppName.3 index df2ad30..866d933 100644 --- a/doc/SetAppName.3 +++ b/doc/SetAppName.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) SetAppName.3 1.13 97/06/10 17:33:48 +'\" RCS: @(#) $Id: SetAppName.3,v 1.1.4.1 1998/09/30 02:16:07 stanton Exp $ '\" .so man.macros .TH Tk_SetAppName 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/SetClass.3 b/doc/SetClass.3 index 03127b7..0d89620 100644 --- a/doc/SetClass.3 +++ b/doc/SetClass.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) SetClass.3 1.12 96/03/26 18:18:10 +'\" RCS: @(#) $Id: SetClass.3,v 1.1.4.1 1998/09/30 02:16:07 stanton Exp $ '\" .so man.macros .TH Tk_SetClass 3 "" Tk "Tk Library Procedures" diff --git a/doc/SetGrid.3 b/doc/SetGrid.3 index b2a3b40..c9dff4f 100644 --- a/doc/SetGrid.3 +++ b/doc/SetGrid.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) SetGrid.3 1.11 96/08/27 13:21:33 +'\" RCS: @(#) $Id: SetGrid.3,v 1.1.4.1 1998/09/30 02:16:07 stanton Exp $ '\" .so man.macros .TH Tk_SetGrid 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/SetOptions.3 b/doc/SetOptions.3 index a734395..52f4da8 100644 --- a/doc/SetOptions.3 +++ b/doc/SetOptions.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) SetOptions.3 1.6 98/01/10 15:33:01 +'\" RCS: @(#) $Id: SetOptions.3,v 1.1.2.2 1998/09/30 02:16:08 stanton Exp $ '\" .so man.macros .TH Tk_SetOptions 3 8.1 Tk "Tk Library Procedures" diff --git a/doc/SetVisual.3 b/doc/SetVisual.3 index f76c467..facb0ab 100644 --- a/doc/SetVisual.3 +++ b/doc/SetVisual.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) SetVisual.3 1.10 96/03/26 18:18:39 +'\" RCS: @(#) $Id: SetVisual.3,v 1.1.4.1 1998/09/30 02:16:08 stanton Exp $ '\" .so man.macros .TH Tk_SetWindowVisual 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/StrictMotif.3 b/doc/StrictMotif.3 index 6ba5b60..e8f7e95 100644 --- a/doc/StrictMotif.3 +++ b/doc/StrictMotif.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) StrictMotif.3 1.4 96/03/26 18:18:52 +'\" RCS: @(#) $Id: StrictMotif.3,v 1.1.4.1 1998/09/30 02:16:08 stanton Exp $ '\" .so man.macros .TH Tk_StrictMotif 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/TextLayout.3 b/doc/TextLayout.3 index d4a8399..461633a 100644 --- a/doc/TextLayout.3 +++ b/doc/TextLayout.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) TextLayout.3 1.6 96/12/16 16:48:12 +'\" RCS: @(#) $Id: TextLayout.3,v 1.1.4.1 1998/09/30 02:16:09 stanton Exp $ '\" .so man.macros .TH Tk_ComputeTextLayout 3 "" Tk "Tk Library Procedures" diff --git a/doc/Tk_Init.3 b/doc/Tk_Init.3 index 20ed41d..45d85cd 100644 --- a/doc/Tk_Init.3 +++ b/doc/Tk_Init.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) Tk_Init.3 1.3 96/03/26 18:19:08 +'\" RCS: @(#) $Id: Tk_Init.3,v 1.1.4.1 1998/09/30 02:16:09 stanton Exp $ '\" .so man.macros .TH Tk_Init 3 4.1 Tk "Tk Library Procedures" diff --git a/doc/Tk_Main.3 b/doc/Tk_Main.3 index 7565aae..571a698 100644 --- a/doc/Tk_Main.3 +++ b/doc/Tk_Main.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) Tk_Main.3 1.7 96/03/26 18:19:21 +'\" RCS: @(#) $Id: Tk_Main.3,v 1.1.4.1 1998/09/30 02:16:10 stanton Exp $ '\" .so man.macros .TH Tk_Main 3 4.0 Tk "Tk Library Procedures" diff --git a/doc/WindowId.3 b/doc/WindowId.3 index 3de27b0..1102db3 100644 --- a/doc/WindowId.3 +++ b/doc/WindowId.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) WindowId.3 1.16 97/01/29 08:50:10 +'\" RCS: @(#) $Id: WindowId.3,v 1.1.4.1 1998/09/30 02:16:10 stanton Exp $ '\" .so man.macros .TH Tk_WindowId 3 "" Tk "Tk Library Procedures" @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) bell.n 1.8 96/03/26 18:19:55 +'\" RCS: @(#) $Id: bell.n,v 1.1.4.1 1998/09/30 02:16:10 stanton Exp $ '\" .so man.macros .TH bell n 4.0 Tk "Tk Built-In Commands" @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) bind.n 1.41 96/10/03 18:27:05 +'\" RCS: @(#) $Id: bind.n,v 1.1.4.1 1998/09/30 02:16:11 stanton Exp $ '\" .so man.macros .TH bind n 4.1 Tk "Tk Built-In Commands" diff --git a/doc/bindtags.n b/doc/bindtags.n index c93bb63..f364953 100644 --- a/doc/bindtags.n +++ b/doc/bindtags.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) bindtags.n 1.9 96/11/30 14:54:49 +'\" RCS: @(#) $Id: bindtags.n,v 1.1.4.1 1998/09/30 02:16:11 stanton Exp $ '\" .so man.macros .TH bindtags n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/bitmap.n b/doc/bitmap.n index 8ede15a..3baaa1c 100644 --- a/doc/bitmap.n +++ b/doc/bitmap.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) bitmap.n 1.10 96/03/29 14:48:41 +'\" RCS: @(#) $Id: bitmap.n,v 1.1.4.1 1998/09/30 02:16:11 stanton Exp $ '\" .so man.macros .TH bitmap n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/button.n b/doc/button.n index 776929f..f365710 100644 --- a/doc/button.n +++ b/doc/button.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) button.n 1.40 97/10/31 12:58:48 +'\" RCS: @(#) $Id: button.n,v 1.1.4.1 1998/09/30 02:16:12 stanton Exp $ '\" .so man.macros .TH button n 4.4 Tk "Tk Built-In Commands" diff --git a/doc/canvas.n b/doc/canvas.n index 4e1c779..3d9d384 100644 --- a/doc/canvas.n +++ b/doc/canvas.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) canvas.n 1.58 97/10/31 12:58:45 +'\" RCS: @(#) $Id: canvas.n,v 1.1.4.1 1998/09/30 02:16:12 stanton Exp $ '\" .so man.macros .TH canvas n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/checkbutton.n b/doc/checkbutton.n index b06e7fc..14e0724 100644 --- a/doc/checkbutton.n +++ b/doc/checkbutton.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) checkbutton.n 1.40 96/11/20 12:51:21 +'\" RCS: @(#) $Id: checkbutton.n,v 1.1.4.1 1998/09/30 02:16:13 stanton Exp $ '\" .so man.macros .TH checkbutton n 4.4 Tk "Tk Built-In Commands" diff --git a/doc/chooseColor.n b/doc/chooseColor.n index 8e4f210..f9b1138 100644 --- a/doc/chooseColor.n +++ b/doc/chooseColor.n @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) chooseColor.n 1.4 96/09/19 17:01:44 +'\" RCS: @(#) $Id: chooseColor.n,v 1.1.4.1 1998/09/30 02:16:13 stanton Exp $ '\" .so man.macros .TH tk_chooseColor n 4.2 Tk "Tk Built-In Commands" diff --git a/doc/clipboard.n b/doc/clipboard.n index 770463d..7abb970 100644 --- a/doc/clipboard.n +++ b/doc/clipboard.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) clipboard.n 1.9 96/03/26 18:21:12 +'\" RCS: @(#) $Id: clipboard.n,v 1.1.4.1 1998/09/30 02:16:14 stanton Exp $ '\" .so man.macros .TH clipboard n 4.0 Tk "Tk Built-In Commands" @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) dde.n 1.3 98/01/28 12:48:08 +'\" RCS: @(#) $Id: dde.n,v 1.1.2.2 1998/09/30 02:16:14 stanton Exp $ '\" .so man.macros .TH dde n 8.1 Tk "Tk Built-In Commands" diff --git a/doc/destroy.n b/doc/destroy.n index 9bcdc5c..fffd71d 100644 --- a/doc/destroy.n +++ b/doc/destroy.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) destroy.n 1.14 96/12/12 17:54:59 +'\" RCS: @(#) $Id: destroy.n,v 1.1.4.1 1998/09/30 02:16:15 stanton Exp $ '\" .so man.macros .TH destroy n "" Tk "Tk Built-In Commands" diff --git a/doc/dialog.n b/doc/dialog.n index 06dc0e9..67680d8 100644 --- a/doc/dialog.n +++ b/doc/dialog.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) dialog.n 1.9 96/09/06 09:20:58 +'\" RCS: @(#) $Id: dialog.n,v 1.1.4.1 1998/09/30 02:16:15 stanton Exp $ '\" .so man.macros .TH tk_dialog n 4.1 Tk "Tk Built-In Commands" diff --git a/doc/entry.n b/doc/entry.n index 7a8e718..2b89e21 100644 --- a/doc/entry.n +++ b/doc/entry.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) entry.n 1.41 97/10/31 12:58:44 +'\" RCS: @(#) $Id: entry.n,v 1.1.4.1 1998/09/30 02:16:16 stanton Exp $ '\" .so man.macros .TH entry n 4.1 Tk "Tk Built-In Commands" diff --git a/doc/event.n b/doc/event.n index a7d12b5..82811d4 100644 --- a/doc/event.n +++ b/doc/event.n @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) event.n 1.6 97/10/31 12:58:54 +'\" RCS: @(#) $Id: event.n,v 1.1.4.1 1998/09/30 02:16:16 stanton Exp $ '\" .so man.macros .TH event n 4.4 Tk "Tk Built-In Commands" diff --git a/doc/focus.n b/doc/focus.n index 8bf4897..fde78fc 100644 --- a/doc/focus.n +++ b/doc/focus.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) focus.n 1.22 96/08/27 13:21:42 +'\" RCS: @(#) $Id: focus.n,v 1.1.4.1 1998/09/30 02:16:17 stanton Exp $ '\" .so man.macros .TH focus n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/focusNext.n b/doc/focusNext.n index e1f8fe7..7c75519 100644 --- a/doc/focusNext.n +++ b/doc/focusNext.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) focusNext.n 1.10 96/03/26 18:22:23 +'\" RCS: @(#) $Id: focusNext.n,v 1.1.4.1 1998/09/30 02:16:17 stanton Exp $ '\" .so man.macros .TH tk_focusNext n 4.0 Tk "Tk Built-In Commands" @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) font.n 1.10 97/08/22 18:52:18 +'\" RCS: @(#) $Id: font.n,v 1.1.4.1 1998/09/30 02:16:18 stanton Exp $ '\" .so man.macros .TH font n 8.0 Tk "Tk Built-In Commands" diff --git a/doc/frame.n b/doc/frame.n index c9a3340..f20a66d 100644 --- a/doc/frame.n +++ b/doc/frame.n @@ -6,7 +6,7 @@ '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" '\" -'\" SCCS: @(#) frame.n 1.30 97/10/31 12:58:48 +'\" RCS: @(#) $Id: frame.n,v 1.1.4.1 1998/09/30 02:16:18 stanton Exp $ '\" .so man.macros .TH frame n 8.0 Tk "Tk Built-In Commands" diff --git a/doc/getOpenFile.n b/doc/getOpenFile.n index f8a8b72..aa11a32 100644 --- a/doc/getOpenFile.n +++ b/doc/getOpenFile.n @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) getOpenFile.n 1.8 96/12/08 21:14:31 +'\" RCS: @(#) $Id: getOpenFile.n,v 1.1.4.1 1998/09/30 02:16:18 stanton Exp $ '\" .so man.macros .TH tk_getOpenFile n 4.2 Tk "Tk Built-In Commands" @@ -59,10 +59,12 @@ discussion on the contents of \fIfilePatternList\fR. \fB\-initialdir\fR \fIdirectory\fR Specifies that the files in \fIdirectory\fR should be displayed when the dialog pops up. If this parameter is not specified, then -the files in the current working directory are displayed. This -option may not always work on the Macintosh. This is not a bug. -Rather, the \fIGeneral Controls\fR control panel on the Mac allows the -end user to override the application default directory. +the files in the current working directory are displayed. If the +parameter specifies a relative path, the return value will convert the +relative path to an absolute path. This option may not always work on +the Macintosh. This is not a bug. Rather, the \fIGeneral Controls\fR +control panel on the Mac allows the end user to override the +application default directory. .TP \fB\-initialfile\fR \fIfilename\fR Specifies a filename to be displayed in the dialog when it pops @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) grab.n 1.15 96/03/26 18:22:48 +'\" RCS: @(#) $Id: grab.n,v 1.1.4.1 1998/09/30 02:16:19 stanton Exp $ '\" .so man.macros .TH grab n "" Tk "Tk Built-In Commands" @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) grid.n 1.15 96/12/13 16:46:35 +'\" RCS: @(#) $Id: grid.n,v 1.1.4.1 1998/09/30 02:16:19 stanton Exp $ '\" .so man.macros .TH grid n 4.1 Tk "Tk Built-In Commands" diff --git a/doc/image.n b/doc/image.n index 8189838..ae32e68 100644 --- a/doc/image.n +++ b/doc/image.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) image.n 1.10 96/03/26 18:23:05 +'\" RCS: @(#) $Id: image.n,v 1.1.4.1 1998/09/30 02:16:20 stanton Exp $ '\" .so man.macros .TH image n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/label.n b/doc/label.n index 15a948d..3a717ed 100644 --- a/doc/label.n +++ b/doc/label.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) label.n 1.30 97/10/31 12:58:49 +'\" RCS: @(#) $Id: label.n,v 1.1.4.1 1998/09/30 02:16:20 stanton Exp $ '\" .so man.macros .TH label n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/listbox.n b/doc/listbox.n index 56caa62..5fb27c7 100644 --- a/doc/listbox.n +++ b/doc/listbox.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) listbox.n 1.38 97/10/31 12:58:47 +'\" RCS: @(#) $Id: listbox.n,v 1.1.4.1 1998/09/30 02:16:20 stanton Exp $ '\" .so man.macros .TH listbox n 8.0 Tk "Tk Built-In Commands" diff --git a/doc/loadTk.n b/doc/loadTk.n index dbe7f86..f808890 100644 --- a/doc/loadTk.n +++ b/doc/loadTk.n @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) loadTk.n 1.8 97/11/26 10:10:07 +'\" RCS: @(#) $Id: loadTk.n,v 1.1.4.2 1998/09/30 02:16:21 stanton Exp $ '\" .so man.macros .TH "Safe Tk" n 8.0 Tk "Tk Built-In Commands" diff --git a/doc/lower.n b/doc/lower.n index f3a202c..9272e86 100644 --- a/doc/lower.n +++ b/doc/lower.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) lower.n 1.9 96/06/14 14:19:56 +'\" RCS: @(#) $Id: lower.n,v 1.1.4.1 1998/09/30 02:16:21 stanton Exp $ '\" .so man.macros .TH lower n 3.3 Tk "Tk Built-In Commands" @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) menu.n 1.61 97/10/31 12:58:40 +'\" RCS: @(#) $Id: menu.n,v 1.1.4.1 1998/09/30 02:16:21 stanton Exp $ '\" .so man.macros .TH menu n 4.1 Tk "Tk Built-In Commands" diff --git a/doc/menubar.n b/doc/menubar.n index 09ea053..80ccfbb 100644 --- a/doc/menubar.n +++ b/doc/menubar.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) menubar.n 1.13 96/08/27 13:21:45 +'\" RCS: @(#) $Id: menubar.n,v 1.1.4.1 1998/09/30 02:16:22 stanton Exp $ '\" .so man.macros .TH tk_menuBar n "" Tk "Tk Built-In Commands" diff --git a/doc/menubutton.n b/doc/menubutton.n index 6adae9d..db32007 100644 --- a/doc/menubutton.n +++ b/doc/menubutton.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) menubutton.n 1.36 97/10/31 12:58:49 +'\" RCS: @(#) $Id: menubutton.n,v 1.1.4.1 1998/09/30 02:16:22 stanton Exp $ '\" .so man.macros .TH menubutton n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/message.n b/doc/message.n index 19e2d82..d1939fd 100644 --- a/doc/message.n +++ b/doc/message.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) message.n 1.32 97/10/31 12:58:50 +'\" RCS: @(#) $Id: message.n,v 1.1.4.1 1998/09/30 02:16:23 stanton Exp $ '\" .so man.macros .TH message n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/messageBox.n b/doc/messageBox.n index 7b6a5e6..c4603b1 100644 --- a/doc/messageBox.n +++ b/doc/messageBox.n @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) messageBox.n 1.5 96/09/19 17:02:40 +'\" RCS: @(#) $Id: messageBox.n,v 1.1.4.1 1998/09/30 02:16:23 stanton Exp $ '\" .so man.macros .TH tk_messageBox n 4.2 Tk "Tk Built-In Commands" diff --git a/doc/option.n b/doc/option.n index 33feaf8..d2958ec 100644 --- a/doc/option.n +++ b/doc/option.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) option.n 1.10 96/03/26 18:25:08 +'\" RCS: @(#) $Id: option.n,v 1.1.4.1 1998/09/30 02:16:23 stanton Exp $ '\" .so man.macros .TH option n "" Tk "Tk Built-In Commands" diff --git a/doc/optionMenu.n b/doc/optionMenu.n index 3303847..a0a32c1 100644 --- a/doc/optionMenu.n +++ b/doc/optionMenu.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) optionMenu.n 1.5 96/03/26 18:25:21 +'\" RCS: @(#) $Id: optionMenu.n,v 1.1.4.1 1998/09/30 02:16:24 stanton Exp $ '\" .so man.macros .TH tk_optionMenu n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/options.n b/doc/options.n index 8de9b76..96526f6 100644 --- a/doc/options.n +++ b/doc/options.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) options.n 1.47 97/05/31 17:12:19 +'\" RCS: @(#) $Id: options.n,v 1.1.4.1 1998/09/30 02:16:24 stanton Exp $ '\" .so man.macros .TH options n 4.4 Tk "Tk Built-In Commands" diff --git a/doc/pack-old.n b/doc/pack-old.n index a0638b6..4132039 100644 --- a/doc/pack-old.n +++ b/doc/pack-old.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) pack-old.n 1.12 96/03/26 18:25:44 +'\" RCS: @(#) $Id: pack-old.n,v 1.1.4.1 1998/09/30 02:16:24 stanton Exp $ '\" .so man.macros .TH pack-old n 4.0 Tk "Tk Built-In Commands" @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) pack.n 1.19 96/08/27 13:21:48 +'\" RCS: @(#) $Id: pack.n,v 1.1.4.1 1998/09/30 02:16:25 stanton Exp $ '\" .so man.macros .TH pack n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/palette.n b/doc/palette.n index 7a54eb9..51e0134 100644 --- a/doc/palette.n +++ b/doc/palette.n @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) palette.n 1.5 96/03/26 18:26:11 +'\" RCS: @(#) $Id: palette.n,v 1.1.4.1 1998/09/30 02:16:25 stanton Exp $ '\" .so man.macros .TH tk_setPalette n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/photo.n b/doc/photo.n index 1e26f8a..7b63052 100644 --- a/doc/photo.n +++ b/doc/photo.n @@ -9,7 +9,7 @@ '\" Department of Computer Science, '\" Australian National University. '\" -'\" "@(#) photo.n 1.12 97/10/14 10:52:30" +'\" RCS: @(#) $Id: photo.n,v 1.1.4.1 1998/09/30 02:16:26 stanton Exp $ '\" .so man.macros .TH photo n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/place.n b/doc/place.n index 6084118..9b9f31f 100644 --- a/doc/place.n +++ b/doc/place.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) place.n 1.13 96/08/27 13:21:49 +'\" RCS: @(#) $Id: place.n,v 1.1.4.1 1998/09/30 02:16:26 stanton Exp $ '\" .so man.macros .TH place n "" Tk "Tk Built-In Commands" diff --git a/doc/popup.n b/doc/popup.n index 7728e6c..84f0d62 100644 --- a/doc/popup.n +++ b/doc/popup.n @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) popup.n 1.5 96/03/26 18:26:45 +'\" RCS: @(#) $Id: popup.n,v 1.1.4.1 1998/09/30 02:16:27 stanton Exp $ '\" .so man.macros .TH tk_popup n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/radiobutton.n b/doc/radiobutton.n index 58e4d22..32a4f67 100644 --- a/doc/radiobutton.n +++ b/doc/radiobutton.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) radiobutton.n 1.41 97/10/31 12:58:51 +'\" RCS: @(#) $Id: radiobutton.n,v 1.1.4.1 1998/09/30 02:16:27 stanton Exp $ '\" .so man.macros .TH radiobutton n 4.4 Tk "Tk Built-In Commands" diff --git a/doc/raise.n b/doc/raise.n index 3769bbe..73da93c 100644 --- a/doc/raise.n +++ b/doc/raise.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) raise.n 1.9 96/06/14 14:20:02 +'\" RCS: @(#) $Id: raise.n,v 1.1.4.1 1998/09/30 02:16:27 stanton Exp $ '\" .so man.macros .TH raise n 3.3 Tk "Tk Built-In Commands" diff --git a/doc/scale.n b/doc/scale.n index 3557b1c..909c6e0 100644 --- a/doc/scale.n +++ b/doc/scale.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) scale.n 1.32 97/10/31 12:58:51 +'\" RCS: @(#) $Id: scale.n,v 1.1.4.1 1998/09/30 02:16:28 stanton Exp $ '\" .so man.macros .TH scale n 4.1 Tk "Tk Built-In Commands" diff --git a/doc/scrollbar.n b/doc/scrollbar.n index ba8e824..13e9224 100644 --- a/doc/scrollbar.n +++ b/doc/scrollbar.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) scrollbar.n 1.33 97/10/31 12:58:52 +'\" RCS: @(#) $Id: scrollbar.n,v 1.1.4.1 1998/09/30 02:16:28 stanton Exp $ '\" .so man.macros .TH scrollbar n 4.1 Tk "Tk Built-In Commands" diff --git a/doc/selection.n b/doc/selection.n index 294a243..397491b 100644 --- a/doc/selection.n +++ b/doc/selection.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) selection.n 1.18 96/08/27 13:21:51 +'\" RCS: @(#) $Id: selection.n,v 1.1.4.1 1998/09/30 02:16:29 stanton Exp $ '\" .so man.macros .TH selection n 4.0 Tk "Tk Built-In Commands" @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) send.n 1.19 97/07/07 16:53:29 +'\" RCS: @(#) $Id: send.n,v 1.1.4.2 1998/09/30 02:16:29 stanton Exp $ '\" .so man.macros .TH send n 4.0 Tk "Tk Built-In Commands" @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) text.n 1.68 97/10/31 12:58:41 +'\" RCS: @(#) $Id: text.n,v 1.1.4.1 1998/09/30 02:16:29 stanton Exp $ '\" .so man.macros .TH text n 4.0 Tk "Tk Built-In Commands" @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) tk.n 1.15 97/05/20 20:32:56 +'\" RCS: @(#) $Id: tk.n,v 1.1.4.1 1998/09/30 02:16:30 stanton Exp $ '\" .so man.macros .TH tk n 4.0 Tk "Tk Built-In Commands" diff --git a/doc/tkerror.n b/doc/tkerror.n index c892a64..85781fe 100644 --- a/doc/tkerror.n +++ b/doc/tkerror.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) tkerror.n 1.19 97/10/31 12:58:53 +'\" RCS: @(#) $Id: tkerror.n,v 1.1.4.1 1998/09/30 02:16:30 stanton Exp $ '\" .so man.macros .TH tkerror n 4.1 Tk "Tk Built-In Commands" diff --git a/doc/tkvars.n b/doc/tkvars.n index 947d574..6a1338c 100644 --- a/doc/tkvars.n +++ b/doc/tkvars.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) tkvars.n 1.22 96/08/27 13:21:38 +'\" RCS: @(#) $Id: tkvars.n,v 1.1.4.1 1998/09/30 02:16:31 stanton Exp $ '\" .so man.macros .TH tkvars n 4.1 Tk "Tk Built-In Commands" diff --git a/doc/tkwait.n b/doc/tkwait.n index 6446768..1c2bd07 100644 --- a/doc/tkwait.n +++ b/doc/tkwait.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) tkwait.n 1.13 96/07/31 08:19:23 +'\" RCS: @(#) $Id: tkwait.n,v 1.1.4.1 1998/09/30 02:16:31 stanton Exp $ '\" .so man.macros .TH tkwait n "" Tk "Tk Built-In Commands" diff --git a/doc/toplevel.n b/doc/toplevel.n index 567ef33..cdf6134 100644 --- a/doc/toplevel.n +++ b/doc/toplevel.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) toplevel.n 1.29 97/10/31 12:58:53 +'\" RCS: @(#) $Id: toplevel.n,v 1.1.4.1 1998/09/30 02:16:31 stanton Exp $ '\" .so man.macros .TH toplevel n 8.0 Tk "Tk Built-In Commands" diff --git a/doc/winfo.n b/doc/winfo.n index d96e9b9..ad4db21 100644 --- a/doc/winfo.n +++ b/doc/winfo.n @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) winfo.n 1.45 97/01/25 13:45:04 +'\" RCS: @(#) $Id: winfo.n,v 1.1.4.1 1998/09/30 02:16:32 stanton Exp $ '\" .so man.macros .TH winfo n 4.3 Tk "Tk Built-In Commands" @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) wish.1 1.30 97/10/31 12:58:43 +'\" RCS: @(#) $Id: wish.1,v 1.1.4.1 1998/09/30 02:16:32 stanton Exp $ '\" .so man.macros .TH wish 1 8.0 Tk "Tk Applications" @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" SCCS: @(#) wm.n 1.37 96/10/14 11:07:58 +'\" RCS: @(#) $Id: wm.n,v 1.1.4.1 1998/09/30 02:16:33 stanton Exp $ '\" .so man.macros .TH wm n 4.3 Tk "Tk Built-In Commands" diff --git a/generic/README b/generic/README index 572cc93..30c3999 100644 --- a/generic/README +++ b/generic/README @@ -2,4 +2,4 @@ This directory contains Tk source files that work on all the platforms where Tk runs (e.g. UNIX, PCs, and Macintoshes). Platform-specific sources are in the directories ../unix, ../win, and ../mac. -SCCS ID: @(#) README 1.1 95/09/11 14:02:45 +RCS ID: @(#) $Id: README,v 1.1.4.1 1998/09/30 02:16:33 stanton Exp $ diff --git a/generic/default.h b/generic/default.h index 91a19f6..182206b 100644 --- a/generic/default.h +++ b/generic/default.h @@ -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. * - * SCCS: @(#) default.h 1.4 96/02/07 17:33:39 + * RCS: @(#) $Id: default.h,v 1.1.4.1 1998/09/30 02:16:34 stanton Exp $ */ #ifndef _DEFAULT diff --git a/generic/ks_names.h b/generic/ks_names.h index 3eee008..1deada5 100644 --- a/generic/ks_names.h +++ b/generic/ks_names.h @@ -1,5 +1,6 @@ /* * This file is generated from $(INCLUDESRC)/keysymdef.h. Do not edit. + * RCS: $Id: ks_names.h,v 1.1.4.1 1998/09/30 02:16:34 stanton Exp $ */ { "BackSpace", 0xFF08 }, { "Tab", 0xFF09 }, @@ -20,6 +21,9 @@ { "Next", 0xFF56 }, { "End", 0xFF57 }, { "Begin", 0xFF58 }, +{ "Win_L", 0xFF5B }, +{ "Win_R", 0xFF5C }, +{ "App", 0xFF5D }, { "Select", 0xFF60 }, { "Print", 0xFF61 }, { "Execute", 0xFF62 }, diff --git a/generic/prolog.ps b/generic/prolog.ps index 378d503..3d42b46 100644 --- a/generic/prolog.ps +++ b/generic/prolog.ps @@ -3,7 +3,7 @@ % This is a standard prolog for Postscript generated by Tk's canvas % widget. -% SCCS: @(#) prolog.ps 1.7 96/07/08 17:52:14 +% RCS: @(#) $Id: prolog.ps,v 1.1.2.2 1998/09/30 02:16:35 stanton Exp $ % The definitions below just define all of the variables used in % any of the procedures here. This is needed for obscure reasons diff --git a/generic/tk.h b/generic/tk.h index ac48a9c..bee1073 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -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. * - * SCCS: @(#) tk.h 1.217 98/02/18 18:33:32 + * RCS: @(#) $Id: tk.h,v 1.1.4.2 1998/09/30 02:16:35 stanton Exp $ */ #ifndef _TK @@ -21,9 +21,10 @@ * When version numbers change here, you must also go into the following files * and update the version numbers: * + * README * unix/configure.in - * win/makefile.bc - * win/makefile.vc + * win/makefile.bc (Not for patch release updates) + * win/makefile.vc (Not for patch release updates) * library/tk.tcl * README, win/README, unix/README, and mac/README * @@ -79,6 +80,11 @@ # include <stddef.h> #endif +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + /* * Decide whether or not to use input methods. */ @@ -791,6 +797,10 @@ typedef struct Tk_Item { * pixel drawn in item. Item area * includes x1 and y1 but not x2 * and y2. */ + int reserved1; /* This padding is for compatibility */ + char *reserved2; /* with Jan Nijtmans dash patch */ + int reserved3; + char *reserved4; /* *------------------------------------------------------------------ @@ -895,6 +905,10 @@ typedef struct Tk_ItemType { * from an item. */ struct Tk_ItemType *nextPtr; /* Used to link types together into * a list. */ + char *reserved1; /* Reserved for future extension. */ + int reserved2; /* Carefully compatible with */ + char *reserved3; /* Jan Nijtmans dash patch */ + char *reserved4; } Tk_ItemType; #endif @@ -1000,6 +1014,7 @@ struct Tk_ImageType { /* Next in list of all image types currently * known. Filled in by Tk, not by image * manager. */ + char *reserved; /* reserved for future expansion */ }; /* @@ -1032,6 +1047,7 @@ typedef struct Tk_PhotoImageBlock { int offset[3]; /* Address differences between the red, green * and blue components of the pixel and the * pixel as a whole. */ + int reserved; /* Reserved for extensions (dash patch) */ } Tk_PhotoImageBlock; /* @@ -1760,4 +1776,8 @@ EXTERN int Tk_WmCmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); #endif /* RESOURCE_INCLUDED */ + +#undef TCL_STORAGE_CLASS +#define TCL_STORAGE_CLASS DLLIMPORT + #endif /* _TK */ diff --git a/generic/tk3d.c b/generic/tk3d.c index 36399cc..329b2ad 100644 --- a/generic/tk3d.c +++ b/generic/tk3d.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. * - * SCCS: @(#) tk3d.c 1.67 97/12/24 15:50:00 + * RCS: @(#) $Id: tk3d.c,v 1.1.4.2 1998/09/30 02:16:36 stanton Exp $ */ #include "tk3d.h" diff --git a/generic/tk3d.h b/generic/tk3d.h index 4e17eb3..204a0f0 100644 --- a/generic/tk3d.h +++ b/generic/tk3d.h @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tk3d.h 1.4 97/12/24 15:50:02 + * RCS: @(#) $Id: tk3d.h,v 1.1.4.2 1998/09/30 02:16:37 stanton Exp $ */ #ifndef _TK3D @@ -17,6 +17,11 @@ #include <tkInt.h> +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + /* * One of the following data structures is allocated for each 3-D border * currently in use. Structures of this type are indexed by @@ -91,4 +96,7 @@ EXTERN void TkpGetShadows _ANSI_ARGS_((TkBorder *borderPtr, Tk_Window tkwin)); EXTERN void TkpFreeBorder _ANSI_ARGS_((TkBorder *borderPtr)); +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLIMPORT + #endif /* _TK3D */ diff --git a/generic/tkArgv.c b/generic/tkArgv.c index 66a703c..d1226d6 100644 --- a/generic/tkArgv.c +++ b/generic/tkArgv.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. * - * SCCS: @(#) tkArgv.c 1.22 97/11/07 21:13:03 + * RCS: @(#) $Id: tkArgv.c,v 1.1.4.2 1998/09/30 02:16:37 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkAtom.c b/generic/tkAtom.c index 9d35f6b..07f053b 100644 --- a/generic/tkAtom.c +++ b/generic/tkAtom.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. * - * SCCS: @(#) tkAtom.c 1.13 96/02/15 18:51:34 + * RCS: @(#) $Id: tkAtom.c,v 1.1.4.1 1998/09/30 02:16:38 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkBind.c b/generic/tkBind.c index 0aa0e9e..7237b04 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.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. * - * SCCS: @(#) tkBind.c 1.144 98/02/18 17:08:07 + * RCS: @(#) $Id: tkBind.c,v 1.1.4.2 1998/09/30 02:16:38 stanton Exp $ */ #include "tkPort.h" @@ -3139,9 +3139,9 @@ GetAllVirtualEvents(interp, vetPtr) *--------------------------------------------------------------------------- */ static int -HandleEventGenerate(interp, main, objc, objv) +HandleEventGenerate(interp, mainWin, objc, objv) Tcl_Interp *interp; /* Interp for errors return and name lookup. */ - Tk_Window main; /* Main window associated with interp. */ + Tk_Window mainWin; /* Main window associated with interp. */ int objc; /* Number of arguments. */ Tcl_Obj *CONST objv[]; /* Argument objects. */ { @@ -3172,11 +3172,11 @@ HandleEventGenerate(interp, main, objc, objv) EVENT_Y }; - if (NameToWindow(interp, main, objv[0], &tkwin) != TCL_OK) { + if (NameToWindow(interp, mainWin, objv[0], &tkwin) != TCL_OK) { return TCL_ERROR; } - mainPtr = (TkWindow *) main; + mainPtr = (TkWindow *) mainWin; if ((tkwin == NULL) || (mainPtr->mainPtr != ((TkWindow *) tkwin)->mainPtr)) { char *name; @@ -3634,9 +3634,9 @@ HandleEventGenerate(interp, main, objc, objv) } static int -NameToWindow(interp, main, objPtr, tkwinPtr) +NameToWindow(interp, mainWin, objPtr, tkwinPtr) Tcl_Interp *interp; /* Interp for error return and name lookup. */ - Tk_Window main; /* Main window of application. */ + Tk_Window mainWin; /* Main window of application. */ Tcl_Obj *objPtr; /* Contains name or id string of window. */ Tk_Window *tkwinPtr; /* Filled with token for window. */ { @@ -3646,7 +3646,7 @@ NameToWindow(interp, main, objPtr, tkwinPtr) name = Tcl_GetStringFromObj(objPtr, NULL); if (name[0] == '.') { - tkwin = Tk_NameToWindow(interp, name, main); + tkwin = Tk_NameToWindow(interp, name, mainWin); if (tkwin == NULL) { return TCL_ERROR; } @@ -3657,7 +3657,7 @@ NameToWindow(interp, main, objPtr, tkwinPtr) name, "\"", (char *) NULL); return TCL_ERROR; } - *tkwinPtr = Tk_IdToWindow(Tk_Display(main), (Window) id); + *tkwinPtr = Tk_IdToWindow(Tk_Display(mainWin), (Window) id); } return TCL_OK; } diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c index 25c1d37..02b8c5c 100644 --- a/generic/tkBitmap.c +++ b/generic/tkBitmap.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. * - * SCCS: @(#) tkBitmap.c 1.56 98/01/19 11:47:55 + * RCS: @(#) $Id: tkBitmap.c,v 1.1.4.2 1998/09/30 02:16:39 stanton Exp $ */ #include "tkPort.h" @@ -369,7 +369,7 @@ GetBitmap(interp, tkwin, string) if (string == NULL) { goto error; } - result = XReadBitmapFile(Tk_Display(tkwin), + result = TkReadBitmapFile(Tk_Display(tkwin), RootWindowOfScreen(Tk_Screen(tkwin)), string, (unsigned int *) &width, (unsigned int *) &height, &bitmap, &dummy2, &dummy2); @@ -1045,6 +1045,51 @@ BitmapInit() /* *---------------------------------------------------------------------- * + * TkReadBitmapFile -- + * + * Loads a bitmap image in X bitmap format into the specified + * drawable. This is equivelent to the XReadBitmapFile in X. + * + * Results: + * Sets the size, hotspot, and bitmap on success. + * + * Side effects: + * Creates a new bitmap from the file data. + * + *---------------------------------------------------------------------- + */ + +int +TkReadBitmapFile(display, d, filename, width_return, height_return, + bitmap_return, x_hot_return, y_hot_return) + Display* display; + Drawable d; + CONST char* filename; + unsigned int* width_return; + unsigned int* height_return; + Pixmap* bitmap_return; + int* x_hot_return; + int* y_hot_return; +{ + char *data; + + data = TkGetBitmapData(NULL, NULL, (char *) filename, + (int *) width_return, (int *) height_return, x_hot_return, + y_hot_return); + if (data == NULL) { + return BitmapFileInvalid; + } + + *bitmap_return = XCreateBitmapFromData(display, d, data, *width_return, + *height_return); + + ckfree(data); + return BitmapSuccess; + } + +/* + *---------------------------------------------------------------------- + * * TkDebugBitmap -- * * This procedure returns debugging information about a bitmap. diff --git a/generic/tkButton.c b/generic/tkButton.c index 527e761..02c0a6f 100644 --- a/generic/tkButton.c +++ b/generic/tkButton.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. * - * SCCS: @(#) tkButton.c 1.150 98/02/06 19:06:00 + * RCS: @(#) $Id: tkButton.c,v 1.1.4.2 1998/09/30 02:16:40 stanton Exp $ */ #include "tkButton.h" diff --git a/generic/tkButton.h b/generic/tkButton.h index ebc7c7a..2d2bf6a 100644 --- a/generic/tkButton.h +++ b/generic/tkButton.h @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkButton.h 1.8 98/01/09 09:48:06 + * RCS: @(#) $Id: tkButton.h,v 1.1.4.2 1998/09/30 02:16:41 stanton Exp $ */ #ifndef _TKBUTTON @@ -19,6 +19,11 @@ #include "tkInt.h" #endif +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + /* * Legal values for the "state" field of TkButton records. */ @@ -285,4 +290,7 @@ EXTERN void TkpDisplayButton _ANSI_ARGS_((ClientData clientData)); #endif EXTERN int TkInvokeButton _ANSI_ARGS_((TkButton *butPtr)); +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLIMPORT + #endif /* _TKBUTTON */ diff --git a/generic/tkCanvArc.c b/generic/tkCanvArc.c index 4c97876..d68005c 100644 --- a/generic/tkCanvArc.c +++ b/generic/tkCanvArc.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkCanvArc.c 1.35 97/11/07 21:14:21 + * RCS: @(#) $Id: tkCanvArc.c,v 1.1.4.2 1998/09/30 02:16:41 stanton Exp $ */ #include <stdio.h> @@ -546,7 +546,7 @@ ComputeArcBbox(canvas, arcPtr) TkIncludePoint((Tk_Item *) arcPtr, arcPtr->center2); center[0] = (arcPtr->bbox[0] + arcPtr->bbox[2])/2; center[1] = (arcPtr->bbox[1] + arcPtr->bbox[3])/2; - if (arcPtr->style != arcUid) { + if (arcPtr->style == pieSliceUid) { TkIncludePoint((Tk_Item *) arcPtr, center); } diff --git a/generic/tkCanvBmap.c b/generic/tkCanvBmap.c index 4786dd6..c4ff3f6 100644 --- a/generic/tkCanvBmap.c +++ b/generic/tkCanvBmap.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkCanvBmap.c 1.31 97/11/07 21:14:33 + * RCS: @(#) $Id: tkCanvBmap.c,v 1.1.4.2 1998/09/30 02:16:42 stanton Exp $ */ #include <stdio.h> diff --git a/generic/tkCanvImg.c b/generic/tkCanvImg.c index 258ca8d..e5c152f 100644 --- a/generic/tkCanvImg.c +++ b/generic/tkCanvImg.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkCanvImg.c 1.19 97/11/07 21:14:48 + * RCS: @(#) $Id: tkCanvImg.c,v 1.1.4.2 1998/09/30 02:16:43 stanton Exp $ */ #include <stdio.h> diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c index bf2afd9..e2e49a3 100644 --- a/generic/tkCanvLine.c +++ b/generic/tkCanvLine.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkCanvLine.c 1.47 97/11/07 21:14:57 + * RCS: @(#) $Id: tkCanvLine.c,v 1.1.4.2 1998/09/30 02:16:43 stanton Exp $ */ #include <stdio.h> diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c index 9e672c5..82e791b 100644 --- a/generic/tkCanvPoly.c +++ b/generic/tkCanvPoly.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkCanvPoly.c 1.38 97/11/07 21:15:07 + * RCS: @(#) $Id: tkCanvPoly.c,v 1.1.4.2 1998/09/30 02:16:44 stanton Exp $ */ #include <stdio.h> diff --git a/generic/tkCanvPs.c b/generic/tkCanvPs.c index dcc6cee..fc8a0a5 100644 --- a/generic/tkCanvPs.c +++ b/generic/tkCanvPs.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. * - * SCCS: @(#) tkCanvPs.c 1.62 98/02/10 10:28:12 + * RCS: @(#) $Id: tkCanvPs.c,v 1.1.4.2 1998/09/30 02:16:44 stanton Exp $ */ #include "tkInt.h" @@ -124,7 +124,7 @@ static CONST char * CONST prolog[]= { \n\ % This is a standard prolog for Postscript generated by Tk's canvas\n\ % widget.\n\ -% SCCS: @(#) prolog.ps 1.7 96/07/08 17:52:14\n\ +% RCS: @(#) $Id: tkCanvPs.c,v 1.1.4.2 1998/09/30 02:16:44 stanton Exp $\n\ \n\ % The definitions below just define all of the variables used in\n\ % any of the procedures here. This is needed for obscure reasons\n\ diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c index 0e624cc..a0cbfd3 100644 --- a/generic/tkCanvText.c +++ b/generic/tkCanvText.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkCanvText.c 1.70 97/11/07 21:15:29 + * RCS: @(#) $Id: tkCanvText.c,v 1.1.4.2 1998/09/30 02:16:46 stanton Exp $ */ #include <stdio.h> diff --git a/generic/tkCanvUtil.c b/generic/tkCanvUtil.c index a71b851..6e4593e 100644 --- a/generic/tkCanvUtil.c +++ b/generic/tkCanvUtil.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. * - * SCCS: @(#) tkCanvUtil.c 1.8 97/11/07 21:19:06 + * RCS: @(#) $Id: tkCanvUtil.c,v 1.1.4.2 1998/09/30 02:16:47 stanton Exp $ */ #include "tk.h" diff --git a/generic/tkCanvWind.c b/generic/tkCanvWind.c index 59f2c87..a31616c 100644 --- a/generic/tkCanvWind.c +++ b/generic/tkCanvWind.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkCanvWind.c 1.30 97/11/07 21:15:39 + * RCS: @(#) $Id: tkCanvWind.c,v 1.1.4.2 1998/09/30 02:16:47 stanton Exp $ */ #include <stdio.h> diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index f7e7576..af3c101 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.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. * - * SCCS: @(#) tkCanvas.c 1.128 97/12/16 16:20:11 + * RCS: @(#) $Id: tkCanvas.c,v 1.1.4.2 1998/09/30 02:16:48 stanton Exp $ */ #include "default.h" diff --git a/generic/tkCanvas.h b/generic/tkCanvas.h index 52b3a51..7c40113 100644 --- a/generic/tkCanvas.h +++ b/generic/tkCanvas.h @@ -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. * - * SCCS: @(#) tkCanvas.h 1.41 96/02/15 18:51:28 + * RCS: @(#) $Id: tkCanvas.h,v 1.1.4.1 1998/09/30 02:16:49 stanton Exp $ */ #ifndef _TKCANVAS diff --git a/generic/tkClipboard.c b/generic/tkClipboard.c index 5e2074d..b894a9f 100644 --- a/generic/tkClipboard.c +++ b/generic/tkClipboard.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. * - * SCCS: @(#) tkClipboard.c 1.16 97/11/07 21:16:25 + * RCS: @(#) $Id: tkClipboard.c,v 1.1.4.2 1998/09/30 02:16:50 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkCmds.c b/generic/tkCmds.c index ab75057..2c8c318 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.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. * - * SCCS: @(#) tkCmds.c 1.130 97/11/07 21:16:34 + * RCS: @(#) $Id: tkCmds.c,v 1.1.4.2 1998/09/30 02:16:50 stanton Exp $ */ #include "tkPort.h" @@ -453,7 +453,7 @@ Tk_LowerCmd(clientData, interp, argc, argv) int argc; /* Number of arguments. */ char **argv; /* Argument strings. */ { - Tk_Window main = (Tk_Window) clientData; + Tk_Window mainwin = (Tk_Window) clientData; Tk_Window tkwin, other; if ((argc != 2) && (argc != 3)) { @@ -462,14 +462,14 @@ Tk_LowerCmd(clientData, interp, argc, argv) return TCL_ERROR; } - tkwin = Tk_NameToWindow(interp, argv[1], main); + tkwin = Tk_NameToWindow(interp, argv[1], mainwin); if (tkwin == NULL) { return TCL_ERROR; } if (argc == 2) { other = NULL; } else { - other = Tk_NameToWindow(interp, argv[2], main); + other = Tk_NameToWindow(interp, argv[2], mainwin); if (other == NULL) { return TCL_ERROR; } @@ -508,7 +508,7 @@ Tk_RaiseCmd(clientData, interp, argc, argv) int argc; /* Number of arguments. */ char **argv; /* Argument strings. */ { - Tk_Window main = (Tk_Window) clientData; + Tk_Window mainwin = (Tk_Window) clientData; Tk_Window tkwin, other; if ((argc != 2) && (argc != 3)) { @@ -517,14 +517,14 @@ Tk_RaiseCmd(clientData, interp, argc, argv) return TCL_ERROR; } - tkwin = Tk_NameToWindow(interp, argv[1], main); + tkwin = Tk_NameToWindow(interp, argv[1], mainwin); if (tkwin == NULL) { return TCL_ERROR; } if (argc == 2) { other = NULL; } else { - other = Tk_NameToWindow(interp, argv[2], main); + other = Tk_NameToWindow(interp, argv[2], mainwin); if (other == NULL) { return TCL_ERROR; } diff --git a/generic/tkColor.c b/generic/tkColor.c index abaaf02..8440bd6 100644 --- a/generic/tkColor.c +++ b/generic/tkColor.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. * - * SCCS: @(#) tkColor.c 1.55 97/12/24 15:52:02 + * RCS: @(#) $Id: tkColor.c,v 1.1.4.2 1998/09/30 02:16:51 stanton Exp $ */ #include "tkColor.h" diff --git a/generic/tkColor.h b/generic/tkColor.h index 1ab252e..06b0f33 100644 --- a/generic/tkColor.h +++ b/generic/tkColor.h @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkColor.h 1.6 97/12/24 15:52:05 + * RCS: @(#) $Id: tkColor.h,v 1.1.4.2 1998/09/30 02:16:51 stanton Exp $ */ #ifndef _TKCOLOR @@ -17,6 +17,11 @@ #include <tkInt.h> +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + /* * One of the following data structures is used to keep track of * each color that is being used by the application; typically there @@ -76,4 +81,7 @@ EXTERN TkColor * TkpGetColor _ANSI_ARGS_((Tk_Window tkwin, EXTERN TkColor * TkpGetColorByValue _ANSI_ARGS_((Tk_Window tkwin, XColor *colorPtr)); +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLIMPORT + #endif /* _TKCOLOR */ diff --git a/generic/tkConfig.c b/generic/tkConfig.c index 52501d6..a7d2511 100644 --- a/generic/tkConfig.c +++ b/generic/tkConfig.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkConfig.c 1.51 98/01/19 11:49:18 + * RCS: @(#) $Id: tkConfig.c,v 1.1.4.2 1998/09/30 02:16:52 stanton Exp $ */ /* diff --git a/generic/tkConsole.c b/generic/tkConsole.c index 6c721e5..05d03a4 100644 --- a/generic/tkConsole.c +++ b/generic/tkConsole.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. * - * SCCS: @(#) tkConsole.c 1.55 98/01/02 17:40:37 + * RCS: @(#) $Id: tkConsole.c,v 1.1.4.2 1998/09/30 02:16:52 stanton Exp $ */ #include "tk.h" diff --git a/generic/tkCursor.c b/generic/tkCursor.c index 9a8f971..9c22bb0 100644 --- a/generic/tkCursor.c +++ b/generic/tkCursor.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. * - * SCCS: @(#) tkCursor.c 1.35 98/01/19 11:50:15 + * RCS: @(#) $Id: tkCursor.c,v 1.1.4.2 1998/09/30 02:16:53 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkEntry.c b/generic/tkEntry.c index e64f661..6d38ef6 100644 --- a/generic/tkEntry.c +++ b/generic/tkEntry.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. * - * SCCS: @(#) tkEntry.c 1.119 98/01/21 22:20:55 + * RCS: @(#) $Id: tkEntry.c,v 1.1.4.2 1998/09/30 02:16:53 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkError.c b/generic/tkError.c index 3d52793..6bf9e24 100644 --- a/generic/tkError.c +++ b/generic/tkError.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. * - * SCCS: @(#) tkError.c 1.23 97/04/25 16:51:27 + * RCS: @(#) $Id: tkError.c,v 1.1.4.1 1998/09/30 02:16:54 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkEvent.c b/generic/tkEvent.c index 045a478..5d5f7ec 100644 --- a/generic/tkEvent.c +++ b/generic/tkEvent.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. * - * SCCS: @(#) tkEvent.c 1.20 96/09/20 09:33:38 + * RCS: @(#) $Id: tkEvent.c,v 1.1.4.1 1998/09/30 02:16:55 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkFileFilter.c b/generic/tkFileFilter.c index 8f25149..2eae90c 100644 --- a/generic/tkFileFilter.c +++ b/generic/tkFileFilter.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkFileFilter.c 1.7 97/05/06 13:49:51 + * RCS: @(#) $Id: tkFileFilter.c,v 1.1.4.2 1998/09/30 02:16:55 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkFileFilter.h b/generic/tkFileFilter.h index 2b113fc..b239180 100644 --- a/generic/tkFileFilter.h +++ b/generic/tkFileFilter.h @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkFileFilter.h 1.1 96/08/27 15:05:38 + * RCS: @(#) $Id: tkFileFilter.h,v 1.1.4.1 1998/09/30 02:16:56 stanton Exp $ * */ @@ -22,6 +22,11 @@ #define OSType long #endif +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + typedef struct GlobPattern { struct GlobPattern * next; /* Chains to the next glob pattern * in a glob pattern list */ @@ -80,4 +85,8 @@ EXTERN void TkInitFileFilters _ANSI_ARGS_(( EXTERN int TkGetFileFilters _ANSI_ARGS_ ((Tcl_Interp *interp, FileFilterList * flistPtr, char * string, int isWindows)); + +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLIMPORT + #endif diff --git a/generic/tkFocus.c b/generic/tkFocus.c index f4085da..df6f374 100644 --- a/generic/tkFocus.c +++ b/generic/tkFocus.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. * - * SCCS: @(#) tkFocus.c 1.51 97/11/07 21:16:51 + * RCS: @(#) $Id: tkFocus.c,v 1.1.4.2 1998/09/30 02:16:56 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkFont.c b/generic/tkFont.c index 593c506..dfaa752 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.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. * - * SCCS: @(#) tkFont.c 1.88 98/02/11 17:44:51 + * RCS: @(#) $Id: tkFont.c,v 1.1.4.2 1998/09/30 02:16:57 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkFont.h b/generic/tkFont.h index 05b116e..5b79547 100644 --- a/generic/tkFont.h +++ b/generic/tkFont.h @@ -10,12 +10,17 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkFont.h 1.16 97/12/23 15:00:07 + * RCS: @(#) $Id: tkFont.h,v 1.1.4.2 1998/09/30 02:16:58 stanton Exp $ */ #ifndef _TKFONT #define _TKFONT +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + /* * The following structure keeps track of the attributes of a font. It can * be used to keep track of either the desired attributes or the actual @@ -215,4 +220,7 @@ EXTERN void TkpGetFontFamilies _ANSI_ARGS_((Tcl_Interp *interp, EXTERN TkFont * TkpGetNativeFont _ANSI_ARGS_((Tk_Window tkwin, CONST char *name)); +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLIMPORT + #endif /* _TKFONT */ diff --git a/generic/tkFrame.c b/generic/tkFrame.c index 0709a69..71ba6b8 100644 --- a/generic/tkFrame.c +++ b/generic/tkFrame.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. * - * SCCS: @(#) tkFrame.c 1.83 97/11/07 21:18:51 + * RCS: @(#) $Id: tkFrame.c,v 1.1.4.2 1998/09/30 02:16:58 stanton Exp $ */ #include "default.h" diff --git a/generic/tkGC.c b/generic/tkGC.c index f68db12..faa3e37 100644 --- a/generic/tkGC.c +++ b/generic/tkGC.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. * - * SCCS: @(#) tkGC.c 1.18 96/02/15 18:53:32 + * RCS: @(#) $Id: tkGC.c,v 1.1.4.1 1998/09/30 02:16:59 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkGeometry.c b/generic/tkGeometry.c index ec2c959..5544580 100644 --- a/generic/tkGeometry.c +++ b/generic/tkGeometry.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. * - * SCCS: @(#) tkGeometry.c 1.31 96/02/15 18:53:32 + * RCS: @(#) $Id: tkGeometry.c,v 1.1.4.1 1998/09/30 02:16:59 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkGet.c b/generic/tkGet.c index a980199..a788419 100644 --- a/generic/tkGet.c +++ b/generic/tkGet.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. * - * SCCS: @(#) tkGet.c 1.15 97/12/22 11:04:29 + * RCS: @(#) $Id: tkGet.c,v 1.1.4.2 1998/09/30 02:17:00 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkGrab.c b/generic/tkGrab.c index b088563..edcf300 100644 --- a/generic/tkGrab.c +++ b/generic/tkGrab.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkGrab.c 1.53 97/11/07 21:19:38 + * RCS: @(#) $Id: tkGrab.c,v 1.1.4.2 1998/09/30 02:17:00 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkGrid.c b/generic/tkGrid.c index f21782f..05747cf 100644 --- a/generic/tkGrid.c +++ b/generic/tkGrid.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkGrid.c 1.40 97/11/07 21:18:05 + * RCS: @(#) $Id: tkGrid.c,v 1.1.4.2 1998/09/30 02:17:01 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkImage.c b/generic/tkImage.c index 47a8c1b..90e1b4b 100644 --- a/generic/tkImage.c +++ b/generic/tkImage.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. * - * SCCS: @(#) tkImage.c 1.16 97/11/07 21:17:09 + * RCS: @(#) $Id: tkImage.c,v 1.1.4.2 1998/09/30 02:17:01 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c index 4a09afc..5dde227 100644 --- a/generic/tkImgBmap.c +++ b/generic/tkImgBmap.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkImgBmap.c 1.34 97/11/07 21:17:15 + * RCS: @(#) $Id: tkImgBmap.c,v 1.1.4.2 1998/09/30 02:17:02 stanton Exp $ */ #include "tkInt.h" @@ -464,7 +464,7 @@ ImgBmapConfigureInstance(instancePtr) char * TkGetBitmapData(interp, string, fileName, widthPtr, heightPtr, hotXPtr, hotYPtr) - Tcl_Interp *interp; /* For reporting errors. */ + Tcl_Interp *interp; /* For reporting errors, or NULL. */ char *string; /* String describing bitmap. May * be NULL. */ char *fileName; /* Name of file containing bitmap @@ -483,7 +483,7 @@ TkGetBitmapData(interp, string, fileName, widthPtr, heightPtr, pi.string = string; if (string == NULL) { - if (Tcl_IsSafe(interp)) { + if ((interp != NULL) && Tcl_IsSafe(interp)) { Tcl_AppendResult(interp, "can't get bitmap data from a file in a", " safe interpreter", (char *) NULL); return NULL; @@ -495,9 +495,12 @@ TkGetBitmapData(interp, string, fileName, widthPtr, heightPtr, pi.chan = Tcl_OpenFileChannel(interp, expandedFileName, "r", 0); Tcl_DStringFree(&buffer); if (pi.chan == NULL) { - Tcl_ResetResult(interp); - Tcl_AppendResult(interp, "couldn't read bitmap file \"", - fileName, "\": ", Tcl_PosixError(interp), (char *) NULL); + if (interp != NULL) { + Tcl_ResetResult(interp); + Tcl_AppendResult(interp, "couldn't read bitmap file \"", + fileName, "\": ", Tcl_PosixError(interp), + (char *) NULL); + } return NULL; } } else { @@ -575,9 +578,11 @@ TkGetBitmapData(interp, string, fileName, widthPtr, heightPtr, } } } else if ((pi.word[0] == '{') && (pi.word[1] == 0)) { - Tcl_AppendResult(interp, "format error in bitmap data; ", - "looks like it's an obsolete X10 bitmap file", - (char *) NULL); + if (interp != NULL) { + Tcl_AppendResult(interp, "format error in bitmap data; ", + "looks like it's an obsolete X10 bitmap file", + (char *) NULL); + } goto errorCleanup; } } @@ -618,6 +623,7 @@ TkGetBitmapData(interp, string, fileName, widthPtr, heightPtr, error: Tcl_SetResult(interp, "format error in bitmap data", TCL_STATIC); + errorCleanup: if (data != NULL) { ckfree(data); diff --git a/generic/tkImgGIF.c b/generic/tkImgGIF.c index 34ea255..53b60cd 100644 --- a/generic/tkImgGIF.c +++ b/generic/tkImgGIF.c @@ -27,7 +27,7 @@ * | provided "as is" without express or implied warranty. | * +-------------------------------------------------------------------+ * - * SCCS: @(#) tkImgGIF.c 1.20 97/11/07 21:20:21 + * RCS: @(#) $Id: tkImgGIF.c,v 1.1.4.2 1998/09/30 02:17:03 stanton Exp $ */ /* diff --git a/generic/tkImgPPM.c b/generic/tkImgPPM.c index 8beaf8d..a9392e4 100644 --- a/generic/tkImgPPM.c +++ b/generic/tkImgPPM.c @@ -13,7 +13,7 @@ * Department of Computer Science, * Australian National University. * - * SCCS: @(#) tkImgPPM.c 1.17 97/11/07 21:18:55 + * RCS: @(#) $Id: tkImgPPM.c,v 1.1.4.2 1998/09/30 02:17:03 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 8a89b48..9455643 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -15,7 +15,7 @@ * Department of Computer Science, * Australian National University. * - * SCCS: @(#) tkImgPhoto.c 1.61 97/11/07 21:19:00 + * RCS: @(#) $Id: tkImgPhoto.c,v 1.1.4.2 1998/09/30 02:17:04 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkImgUtil.c b/generic/tkImgUtil.c index 31504b8..ede8592 100644 --- a/generic/tkImgUtil.c +++ b/generic/tkImgUtil.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkImgUtil.c 1.3 96/02/15 18:53:12 + * RCS: @(#) $Id: tkImgUtil.c,v 1.1.4.1 1998/09/30 02:17:05 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkInitScript.h b/generic/tkInitScript.h index 3809a01..a1fdd96 100644 --- a/generic/tkInitScript.h +++ b/generic/tkInitScript.h @@ -9,70 +9,49 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkInitScript.h 1.4 98/01/09 13:37:34 + * RCS: @(#) $Id: tkInitScript.h,v 1.1.4.2 1998/09/30 02:17:05 stanton Exp $ */ /* - * The following string is the startup script executed in new - * interpreters. It looks in several different directories - * for a script "tk.tcl" that is compatible with this version - * of Tk. The tk.tcl script does all of the real work of - * initialization. - * When called from a safe interpreter, it does not use file exists. - * we don't use pwd either because of safe interpreters. + * In order to find tk.tcl during initialization, the following script + * is invoked by Tk_Init(). It looks in several different directories: * - * We leave the door open to the application by using an existing - * tkInit proc which if it exists is responsible for finding and sourcing - * tk.tcl themselves. With that, an application that wish to ignore - * the env(TK_LIBRARY) or have special initialization need can do it. + * $tk_library - can specify a primary location, if set + * no other locations will be checked + * + * $env(TK_LIBRARY) - highest priority so user can always override + * the search path unless the application has + * specified an exact directory above + * + * $tcl_library/../tk$tk_version + * - look relative to init.tcl in an installed + * lib directory (e.g. /usr/local) + * + * <executable directory>/../lib/tk$tk_version + * - look for a lib/tk<ver> in a sibling of + * the bin directory (e.g. /usr/local) + * + * <executable directory>/../library + * - look in Tk build directory + * + * <executable directory>/../../tk$tk_patchLevel/library + * - look for Tk build directory relative + * to a parallel build directory + * + * The first directory on this path that contains a valid tk.tcl script + * will be set ast the value of tk_library. + * + * Note that this entire search mechanism can be bypassed by defining an + * alternate tkInit procedure before calling Tk_Init(). */ static char initScript[] = "if {[info proc tkInit]==\"\"} {\n\ proc tkInit {} {\n\ - global tk_library tk_version tk_patchLevel env errorInfo\n\ - rename tkInit {}\n\ - set errors \"\"\n\ - if {![info exists tk_library]} {\n\ - set tk_library .\n\ - }\n\ - set dirs {}\n\ - if {[info exists env(TK_LIBRARY)]} {\n\ - lappend dirs $env(TK_LIBRARY)\n\ - }\n\ - lappend dirs $tk_library\n\ - lappend dirs [file join [file dirname [info library]] tk$tk_version]\n\ - set parentDir [file dirname [file dirname [info nameofexecutable]]]\n\ - lappend dirs [file join $parentDir tk$tk_version]\n\ - lappend dirs [file join $parentDir lib tk$tk_version]\n\ - lappend dirs [file join $parentDir library]\n\ - set parentParentDir [file dirname $parentDir]\n\ - if [string match {*[ab]*} $tk_patchLevel] {\n\ - set dirSuffix $tk_patchLevel\n\ - } else {\n\ - set dirSuffix $tk_version\n\ - }\n\ - lappend dirs [file join $parentParentDir tk$dirSuffix library]\n\ - lappend dirs [file join $parentParentDir library]\n\ - lappend dirs [file join [file dirname \ - [file dirname [info library]]] tk$dirSuffix library]\n\ - foreach i $dirs {\n\ - set tk_library $i\n\ - set tkfile [file join $i tk.tcl]\n\ - if {[interp issafe] || [file exists $tkfile]} {\n\ - if {![catch {uplevel #0 [list source $tkfile]} msg]} {\n\ - return\n\ - } else {\n\ - append errors \"$tkfile: $msg\n$errorInfo\n\"\n\ - }\n\ - }\n\ - }\n\ - set msg \"Can't find a usable tk.tcl in the following directories: \n\"\n\ - append msg \" $dirs\n\n\"\n\ - append msg \"$errors\n\n\"\n\ - append msg \"This probably means that Tk wasn't installed properly.\n\"\n\ - error $msg\n\ + global tk_library tk_version tk_patchLevel\n\ + rename tkInit {}\n\ + tcl_findLibrary tk $tk_version $tk_patchLevel tk.tcl TK_LIBRARY tk_library\n\ }\n\ }\n\ tkInit"; diff --git a/generic/tkInt.h b/generic/tkInt.h index cf9eb5e..cc97d50 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -6,11 +6,12 @@ * * Copyright (c) 1990-1994 The Regents of the University of California. * Copyright (c) 1994-1997 Sun Microsystems, Inc. + * Copyright (c) 1998 by Scriptics Corporation. * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkInt.h 1.212 98/02/10 10:34:03 + * RCS: $Id: tkInt.h,v 1.1.4.2 1998/09/30 02:17:05 stanton Exp $ */ #ifndef _TKINT @@ -26,6 +27,11 @@ #include <tkPort.h> #endif +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + /* * Opaque type declarations: */ @@ -755,6 +761,9 @@ EXTERN unsigned long TkCreateBindingProcedure _ANSI_ARGS_(( ClientData object, char *eventString, TkBindEvalProc *evalProc, TkBindFreeProc *freeProc, ClientData clientData)); +EXTERN Pixmap TkCreateBitmapFromData _ANSI_ARGS_((Display* display, + Drawable d, CONST char* data, + unsigned int width, unsigned int height)); EXTERN TkCursor * TkCreateCursorFromData _ANSI_ARGS_((Tk_Window tkwin, char *source, char *mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg)); @@ -970,6 +979,12 @@ EXTERN void TkpWmSetState _ANSI_ARGS_((TkWindow *winPtr, int state)); EXTERN void TkQueueEventForAllChildren _ANSI_ARGS_(( TkWindow *winPtr, XEvent *eventPtr)); +EXTERN int TkReadBitmapFile _ANSI_ARGS_((Display* display, + Drawable d, CONST char* filename, + unsigned int* width_return, + unsigned int* height_return, + Pixmap* bitmap_return, + int* x_hot_return, int* y_hot_return)); #ifndef TkRectInRegion EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, @@ -1027,4 +1042,7 @@ EXTERN int TkXFileProc _ANSI_ARGS_((ClientData clientData, EXTERN int TkUnsupported1Cmd _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, int argc, char **argv)); +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLIMPORT + #endif /* _TKINT */ diff --git a/generic/tkListbox.c b/generic/tkListbox.c index 84b8b0c..e799553 100644 --- a/generic/tkListbox.c +++ b/generic/tkListbox.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. * - * SCCS: @(#) tkListbox.c 1.122 98/02/11 18:00:20 + * RCS: @(#) $Id: tkListbox.c,v 1.1.4.2 1998/09/30 02:17:06 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkMacWinMenu.c b/generic/tkMacWinMenu.c index e66fa48..1f88c7d 100644 --- a/generic/tkMacWinMenu.c +++ b/generic/tkMacWinMenu.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacWinMenu.c 1.41 97/10/22 15:05:23 + * RCS: @(#) $Id: tkMacWinMenu.c,v 1.1.4.2 1998/09/30 02:17:07 stanton Exp $ */ #include "tkMenu.h" diff --git a/generic/tkMain.c b/generic/tkMain.c index e34067d..f9ef8d5 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.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. * - * SCCS: @(#) tkMain.c 1.158 98/01/20 22:46:33 + * RCS: @(#) $Id: tkMain.c,v 1.1.4.2 1998/09/30 02:17:07 stanton Exp $ */ #include <ctype.h> diff --git a/generic/tkMenu.c b/generic/tkMenu.c index f7b0880..fd083cf 100644 --- a/generic/tkMenu.c +++ b/generic/tkMenu.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. * - * SCCS: @(#) tkMenu.c 1.165 98/02/11 19:02:31 + * RCS: @(#) $Id: tkMenu.c,v 1.1.4.2 1998/09/30 02:17:08 stanton Exp $ */ /* diff --git a/generic/tkMenu.h b/generic/tkMenu.h index 0a55913..b3c9bf2 100644 --- a/generic/tkMenu.h +++ b/generic/tkMenu.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMenu.h 1.71 98/01/20 16:39:03 + * RCS: @(#) $Id: tkMenu.h,v 1.1.4.2 1998/09/30 02:17:09 stanton Exp $ */ #ifndef _TKMENU @@ -26,6 +26,11 @@ #include "default.h" #endif +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + /* * Dummy types used by the platform menu code. */ @@ -558,5 +563,8 @@ EXTERN int TkpPostMenu _ANSI_ARGS_((Tcl_Interp *interp, EXTERN void TkpSetWindowMenuBar _ANSI_ARGS_((Tk_Window tkwin, TkMenu *menuPtr)); +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLIMPORT + #endif /* _TKMENU */ diff --git a/generic/tkMenuDraw.c b/generic/tkMenuDraw.c index 373d59d..f0cff47 100644 --- a/generic/tkMenuDraw.c +++ b/generic/tkMenuDraw.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMenuDraw.c 1.52 98/01/12 16:27:29 + * RCS: @(#) $Id: tkMenuDraw.c,v 1.1.4.2 1998/09/30 02:17:10 stanton Exp $ */ #include "tkMenu.h" diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c index 8b5ba1b..8249816 100644 --- a/generic/tkMenubutton.c +++ b/generic/tkMenubutton.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. * - * SCCS: @(#) tkMenubutton.c 1.95 97/11/07 21:20:06 + * RCS: @(#) $Id: tkMenubutton.c,v 1.1.4.2 1998/09/30 02:17:10 stanton Exp $ */ #include "tkMenubutton.h" diff --git a/generic/tkMenubutton.h b/generic/tkMenubutton.h index 0fb0f65..a8598c4 100644 --- a/generic/tkMenubutton.h +++ b/generic/tkMenubutton.h @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMenubutton.h 1.3 97/04/11 11:24:15 + * RCS: @(#) $Id: tkMenubutton.h,v 1.1.4.1 1998/09/30 02:17:11 stanton Exp $ */ #ifndef _TKMENUBUTTON @@ -19,6 +19,11 @@ #include "tkInt.h" #endif +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + /* * A data structure of the following type is kept for each * widget managed by this file: @@ -204,4 +209,7 @@ EXTERN void TkpDestroyMenuButton _ANSI_ARGS_(( EXTERN void TkMenuButtonWorldChanged _ANSI_ARGS_(( ClientData instanceData)); +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLIMPORT + #endif /* _TKMENUBUTTON */ diff --git a/generic/tkMessage.c b/generic/tkMessage.c index 0a0e214..46e93b9 100644 --- a/generic/tkMessage.c +++ b/generic/tkMessage.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. * - * SCCS: @(#) tkMessage.c 1.76 97/11/07 21:20:11 + * RCS: @(#) $Id: tkMessage.c,v 1.1.4.2 1998/09/30 02:17:11 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkObj.c b/generic/tkObj.c index 35149eb..68f89f7 100644 --- a/generic/tkObj.c +++ b/generic/tkObj.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkObj.c 1.14 98/01/19 12:00:30 + * RCS: @(#) $Id: tkObj.c,v 1.1.2.2 1998/09/30 02:17:12 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c index c171521..02d0e7d 100644 --- a/generic/tkOldConfig.c +++ b/generic/tkOldConfig.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. * - * SCCS: @(#) tkOldConfig.c 1.56 98/02/11 17:46:46 + * RCS: @(#) $Id: tkOldConfig.c,v 1.1.2.2 1998/09/30 02:17:12 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkOption.c b/generic/tkOption.c index 3815f85..a3fbbe2 100644 --- a/generic/tkOption.c +++ b/generic/tkOption.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. * - * SCCS: @(#) tkOption.c 1.59 97/11/17 12:53:36 + * RCS: @(#) $Id: tkOption.c,v 1.1.4.2 1998/09/30 02:17:13 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkPack.c b/generic/tkPack.c index 2a7361c..257a09a 100644 --- a/generic/tkPack.c +++ b/generic/tkPack.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. * - * SCCS: @(#) tkPack.c 1.65 97/11/07 21:17:36 + * RCS: @(#) $Id: tkPack.c,v 1.1.4.2 1998/09/30 02:17:13 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkPlace.c b/generic/tkPlace.c index b3f8b08..1771b90 100644 --- a/generic/tkPlace.c +++ b/generic/tkPlace.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. * - * SCCS: @(#) tkPlace.c 1.28 97/11/07 21:17:41 + * RCS: @(#) $Id: tkPlace.c,v 1.1.4.2 1998/09/30 02:17:14 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkPointer.c b/generic/tkPointer.c index 36814bf..af42d6a 100644 --- a/generic/tkPointer.c +++ b/generic/tkPointer.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. * - * SCCS: @(#) tkPointer.c 1.12 97/10/31 17:06:24 + * RCS: @(#) $Id: tkPointer.c,v 1.1.4.1 1998/09/30 02:17:15 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkPort.h b/generic/tkPort.h index 7051aa0..c3d1014 100644 --- a/generic/tkPort.h +++ b/generic/tkPort.h @@ -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. * - * SCCS: @(#) tkPort.h 1.7 96/02/11 16:42:10 + * RCS: @(#) $Id: tkPort.h,v 1.1.4.1 1998/09/30 02:17:15 stanton Exp $ */ #ifndef _TKPORT diff --git a/generic/tkRectOval.c b/generic/tkRectOval.c index 5d2bd95..442f9ff 100644 --- a/generic/tkRectOval.c +++ b/generic/tkRectOval.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. * - * SCCS: @(#) tkRectOval.c 1.41 97/11/07 21:17:51 + * RCS: @(#) $Id: tkRectOval.c,v 1.1.4.2 1998/09/30 02:17:16 stanton Exp $ */ #include <stdio.h> diff --git a/generic/tkScale.c b/generic/tkScale.c index ba75549..11e090e 100644 --- a/generic/tkScale.c +++ b/generic/tkScale.c @@ -17,7 +17,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkScale.c 1.89 97/11/07 21:20:16 + * RCS: @(#) $Id: tkScale.c,v 1.1.4.2 1998/09/30 02:17:16 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkScale.h b/generic/tkScale.h index dba6f68..d74d083 100644 --- a/generic/tkScale.h +++ b/generic/tkScale.h @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkScale.h 1.5 96/07/08 12:56:56 + * RCS: @(#) $Id: tkScale.h,v 1.1.4.1 1998/09/30 02:17:17 stanton Exp $ */ #ifndef _TKSCALE @@ -19,6 +19,11 @@ #include "tk.h" #endif +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + /* * A data structure of the following type is kept for each scale * widget managed by this file: @@ -222,4 +227,7 @@ EXTERN void TkpSetScaleValue _ANSI_ARGS_((TkScale *scalePtr, EXTERN int TkpValueToPixel _ANSI_ARGS_((TkScale *scalePtr, double value)); +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLIMPORT + #endif /* _TKSCALE */ diff --git a/generic/tkScrollbar.c b/generic/tkScrollbar.c index fa0094a..d5282bd 100644 --- a/generic/tkScrollbar.c +++ b/generic/tkScrollbar.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. * - * SCCS: @(#) tkScrollbar.c 1.95 97/11/07 21:18:28 + * RCS: @(#) $Id: tkScrollbar.c,v 1.1.4.2 1998/09/30 02:17:17 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkScrollbar.h b/generic/tkScrollbar.h index 48296a2..05916df 100644 --- a/generic/tkScrollbar.h +++ b/generic/tkScrollbar.h @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkScrollbar.h 1.8 96/11/05 11:34:58 + * RCS: @(#) $Id: tkScrollbar.h,v 1.1.4.1 1998/09/30 02:17:18 stanton Exp $ */ #ifndef _TKSCROLLBAR @@ -19,6 +19,11 @@ #include "tkInt.h" #endif +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + /* * A data structure of the following type is kept for each scrollbar * widget. @@ -197,4 +202,7 @@ EXTERN void TkpConfigureScrollbar _ANSI_ARGS_(( EXTERN int TkpScrollbarPosition _ANSI_ARGS_(( TkScrollbar *scrollPtr, int x, int y)); +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLIMPORT + #endif /* _TKSCROLLBAR */ diff --git a/generic/tkSelect.c b/generic/tkSelect.c index d43c121..90f8844 100644 --- a/generic/tkSelect.c +++ b/generic/tkSelect.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. * - * SCCS: @(#) tkSelect.c 1.58 97/11/07 21:17:56 + * RCS: @(#) $Id: tkSelect.c,v 1.1.4.2 1998/09/30 02:17:18 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkSelect.h b/generic/tkSelect.h index 8595599..6880497 100644 --- a/generic/tkSelect.h +++ b/generic/tkSelect.h @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkSelect.h 1.4 95/11/03 13:22:41 + * RCS: @(#) $Id: tkSelect.h,v 1.1.4.1 1998/09/30 02:17:19 stanton Exp $ */ #ifndef _TKSELECT diff --git a/generic/tkSquare.c b/generic/tkSquare.c index bdb9e29..4fded1a 100644 --- a/generic/tkSquare.c +++ b/generic/tkSquare.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. * - * SCCS: @(#) tkSquare.c 1.25 97/12/22 11:05:09 + * RCS: @(#) $Id: tkSquare.c,v 1.1.4.2 1998/09/30 02:17:19 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkTest.c b/generic/tkTest.c index 173e1b7..09acfe9 100644 --- a/generic/tkTest.c +++ b/generic/tkTest.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. * - * SCCS: @(#) tkTest.c 1.57 98/01/30 15:27:07 + * RCS: @(#) $Id: tkTest.c,v 1.1.4.2 1998/09/30 02:17:20 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkText.c b/generic/tkText.c index 3e15552..cb720b4 100644 --- a/generic/tkText.c +++ b/generic/tkText.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. * - * SCCS: @(#) tkText.c 1.108 98/01/12 15:55:43 + * RCS: @(#) $Id: tkText.c,v 1.1.4.2 1998/09/30 02:17:20 stanton Exp $ */ #include "default.h" diff --git a/generic/tkText.h b/generic/tkText.h index 5648fb9..983304f 100644 --- a/generic/tkText.h +++ b/generic/tkText.h @@ -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. * - * SCCS: @(#) tkText.h 1.47 98/01/08 13:41:18 + * RCS: @(#) $Id: tkText.h,v 1.1.4.2 1998/09/30 02:17:21 stanton Exp $ */ #ifndef _TKTEXT diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c index 907b7d9..ddf5f6e 100644 --- a/generic/tkTextBTree.c +++ b/generic/tkTextBTree.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. * - * SCCS: @(#) tkTextBTree.c 1.38 98/01/08 13:40:24 + * RCS: @(#) $Id: tkTextBTree.c,v 1.1.4.2 1998/09/30 02:17:22 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 8193440..c3f3d2d 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.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. * - * SCCS: @(#) tkTextDisp.c 1.127 98/01/08 13:41:28 + * RCS: @(#) $Id: tkTextDisp.c,v 1.1.4.2 1998/09/30 02:17:23 stanton Exp $ */ #include "tkPort.h" diff --git a/generic/tkTextImage.c b/generic/tkTextImage.c index dae1751..94c1dd1 100644 --- a/generic/tkTextImage.c +++ b/generic/tkTextImage.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. * - * SCCS: @(#) tkTextImage.c 1.10 98/01/08 13:41:36 + * RCS: @(#) $Id: tkTextImage.c,v 1.1.4.2 1998/09/30 02:17:24 stanton Exp $ */ #include "tk.h" diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c index 8805a29..bc9aed1 100644 --- a/generic/tkTextIndex.c +++ b/generic/tkTextIndex.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. * - * SCCS: @(#) tkTextIndex.c 1.18 98/01/12 15:33:45 + * RCS: @(#) $Id: tkTextIndex.c,v 1.1.4.2 1998/09/30 02:17:25 stanton Exp $ */ #include "default.h" diff --git a/generic/tkTextMark.c b/generic/tkTextMark.c index cf16c49..a2ac37c 100644 --- a/generic/tkTextMark.c +++ b/generic/tkTextMark.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. * - * SCCS: @(#) tkTextMark.c 1.20 98/01/08 13:40:45 + * RCS: @(#) $Id: tkTextMark.c,v 1.1.4.2 1998/09/30 02:17:25 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c index 61c817e..a1602b7 100644 --- a/generic/tkTextTag.c +++ b/generic/tkTextTag.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. * - * SCCS: @(#) tkTextTag.c 1.42 98/01/12 15:55:55 + * RCS: @(#) $Id: tkTextTag.c,v 1.1.4.2 1998/09/30 02:17:26 stanton Exp $ */ #include "default.h" diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c index c8a3a13..06d8b4d 100644 --- a/generic/tkTextWind.c +++ b/generic/tkTextWind.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. * - * SCCS: @(#) tkTextWind.c 1.16 98/01/08 13:41:05 + * RCS: @(#) $Id: tkTextWind.c,v 1.1.4.2 1998/09/30 02:17:26 stanton Exp $ */ #include "tk.h" diff --git a/generic/tkTrig.c b/generic/tkTrig.c index f3976d5..c4be9e2 100644 --- a/generic/tkTrig.c +++ b/generic/tkTrig.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. * - * SCCS: @(#) tkTrig.c 1.28 97/11/07 21:18:39 + * RCS: @(#) $Id: tkTrig.c,v 1.1.4.2 1998/09/30 02:17:27 stanton Exp $ */ #include <stdio.h> diff --git a/generic/tkUtil.c b/generic/tkUtil.c index f0d2e0c..1c05140 100644 --- a/generic/tkUtil.c +++ b/generic/tkUtil.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. * - * SCCS: @(#) tkUtil.c 1.17 98/01/02 17:39:19 + * RCS: @(#) $Id: tkUtil.c,v 1.1.4.2 1998/09/30 02:17:27 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkVisual.c b/generic/tkVisual.c index cd3e5d4..8d4e5c7 100644 --- a/generic/tkVisual.c +++ b/generic/tkVisual.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. * - * SCCS: @(#) tkVisual.c 1.20 97/11/07 21:18:48 + * RCS: @(#) $Id: tkVisual.c,v 1.1.4.2 1998/09/30 02:17:28 stanton Exp $ */ #include "tkInt.h" diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 8efc8d6..4d83df9 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.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. * - * SCCS: @(#) tkWindow.c 1.237 98/01/12 15:56:12 + * RCS: @(#) $Id: tkWindow.c,v 1.1.4.2 1998/09/30 02:17:28 stanton Exp $ */ #include "tkPort.h" diff --git a/library/bgerror.tcl b/library/bgerror.tcl index ccfaccb..a863145 100644 --- a/library/bgerror.tcl +++ b/library/bgerror.tcl @@ -4,7 +4,7 @@ # posts a dialog box with the error message and gives the user a chance # to see a more detailed stack trace. # -# SCCS: @(#) bgerror.tcl 1.17 97/12/03 15:28:53 +# RCS: @(#) $Id: bgerror.tcl,v 1.1.4.2 1998/09/30 02:17:29 stanton Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. diff --git a/library/button.tcl b/library/button.tcl index 665f7b6..9f63c52 100644 --- a/library/button.tcl +++ b/library/button.tcl @@ -4,7 +4,7 @@ # checkbutton, and radiobutton widgets and provides procedures # that help in implementing those bindings. # -# SCCS: @(#) button.tcl 1.23 97/12/03 15:28:54 +# RCS: @(#) $Id: button.tcl,v 1.1.4.2 1998/09/30 02:17:30 stanton Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. diff --git a/library/clrpick.tcl b/library/clrpick.tcl index 383f799..2250713 100644 --- a/library/clrpick.tcl +++ b/library/clrpick.tcl @@ -3,7 +3,7 @@ # Color selection dialog for platforms that do not support a # standard color selection dialog. # -# SCCS: @(#) clrpick.tcl 1.4 97/12/03 15:28:55 +# RCS: @(#) $Id: clrpick.tcl,v 1.1.4.2 1998/09/30 02:17:30 stanton Exp $ # # Copyright (c) 1996 Sun Microsystems, Inc. # diff --git a/library/comdlg.tcl b/library/comdlg.tcl index cc2a895..97ab1ab 100644 --- a/library/comdlg.tcl +++ b/library/comdlg.tcl @@ -3,7 +3,7 @@ # Some functions needed for the common dialog boxes. Probably need to go # in a different file. # -# SCCS: @(#) comdlg.tcl 1.6 97/12/03 17:09:19 +# RCS: @(#) $Id: comdlg.tcl,v 1.1.4.2 1998/09/30 02:17:31 stanton Exp $ # # Copyright (c) 1996 Sun Microsystems, Inc. # diff --git a/library/console.tcl b/library/console.tcl index c046e21..12e5ecf 100644 --- a/library/console.tcl +++ b/library/console.tcl @@ -4,7 +4,7 @@ # can be used by non-unix systems that do not have built-in support # for shells. # -# SCCS: @(#) console.tcl 1.47 98/01/02 17:42:06 +# RCS: @(#) $Id: console.tcl,v 1.1.4.2 1998/09/30 02:17:31 stanton Exp $ # # Copyright (c) 1995-1997 Sun Microsystems, Inc. # diff --git a/library/demos/README b/library/demos/README index c71f977..61469ea 100644 --- a/library/demos/README +++ b/library/demos/README @@ -43,4 +43,4 @@ browse - A simple directory browser. Invoke it with and argument Double-click on files or subdirectories to browse them. Control-c and control-q cause the program to exit. -sccs id = SCCS: @(#) README 1.3 96/02/16 10:49:14 +RCS: @(#) $Id: README,v 1.1.4.1 1998/09/30 02:17:40 stanton Exp $ diff --git a/library/demos/arrow.tcl b/library/demos/arrow.tcl index 126c179..81fa137 100644 --- a/library/demos/arrow.tcl +++ b/library/demos/arrow.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a canvas widget that displays a # large line with an arrowhead whose shape can be edited interactively. # -# SCCS: @(#) arrow.tcl 1.8 97/03/02 16:18:20 +# RCS: @(#) $Id: arrow.tcl,v 1.1.4.1 1998/09/30 02:17:40 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/bind.tcl b/library/demos/bind.tcl index 175be10..042271c 100644 --- a/library/demos/bind.tcl +++ b/library/demos/bind.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a text widget with bindings set # up for hypertext-like effects. # -# SCCS: @(#) bind.tcl 1.6 97/03/02 16:19:01 +# RCS: @(#) $Id: bind.tcl,v 1.1.4.1 1998/09/30 02:17:40 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/bitmap.tcl b/library/demos/bitmap.tcl index 55f9e73..d53f753 100644 --- a/library/demos/bitmap.tcl +++ b/library/demos/bitmap.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a toplevel window that displays # all of Tk's built-in bitmaps. # -# SCCS: @(#) bitmap.tcl 1.6 97/03/02 16:19:20 +# RCS: @(#) $Id: bitmap.tcl,v 1.1.4.1 1998/09/30 02:17:41 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/browse b/library/demos/browse index 46f6532..404306d 100644 --- a/library/demos/browse +++ b/library/demos/browse @@ -7,7 +7,7 @@ exec wish "$0" "$@" # directory and allows you to open files or subdirectories by # double-clicking. # -# SCCS: @(#) browse 1.8 96/02/16 10:49:18 +# RCS: @(#) $Id: browse,v 1.1.4.1 1998/09/30 02:17:41 stanton Exp $ # Create a scrollbar on the right side of the main window and a listbox # on the left side. diff --git a/library/demos/button.tcl b/library/demos/button.tcl index 8569b1d..6e7aef4 100644 --- a/library/demos/button.tcl +++ b/library/demos/button.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a toplevel window containing # several button widgets. # -# SCCS: @(#) button.tcl 1.5 97/03/02 16:19:39 +# RCS: @(#) $Id: button.tcl,v 1.1.4.1 1998/09/30 02:17:42 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/check.tcl b/library/demos/check.tcl index 46e21b3..4fafeb0 100644 --- a/library/demos/check.tcl +++ b/library/demos/check.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a toplevel window containing # several checkbuttons. # -# SCCS: @(#) check.tcl 1.4 97/03/02 16:19:57 +# RCS: @(#) $Id: check.tcl,v 1.1.4.1 1998/09/30 02:17:42 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/clrpick.tcl b/library/demos/clrpick.tcl index 757e0b8..6ac3203 100644 --- a/library/demos/clrpick.tcl +++ b/library/demos/clrpick.tcl @@ -2,7 +2,7 @@ # # This demonstration script prompts the user to select a color. # -# SCCS: @(#) clrpick.tcl 1.3 97/03/02 16:20:12 +# RCS: @(#) $Id: clrpick.tcl,v 1.1.4.1 1998/09/30 02:17:42 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/colors.tcl b/library/demos/colors.tcl index e95c21c..77350e0 100644 --- a/library/demos/colors.tcl +++ b/library/demos/colors.tcl @@ -4,7 +4,7 @@ # many of the colors from the X color database. You can click on # a color to change the application's palette. # -# SCCS: @(#) colors.tcl 1.4 97/03/02 16:20:29 +# RCS: @(#) $Id: colors.tcl,v 1.1.4.1 1998/09/30 02:17:43 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/cscroll.tcl b/library/demos/cscroll.tcl index 78f99fa..0e0a8b7 100644 --- a/library/demos/cscroll.tcl +++ b/library/demos/cscroll.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a simple canvas that can be # scrolled in two dimensions. # -# SCCS: @(#) cscroll.tcl 1.6 97/03/02 16:20:45 +# RCS: @(#) $Id: cscroll.tcl,v 1.1.4.1 1998/09/30 02:17:43 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/ctext.tcl b/library/demos/ctext.tcl index fdd3f79..f1c314d 100644 --- a/library/demos/ctext.tcl +++ b/library/demos/ctext.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a canvas widget with a text # item that can be edited and reconfigured in various ways. # -# SCCS: @(#) ctext.tcl 1.6 97/03/02 16:21:02 +# RCS: @(#) $Id: ctext.tcl,v 1.1.4.1 1998/09/30 02:17:43 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/dialog1.tcl b/library/demos/dialog1.tcl index e221beb..395b75c 100644 --- a/library/demos/dialog1.tcl +++ b/library/demos/dialog1.tcl @@ -2,7 +2,7 @@ # # This demonstration script creates a dialog box with a local grab. # -# SCCS: @(#) dialog1.tcl 1.2 96/02/16 10:49:52 +# RCS: @(#) $Id: dialog1.tcl,v 1.1.4.1 1998/09/30 02:17:44 stanton Exp $ after idle {.dialog1.msg configure -wraplength 4i} set i [tk_dialog .dialog1 "Dialog with local grab" {This is a modal dialog box. It uses Tk's "grab" command to create a "local grab" on the dialog box. The grab prevents any pointer-related events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below. However, you can still interact with other applications.} \ diff --git a/library/demos/dialog2.tcl b/library/demos/dialog2.tcl index 0cc3bb6..40048a2 100644 --- a/library/demos/dialog2.tcl +++ b/library/demos/dialog2.tcl @@ -2,7 +2,7 @@ # # This demonstration script creates a dialog box with a global grab. # -# SCCS: @(#) dialog2.tcl 1.2 96/02/16 10:49:53 +# RCS: @(#) $Id: dialog2.tcl,v 1.1.4.1 1998/09/30 02:17:44 stanton Exp $ after idle { .dialog2.msg configure -wraplength 4i diff --git a/library/demos/entry1.tcl b/library/demos/entry1.tcl index 0b68b68..4d410f2 100644 --- a/library/demos/entry1.tcl +++ b/library/demos/entry1.tcl @@ -3,7 +3,7 @@ # This demonstration script creates several entry widgets without # scrollbars. # -# SCCS: @(#) entry1.tcl 1.5 97/03/02 16:22:10 +# RCS: @(#) $Id: entry1.tcl,v 1.1.4.1 1998/09/30 02:17:44 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/entry2.tcl b/library/demos/entry2.tcl index d9b67cd..12b1b23 100644 --- a/library/demos/entry2.tcl +++ b/library/demos/entry2.tcl @@ -3,7 +3,7 @@ # This demonstration script is the same as the entry1.tcl script # except that it creates scrollbars for the entries. # -# SCCS: @(#) entry2.tcl 1.5 97/03/02 16:22:24 +# RCS: @(#) $Id: entry2.tcl,v 1.1.4.1 1998/09/30 02:17:45 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/filebox.tcl b/library/demos/filebox.tcl index 83eeacc..7c02854 100644 --- a/library/demos/filebox.tcl +++ b/library/demos/filebox.tcl @@ -2,7 +2,7 @@ # # This demonstration script prompts the user to select a file. # -# SCCS: @(#) filebox.tcl 1.3 97/03/02 16:22:36 +# RCS: @(#) $Id: filebox.tcl,v 1.1.4.1 1998/09/30 02:17:45 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/floor.tcl b/library/demos/floor.tcl index 30b62da..507964f 100644 --- a/library/demos/floor.tcl +++ b/library/demos/floor.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a canvas widet that displays the # floorplan for DEC's Western Research Laboratory. # -# SCCS: @(#) floor.tcl 1.6 97/03/02 16:23:32 +# RCS: @(#) $Id: floor.tcl,v 1.1.4.1 1998/09/30 02:17:45 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/form.tcl b/library/demos/form.tcl index 3c43497..b9b75b2 100644 --- a/library/demos/form.tcl +++ b/library/demos/form.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a simple form with a bunch # of entry widgets. # -# SCCS: @(#) form.tcl 1.5 97/03/02 16:23:48 +# RCS: @(#) $Id: form.tcl,v 1.1.4.1 1998/09/30 02:17:46 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/hello b/library/demos/hello index 0fa5d05..cad76bd 100644 --- a/library/demos/hello +++ b/library/demos/hello @@ -6,7 +6,7 @@ exec wish "$0" "$@" # Simple Tk script to create a button that prints "Hello, world". # Click on the button to terminate the program. # -# SCCS: @(#) hello 1.6 96/02/16 10:49:18 +# RCS: @(#) $Id: hello,v 1.1.4.1 1998/09/30 02:17:47 stanton Exp $ # # The first line below creates the button, and the second line # asks the packer to shrink-wrap the application's main window diff --git a/library/demos/hscale.tcl b/library/demos/hscale.tcl index a760586..4f86be1 100644 --- a/library/demos/hscale.tcl +++ b/library/demos/hscale.tcl @@ -2,7 +2,7 @@ # # This demonstration script shows an example with a horizontal scale. # -# SCCS: @(#) hscale.tcl 1.4 97/03/02 16:24:01 +# RCS: @(#) $Id: hscale.tcl,v 1.1.4.1 1998/09/30 02:17:47 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/icon.tcl b/library/demos/icon.tcl index 1c98fd4..ba46e9e 100644 --- a/library/demos/icon.tcl +++ b/library/demos/icon.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a toplevel window containing # buttons that display bitmaps instead of text. # -# SCCS: @(#) icon.tcl 1.8 97/03/02 16:24:19 +# RCS: @(#) $Id: icon.tcl,v 1.1.4.1 1998/09/30 02:17:48 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/image1.tcl b/library/demos/image1.tcl index a3b78db..6a0c95b 100644 --- a/library/demos/image1.tcl +++ b/library/demos/image1.tcl @@ -2,7 +2,7 @@ # # This demonstration script displays two image widgets. # -# SCCS: @(#) image1.tcl 1.6 97/03/02 16:24:35 +# RCS: @(#) $Id: image1.tcl,v 1.1.4.1 1998/09/30 02:17:48 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/image2.tcl b/library/demos/image2.tcl index badea14..c0c28bb 100644 --- a/library/demos/image2.tcl +++ b/library/demos/image2.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a simple collection of widgets # that allow you to select and view images in a Tk label. # -# SCCS: @(#) image2.tcl 1.9 97/03/02 16:24:48 +# RCS: @(#) $Id: image2.tcl,v 1.1.4.1 1998/09/30 02:17:48 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/items.tcl b/library/demos/items.tcl index 83e6033..5b16fa8 100644 --- a/library/demos/items.tcl +++ b/library/demos/items.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a canvas that displays the # canvas item types. # -# SCCS: @(#) items.tcl 1.16 97/03/02 16:25:05 +# RCS: @(#) $Id: items.tcl,v 1.1.4.1 1998/09/30 02:17:49 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/ixset b/library/demos/ixset index dcde75d..18fa22d 100644 --- a/library/demos/ixset +++ b/library/demos/ixset @@ -9,7 +9,7 @@ exec wish "$0" "$@" # 91/11/23 : pda@masi.ibp.fr, jt@ratp.fr : design # 92/08/01 : pda@masi.ibp.fr : cleaning # -# SCCS: @(#) ixset 1.7 96/02/16 10:49:19 +# RCS: @(#) $Id: ixset,v 1.1.4.1 1998/09/30 02:17:49 stanton Exp $ # # Button actions diff --git a/library/demos/label.tcl b/library/demos/label.tcl index 2e0b027..8b61338 100644 --- a/library/demos/label.tcl +++ b/library/demos/label.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a toplevel window containing # several label widgets. # -# SCCS: @(#) label.tcl 1.7 97/03/02 16:25:27 +# RCS: @(#) $Id: label.tcl,v 1.1.4.1 1998/09/30 02:17:49 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/menu.tcl b/library/demos/menu.tcl index 78ec625..60e6d1c 100644 --- a/library/demos/menu.tcl +++ b/library/demos/menu.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a window with a bunch of menus # and cascaded menus using menubars. # -# SCCS: @(#) menu.tcl 1.17 97/06/26 15:45:04 +# RCS: @(#) $Id: menu.tcl,v 1.1.4.1 1998/09/30 02:17:50 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/menubu.tcl b/library/demos/menubu.tcl index 2a76e30..b30eb7f 100644 --- a/library/demos/menubu.tcl +++ b/library/demos/menubu.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a window with a bunch of menus # and cascaded menus using menubuttons. # -# # SCCS: @(#) menubu.tcl 1.9 97/06/19 18:11:06 +# # RCS: @(#) $Id: menubu.tcl,v 1.1.4.1 1998/09/30 02:17:50 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/msgbox.tcl b/library/demos/msgbox.tcl index 52b648f..fe0c41e 100644 --- a/library/demos/msgbox.tcl +++ b/library/demos/msgbox.tcl @@ -2,7 +2,7 @@ # # This demonstration script creates message boxes of various type # -# SCCS: @(#) msgbox.tcl 1.3 97/03/02 16:26:07 +# RCS: @(#) $Id: msgbox.tcl,v 1.1.4.1 1998/09/30 02:17:50 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/plot.tcl b/library/demos/plot.tcl index 6067979..75e0b02 100644 --- a/library/demos/plot.tcl +++ b/library/demos/plot.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a canvas widget showing a 2-D # plot with data points that can be dragged with the mouse. # -# SCCS: @(#) plot.tcl 1.5 97/03/02 16:26:19 +# RCS: @(#) $Id: plot.tcl,v 1.1.4.1 1998/09/30 02:17:51 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/puzzle.tcl b/library/demos/puzzle.tcl index 7e3d9c8..d3661d7 100644 --- a/library/demos/puzzle.tcl +++ b/library/demos/puzzle.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a 15-puzzle game using a collection # of buttons. # -# SCCS: @(#) puzzle.tcl 1.5 97/03/02 16:26:32 +# RCS: @(#) $Id: puzzle.tcl,v 1.1.4.1 1998/09/30 02:17:51 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/radio.tcl b/library/demos/radio.tcl index 2b73739..1e7c39f 100644 --- a/library/demos/radio.tcl +++ b/library/demos/radio.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a toplevel window containing # several radiobutton widgets. # -# SCCS: @(#) radio.tcl 1.5 97/03/02 16:26:57 +# RCS: @(#) $Id: radio.tcl,v 1.1.4.1 1998/09/30 02:17:51 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/rmt b/library/demos/rmt index 9310475..d61782a 100644 --- a/library/demos/rmt +++ b/library/demos/rmt @@ -7,7 +7,7 @@ exec wish "$0" "$@" # Tk applications. It allows you to select an application and # then type commands to that application. # -# SCCS: @(#) rmt 1.10 96/06/24 16:42:38 +# RCS: @(#) $Id: rmt,v 1.1.4.1 1998/09/30 02:17:52 stanton Exp $ wm title . "Tk Remote Controller" wm iconname . "Tk Remote" diff --git a/library/demos/rolodex b/library/demos/rolodex index e3e0e5a..7465b8f 100644 --- a/library/demos/rolodex +++ b/library/demos/rolodex @@ -8,7 +8,7 @@ exec wish "$0" "$@" # feel of a rolodex program, although it's lifeless and doesn't # actually do the rolodex application. # -# SCCS: @(#) rolodex 1.7 96/02/16 10:49:23 +# RCS: @(#) $Id: rolodex,v 1.1.4.1 1998/09/30 02:17:52 stanton Exp $ foreach i [winfo child .] { catch {destroy $i} diff --git a/library/demos/ruler.tcl b/library/demos/ruler.tcl index 3c77c72..c95896f 100644 --- a/library/demos/ruler.tcl +++ b/library/demos/ruler.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a canvas widget that displays a ruler # with tab stops that can be set, moved, and deleted. # -# SCCS: @(#) ruler.tcl 1.9 97/03/02 16:17:33 +# RCS: @(#) $Id: ruler.tcl,v 1.1.4.1 1998/09/30 02:17:53 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/sayings.tcl b/library/demos/sayings.tcl index b4952c5..862cef2 100644 --- a/library/demos/sayings.tcl +++ b/library/demos/sayings.tcl @@ -4,7 +4,7 @@ # both horizontally and vertically. It displays a collection of # well-known sayings. # -# SCCS: @(#) sayings.tcl 1.7 97/03/02 16:27:10 +# RCS: @(#) $Id: sayings.tcl,v 1.1.4.1 1998/09/30 02:17:53 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/search.tcl b/library/demos/search.tcl index ffefd82..0205bf6 100644 --- a/library/demos/search.tcl +++ b/library/demos/search.tcl @@ -4,7 +4,7 @@ # allow you to load a file into a text widget, then perform searches # on that file. # -# SCCS: @(#) search.tcl 1.5 97/03/02 16:27:25 +# RCS: @(#) $Id: search.tcl,v 1.1.4.1 1998/09/30 02:17:53 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/square b/library/demos/square index 743016f..3a48358 100644 --- a/library/demos/square +++ b/library/demos/square @@ -11,7 +11,7 @@ exec wish "$0" "$@" # Button-1 press/drag: moves square to mouse # "a": toggle size animation on/off # -# SCCS: @(#) square 1.7 97/02/24 16:42:31 +# RCS: @(#) $Id: square,v 1.1.4.1 1998/09/30 02:17:54 stanton Exp $ square .s pack .s -expand yes -fill both diff --git a/library/demos/states.tcl b/library/demos/states.tcl index 23905a2..0510c00 100644 --- a/library/demos/states.tcl +++ b/library/demos/states.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a listbox widget that displays # the names of the 50 states in the United States of America. # -# SCCS: @(#) states.tcl 1.4 97/03/02 16:27:37 +# RCS: @(#) $Id: states.tcl,v 1.1.4.1 1998/09/30 02:17:54 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/style.tcl b/library/demos/style.tcl index bb1d29b..cb2812f 100644 --- a/library/demos/style.tcl +++ b/library/demos/style.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a text widget that illustrates the # various display styles that may be set for tags. # -# SCCS: @(#) style.tcl 1.9 97/05/06 13:59:06 +# RCS: @(#) $Id: style.tcl,v 1.1.4.2 1998/09/30 02:17:54 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/tcolor b/library/demos/tcolor index 50c0e68..680c18e 100644 --- a/library/demos/tcolor +++ b/library/demos/tcolor @@ -7,7 +7,7 @@ exec wish "$0" "$@" # create colors using either the RGB, HSB, or CYM color spaces # and apply the color to existing applications. # -# SCCS: @(#) tcolor 1.11 96/06/24 16:43:11 +# RCS: @(#) $Id: tcolor,v 1.1.4.1 1998/09/30 02:17:55 stanton Exp $ wm title . "Color Editor" diff --git a/library/demos/text.tcl b/library/demos/text.tcl index 97df780..acbafce 100644 --- a/library/demos/text.tcl +++ b/library/demos/text.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a text widget that describes # the basic editing functions. # -# SCCS: @(#) text.tcl 1.6 97/03/02 16:28:12 +# RCS: @(#) $Id: text.tcl,v 1.1.4.1 1998/09/30 02:17:55 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/timer b/library/demos/timer index b2edd11..7089a5c 100644 --- a/library/demos/timer +++ b/library/demos/timer @@ -5,7 +5,7 @@ exec wish "$0" "$@" # timer -- # This script generates a counter with start and stop buttons. # -# SCCS: @(#) timer 1.6 96/02/16 10:49:20 +# RCS: @(#) $Id: timer,v 1.1.4.1 1998/09/30 02:17:56 stanton Exp $ label .counter -text 0.00 -relief raised -width 10 button .start -text Start -command { diff --git a/library/demos/twind.tcl b/library/demos/twind.tcl index 75e732c..32b24b0 100644 --- a/library/demos/twind.tcl +++ b/library/demos/twind.tcl @@ -3,7 +3,7 @@ # This demonstration script creates a text widget with a bunch of # embedded windows. # -# SCCS: @(#) twind.tcl 1.7 97/03/02 16:28:22 +# RCS: @(#) $Id: twind.tcl,v 1.1.4.1 1998/09/30 02:17:56 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/vscale.tcl b/library/demos/vscale.tcl index ed78ac0..d129c87 100644 --- a/library/demos/vscale.tcl +++ b/library/demos/vscale.tcl @@ -2,7 +2,7 @@ # # This demonstration script shows an example with a vertical scale. # -# SCCS: @(#) vscale.tcl 1.4 97/03/02 16:28:34 +# RCS: @(#) $Id: vscale.tcl,v 1.1.4.1 1998/09/30 02:17:56 stanton Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." diff --git a/library/demos/widget b/library/demos/widget index 05c89cd..a386c2f 100644 --- a/library/demos/widget +++ b/library/demos/widget @@ -11,7 +11,7 @@ exec wish "$0" "$@" # ".tcl" files is this directory, which are sourced by this script # as needed. # -# SCCS: @(#) widget 1.35 97/07/19 15:42:22 +# RCS: @(#) $Id: widget,v 1.1.4.1 1998/09/30 02:17:57 stanton Exp $ eval destroy [winfo child .] wm title . "Widget Demonstration" diff --git a/library/dialog.tcl b/library/dialog.tcl index 1c4a5ba..e3115bb 100644 --- a/library/dialog.tcl +++ b/library/dialog.tcl @@ -3,7 +3,7 @@ # This file defines the procedure tk_dialog, which creates a dialog # box containing a bitmap, a message, and one or more buttons. # -# SCCS: @(#) dialog.tcl 1.35 97/12/19 16:07:49 +# RCS: @(#) $Id: dialog.tcl,v 1.1.4.2 1998/09/30 02:17:32 stanton Exp $ # # Copyright (c) 1992-1993 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. diff --git a/library/entry.tcl b/library/entry.tcl index 5668b6b..82ea8e7 100644 --- a/library/entry.tcl +++ b/library/entry.tcl @@ -3,7 +3,7 @@ # This file defines the default bindings for Tk entry widgets and provides # procedures that help in implementing those bindings. # -# SCCS: @(#) entry.tcl 1.50 97/12/03 15:28:57 +# RCS: @(#) $Id: entry.tcl,v 1.1.4.2 1998/09/30 02:17:32 stanton Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. @@ -31,7 +31,6 @@ #------------------------------------------------------------------------- # The code below creates the default class bindings for entries. #------------------------------------------------------------------------- - bind Entry <<Cut>> { if {![catch {set data [string range [%W get] [%W index sel.first]\ [expr {[%W index sel.last] - 1}]]}]} { @@ -62,6 +61,11 @@ bind Entry <<Paste>> { bind Entry <<Clear>> { %W delete sel.first sel.last } +bind Entry <<PasteSelection>> { + if {!$tkPriv(mouseMoved) || $tk_strictMotif} { + tkEntryPaste %W %x + } +} # Standard Motif bindings: @@ -108,11 +112,6 @@ bind Entry <ButtonRelease-1> { bind Entry <Control-1> { %W icursor @%x } -bind Entry <ButtonRelease-2> { - if {!$tkPriv(mouseMoved) || $tk_strictMotif} { - tkEntryPaste %W %x - } -} bind Entry <Left> { tkEntrySetCursor %W [expr {[%W index insert] - 1}] @@ -206,8 +205,12 @@ if {$tcl_platform(platform) == "macintosh"} { bind Entry <Command-KeyPress> {# nothing} } -bind Entry <Insert> { - catch {tkEntryInsert %W [selection get -displayof %W]} +# On Windows, paste is done using Shift-Insert. Shift-Insert already +# generates the <<Paste>> event, so we don't need to do anything here. +if {$tcl_platform(platform) != "windows"} { + bind Entry <Insert> { + catch {tkEntryInsert %W [selection get -displayof %W]} + } } # Additional emacs-like bindings: diff --git a/library/focus.tcl b/library/focus.tcl index 0847e4c..f45094d 100644 --- a/library/focus.tcl +++ b/library/focus.tcl @@ -3,7 +3,7 @@ # This file defines several procedures for managing the input # focus. # -# SCCS: @(#) focus.tcl 1.18 97/12/03 15:28:58 +# RCS: @(#) $Id: focus.tcl,v 1.1.4.2 1998/09/30 02:17:33 stanton Exp $ # # Copyright (c) 1994-1995 Sun Microsystems, Inc. # diff --git a/library/images/README b/library/images/README index 176b6e2..b875df1 100644 --- a/library/images/README +++ b/library/images/README @@ -1,6 +1,6 @@ README - images directory -SCCS: @(#) README 1.1 97/08/06 13:19:19 +RCS: @(#) $Id: README,v 1.1.4.1 1998/09/30 02:17:57 stanton Exp $ This directory includes images for the Tcl Logo and the Tcl Powered diff --git a/library/listbox.tcl b/library/listbox.tcl index b2ad4d3..0002502 100644 --- a/library/listbox.tcl +++ b/library/listbox.tcl @@ -3,7 +3,7 @@ # This file defines the default bindings for Tk listbox widgets # and provides procedures that help in implementing those bindings. # -# SCCS: @(#) listbox.tcl 1.22 97/12/03 15:28:59 +# RCS: @(#) $Id: listbox.tcl,v 1.1.4.2 1998/09/30 02:17:33 stanton Exp $ # # Copyright (c) 1994 The Regents of the University of California. # Copyright (c) 1994-1995 Sun Microsystems, Inc. diff --git a/library/menu.tcl b/library/menu.tcl index eaa694f..5711825 100644 --- a/library/menu.tcl +++ b/library/menu.tcl @@ -4,7 +4,7 @@ # It also implements keyboard traversal of menus and implements a few # other utility procedures related to menus. # -# SCCS: @(#) menu.tcl 1.104 97/12/03 15:28:59 +# RCS: @(#) $Id: menu.tcl,v 1.1.4.2 1998/09/30 02:17:33 stanton Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. diff --git a/library/msgbox.tcl b/library/msgbox.tcl index 5724508..41a0403 100644 --- a/library/msgbox.tcl +++ b/library/msgbox.tcl @@ -3,7 +3,7 @@ # Implements messageboxes for platforms that do not have native # messagebox support. # -# SCCS: @(#) msgbox.tcl 1.11 97/12/19 16:07:48 +# RCS: @(#) $Id: msgbox.tcl,v 1.1.4.2 1998/09/30 02:17:34 stanton Exp $ # # Copyright (c) 1994-1997 Sun Microsystems, Inc. # @@ -120,7 +120,7 @@ proc tkMessageBox {args} { } } if {!$valid} { - error "bad -default value \"$data(-default)\": must be abort, retry, ignore, ok, cancel, no, or yes" + error "invalid default button \"$data(-default)\"" } } diff --git a/library/obsolete.tcl b/library/obsolete.tcl index 7fc1fb3..aaa18bb 100644 --- a/library/obsolete.tcl +++ b/library/obsolete.tcl @@ -3,7 +3,7 @@ # This file contains obsolete procedures that people really shouldn't # be using anymore, but which are kept around for backward compatibility. # -# SCCS: @(#) obsolete.tcl 1.3 96/02/16 10:48:19 +# RCS: @(#) $Id: obsolete.tcl,v 1.1.4.1 1998/09/30 02:17:34 stanton Exp $ # # Copyright (c) 1994 The Regents of the University of California. # Copyright (c) 1994 Sun Microsystems, Inc. diff --git a/library/optMenu.tcl b/library/optMenu.tcl index 2b15f91..fa36126 100644 --- a/library/optMenu.tcl +++ b/library/optMenu.tcl @@ -3,7 +3,7 @@ # This file defines the procedure tk_optionMenu, which creates # an option button and its associated menu. # -# SCCS: @(#) optMenu.tcl 1.12 97/12/03 15:29:01 +# RCS: @(#) $Id: optMenu.tcl,v 1.1.4.2 1998/09/30 02:17:35 stanton Exp $ # # Copyright (c) 1994 The Regents of the University of California. # Copyright (c) 1994 Sun Microsystems, Inc. diff --git a/library/palette.tcl b/library/palette.tcl index b6d8313..1afec13 100644 --- a/library/palette.tcl +++ b/library/palette.tcl @@ -3,7 +3,7 @@ # This file contains procedures that change the color palette used # by Tk. # -# SCCS: @(#) palette.tcl 1.12 97/12/03 15:29:02 +# RCS: @(#) $Id: palette.tcl,v 1.1.4.2 1998/09/30 02:17:35 stanton Exp $ # # Copyright (c) 1995-1997 Sun Microsystems, Inc. # diff --git a/library/prolog.ps b/library/prolog.ps index 378d503..527cb08 100644 --- a/library/prolog.ps +++ b/library/prolog.ps @@ -3,7 +3,7 @@ % This is a standard prolog for Postscript generated by Tk's canvas % widget. -% SCCS: @(#) prolog.ps 1.7 96/07/08 17:52:14 +% RCS: @(#) $Id: prolog.ps,v 1.1.4.1 1998/09/30 02:17:35 stanton Exp $ % The definitions below just define all of the variables used in % any of the procedures here. This is needed for obscure reasons diff --git a/library/safetk.tcl b/library/safetk.tcl index 30574de..064559b 100644 --- a/library/safetk.tcl +++ b/library/safetk.tcl @@ -2,7 +2,7 @@ # # Support procs to use Tk in safe interpreters. # -# SCCS: @(#) safetk.tcl 1.13 98/01/15 13:40:46 +# RCS: @(#) $Id: safetk.tcl,v 1.1.4.2 1998/09/30 02:17:36 stanton Exp $ # # Copyright (c) 1997 Sun Microsystems, Inc. # diff --git a/library/scale.tcl b/library/scale.tcl index 3da1201..759662d 100644 --- a/library/scale.tcl +++ b/library/scale.tcl @@ -3,7 +3,7 @@ # This file defines the default bindings for Tk scale widgets and provides # procedures that help in implementing the bindings. # -# SCCS: @(#) scale.tcl 1.13 97/12/03 15:29:03 +# RCS: @(#) $Id: scale.tcl,v 1.1.4.2 1998/09/30 02:17:36 stanton Exp $ # # Copyright (c) 1994 The Regents of the University of California. # Copyright (c) 1994-1995 Sun Microsystems, Inc. diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl index 9674951..ebf880d 100644 --- a/library/scrlbar.tcl +++ b/library/scrlbar.tcl @@ -3,7 +3,7 @@ # This file defines the default bindings for Tk scrollbar widgets. # It also provides procedures that help in implementing the bindings. # -# SCCS: @(#) scrlbar.tcl 1.27 97/12/03 15:29:03 +# RCS: @(#) $Id: scrlbar.tcl,v 1.1.4.2 1998/09/30 02:17:37 stanton Exp $ # # Copyright (c) 1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. diff --git a/library/tearoff.tcl b/library/tearoff.tcl index 2b318c6..000fb12 100644 --- a/library/tearoff.tcl +++ b/library/tearoff.tcl @@ -2,7 +2,7 @@ # # This file contains procedures that implement tear-off menus. # -# SCCS: @(#) tearoff.tcl 1.22 98/01/16 15:21:49 +# RCS: @(#) $Id: tearoff.tcl,v 1.1.4.2 1998/09/30 02:17:37 stanton Exp $ # # Copyright (c) 1994 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. diff --git a/library/text.tcl b/library/text.tcl index d07544e..69dfb00 100644 --- a/library/text.tcl +++ b/library/text.tcl @@ -3,7 +3,7 @@ # This file defines the default bindings for Tk text widgets and provides # procedures that help in implementing the bindings. # -# SCCS: @(#) text.tcl 1.59 97/12/03 15:29:05 +# RCS: @(#) $Id: text.tcl,v 1.1.4.2 1998/09/30 02:17:37 stanton Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. @@ -86,11 +86,6 @@ bind Text <ButtonRelease-1> { bind Text <Control-1> { %W mark set insert @%x,%y } -bind Text <ButtonRelease-2> { - if {!$tkPriv(mouseMoved) || $tk_strictMotif} { - tkTextPaste %W %x %y - } -} bind Text <Left> { tkTextSetCursor %W insert-1c } @@ -254,6 +249,11 @@ bind Text <<Paste>> { bind Text <<Clear>> { catch {%W delete sel.first sel.last} } +bind Text <<PasteSelection>> { + if {!$tkPriv(mouseMoved) || $tk_strictMotif} { + tkTextPaste %W %x %y + } +} bind Text <Insert> { catch {tkTextInsert %W [selection get -displayof %W]} } diff --git a/library/tk.tcl b/library/tk.tcl index 1a1fbd0..1a128b9 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -3,7 +3,7 @@ # Initialization script normally executed in the interpreter for each # Tk-based application. Arranges class bindings for widgets. # -# SCCS: @(#) tk.tcl 1.101 97/12/19 16:16:40 +# RCS: @(#) $Id: tk.tcl,v 1.1.4.2 1998/09/30 02:17:38 stanton Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -155,6 +155,7 @@ switch $tcl_platform(platform) { event add <<Cut>> <Control-Key-x> <Key-F20> event add <<Copy>> <Control-Key-c> <Key-F16> event add <<Paste>> <Control-Key-v> <Key-F18> + event add <<PasteSelection>> <ButtonRelease-2> trace variable tk_strictMotif w tkEventMotifBindings set tk_strictMotif $tk_strictMotif } @@ -162,11 +163,13 @@ switch $tcl_platform(platform) { event add <<Cut>> <Control-Key-x> <Shift-Key-Delete> event add <<Copy>> <Control-Key-c> <Control-Key-Insert> event add <<Paste>> <Control-Key-v> <Shift-Key-Insert> + event add <<PasteSelection>> <ButtonRelease-2> } "macintosh" { event add <<Cut>> <Control-Key-x> <Key-F2> event add <<Copy>> <Control-Key-c> <Key-F3> event add <<Paste>> <Control-Key-v> <Key-F4> + event add <<PasteSelection>> <ButtonRelease-2> event add <<Clear>> <Clear> } } diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl index 8e2bd73..881e87a 100644 --- a/library/tkfbox.tcl +++ b/library/tkfbox.tcl @@ -11,7 +11,7 @@ # files by clicking on the file icons or by entering a filename # in the "Filename:" entry. # -# SCCS: @(#) tkfbox.tcl 1.22 98/01/26 19:42:37 +# RCS: @(#) $Id: tkfbox.tcl,v 1.1.4.2 1998/09/30 02:17:38 stanton Exp $ # # Copyright (c) 1994-1998 Sun Microsystems, Inc. # @@ -309,7 +309,7 @@ proc tkIconList_Invoke {w} { upvar #0 $w data if {[string compare $data(-command) ""] && [info exists data(selected)]} { - eval $data(-command) [list $data(selected)] + eval $data(-command) } } @@ -653,6 +653,17 @@ proc tkFDialog {type args} { } elseif {[string compare [winfo class $w] TkFDialog]} { destroy $w tkFDialog_Create $w + } else { + set data(dirMenuBtn) $w.f1.menu + set data(dirMenu) $w.f1.menu.menu + set data(upBtn) $w.f1.up + set data(icons) $w.icons + set data(ent) $w.f2.ent + set data(typeMenuLab) $w.f3.lab + set data(typeMenuBtn) $w.f3.menu + set data(typeMenu) $data(typeMenuBtn).m + set data(okBtn) $w.f2.ok + set data(cancelBtn) $w.f3.cancel } wm transient $w $data(-parent) @@ -784,8 +795,15 @@ proc tkFDialog_Config {dataName type argList} { if {[file isdirectory $data(-initialdir)]} { set data(selectPath) [lindex [glob $data(-initialdir)] 0] } else { - error "\"$data(-initialdir)\" is not a valid directory" + set data(selectPath) [pwd] } + + # Convert the initialdir to an absolute path name. + + set old [pwd] + cd $data(selectPath) + set data(selectPath) [pwd] + cd $old } set data(selectFile) $data(-initialfile) @@ -836,7 +854,7 @@ static char updir_bits[] = { # set data(icons) [tkIconList $w.icons \ -browsecmd "tkFDialog_ListBrowse $w" \ - -command "tkFDialog_ListInvoke $w"] + -command "tkFDialog_OkCmd $w"] # f2: the frame with the OK button and the "file name" field # @@ -951,18 +969,18 @@ proc tkFDialog_UpdateWhenIdle {w} { # directories. # proc tkFDialog_Update {w} { - set dataName [winfo name $w] - upvar #0 $dataName data - global tk_library tkPriv # This proc may be called within an idle handler. Make sure that the # window has not been destroyed before this proc is called if {![winfo exists $w] || [string compare [winfo class $w] TkFDialog]} { return - } else { - catch {unset data(updateId)} } + set dataName [winfo name $w] + upvar #0 $dataName data + global tk_library tkPriv + catch {unset data(updateId)} + if {![info exists tkPriv(folderImage)]} { set tkPriv(folderImage) [image create photo -data { R0lGODlhEAAMAKEAAAD//wAAAPD/gAAAACH5BAEAAAAALAAAAAAQAAwAAAIghINhyycvVFsB @@ -1069,7 +1087,7 @@ rSASvJTGhnhcV3EJlo3kh53ltF5nAhQAOw==}] # proc tkFDialog_SetPathSilently {w path} { upvar #0 [winfo name $w] data - + trace vdelete data(selectPath) w "tkFDialog_SetPath $w" set data(selectPath) $path trace variable data(selectPath) w "tkFDialog_SetPath $w" @@ -1079,8 +1097,10 @@ proc tkFDialog_SetPathSilently {w path} { # This proc gets called whenever data(selectPath) is set # proc tkFDialog_SetPath {w name1 name2 op} { - upvar #0 [winfo name $w] data - tkFDialog_UpdateWhenIdle $w + if {[winfo exists $w]} { + upvar #0 [winfo name $w] data + tkFDialog_UpdateWhenIdle $w + } } # This proc gets called whenever data(filter) is set diff --git a/library/xmfbox.tcl b/library/xmfbox.tcl index 3d3f014..8b6f478 100644 --- a/library/xmfbox.tcl +++ b/library/xmfbox.tcl @@ -4,13 +4,12 @@ # Unix platform. This implementation is used only if the # "tk_strictMotif" flag is set. # +# RCS: @(#) $Id: xmfbox.tcl,v 1.1.4.2 1998/09/30 02:17:39 stanton Exp $ +# # Copyright (c) 1996 Sun Microsystems, Inc. # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -# -# SCCS: @(#) xmfbox.tcl 1.11 97/12/23 14:11:40 -# # tkMotifFDialog -- # @@ -181,8 +180,15 @@ proc tkMotifFDialog_Config {dataName type argList} { if {[file isdirectory $data(-initialdir)]} { set data(selectPath) [glob $data(-initialdir)] } else { - error "\"$data(-initialdir)\" is not a valid directory" + set data(selectPath) [pwd] } + + # Convert the initialdir to an absolute path name. + + set old [pwd] + cd $data(selectPath) + set data(selectPath) [pwd] + cd $old } set data(selectFile) $data(-initialfile) diff --git a/mac/MW_TkHeader.pch b/mac/MW_TkHeader.pch index a049f62..5cf03fb 100644 --- a/mac/MW_TkHeader.pch +++ b/mac/MW_TkHeader.pch @@ -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. * - * SCCS: @(#) MW_TkHeader.pch 1.29 98/02/18 16:23:13 + * RCS: @(#) $Id: MW_TkHeader.pch,v 1.1.4.2 1998/09/30 02:17:58 stanton Exp $ */ /* @@ -1,11 +1,14 @@ Tk 8.1 for Macintosh -by Ray Johnson and Jim Ingham -Sun Microsystems Laboratories -rjohnson@eng.sun.com -jim.ingham@sun.com +by Ray Johnson +Scriptics Corporation +rjohnson@scriptics.com +with major help from +Jim Ingham +Cygnus Solutions +jingham@cygnus.com -SCCS: @(#) README 1.33 98/02/18 11:23:12 +RCS: @(#) $Id: README,v 1.1.4.2 1998/09/30 02:17:59 stanton Exp $ 1. Introduction --------------- @@ -93,10 +96,16 @@ mactk-source-8.1.sea.hqx are included. However, you must already have the More Files package to compile this code. +UNIX Tar file distribution. + The standard Tcl/Tk source distribution has Mac project files + in it. Be warned that the Tk project file is lacking one minor + change compared to the ones in the installers listed above + having to do with locking down the MDEF resource. + 5. Documentation ---------------- -Two books are currently available for Tcl. Both provide a good +There are now many books available for Tcl. These two provide a good introduction to the language. It is a good way to get started if you haven't used the language before: @@ -110,6 +119,9 @@ if you haven't used the language before: Publisher: Prentice Hall ISBN: 0-13-182007-9 +More books are listed at + http://www.scriptics.com/resource/doc/books/ + The "doc" subdirectory contains reference in documentation in the "man" format found on most UNIX machines. Unfortunately, there is not a suitable way to view these pages on the Macintosh. @@ -118,7 +130,7 @@ developed. We are working are having better documentation for the Macintosh platform in the future. However, if you have WWW access you may access the Man pages at the following URL: - http://sunscript.sun.com/man/tcl8.0/contents.html + http://www.scriptics.com/man/tcl8.0/contents.html Other documentation and sample Tcl scripts can be found at the Tcl ftp site: @@ -135,7 +147,7 @@ available (see below). In order to compile Macintosh Tk you must have the following items: - CodeWarrior Pro 2 or higher + CodeWarrior Pro 3 or higher Mac Tcl 8.1 (source) (which requires More Files 1.4.2 or 1.4.3) Mac Tk 8.1 (source) @@ -150,13 +162,8 @@ Special notes: * Check out the file bugs.doc for information about known bugs. * We are starting to support the new Appearance Manager that shipped - with MacOS 8. wm iconify uses it, and the coloring of the - backgrounds of radiobuttons & checkbuttons now works under - Appearance. Tk correctly checks the Gestalt for Appearance, so you - do not have to install it on your target machines. However, you do - have to have the header and stub files to build it. These come with - CWPro 2, and are also available now from Apple. - + with MacOS 8.0. The Tk 8.0.3 release is the first Tk release + that supports the Appearance Manager well. 7. About Dialog --------------- @@ -251,4 +258,4 @@ future. If you have comments or Bug reports send them to: Jim Ingham -jingham@eng.sun.com +jingham@cygnus.com diff --git a/mac/bugs.doc b/mac/bugs.doc index 5e5a3e8..d51afc8 100644 --- a/mac/bugs.doc +++ b/mac/bugs.doc @@ -4,7 +4,7 @@ by Ray Johnson Sun Microsystems Laboratories rjohnson@eng.sun.com -SCCS: @(#) bugs.doc 1.11 98/02/18 13:24:41 +RCS: @(#) $Id: bugs.doc,v 1.1.4.2 1998/09/30 02:17:59 stanton Exp $ We are now very close to passing the test suite for Tk. We are very interested in finding remaining bugs that still linger. Please let us diff --git a/mac/tclets.tcl b/mac/tclets.tcl index c8726a8..764a307 100644 --- a/mac/tclets.tcl +++ b/mac/tclets.tcl @@ -7,7 +7,7 @@ # into a copy of a stub application (the user can pick). The file is placed into the # TEXT resource named "tclshrc" which is automatically executed on startup. # -# SCCS: @(#) tclets.tcl 1.2 97/08/15 09:25:56 +# RCS: @(#) $Id: tclets.tcl,v 1.1.4.1 1998/09/30 02:18:00 stanton Exp $ # # Copyright (c) 1997 Sun Microsystems, Inc. # diff --git a/mac/tkMac.h b/mac/tkMac.h index 87c005a..7633a03 100644 --- a/mac/tkMac.h +++ b/mac/tkMac.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: %Z% %M% %I% %E% %U% + * RCS: @(#) $Id: tkMac.h,v 1.1.4.2 1998/09/30 02:18:00 stanton Exp $ */ #ifndef _TKMAC @@ -73,6 +73,8 @@ EXTERN int TkMacConvertTkEvent _ANSI_ARGS_((EventRecord *eventPtr, EXTERN void TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); EXTERN void TkMacInvalClipRgns _ANSI_ARGS_((TkWindow *winPtr)); +EXTERN int TkMacHaveAppearance _ANSI_ARGS_((void)); +EXTERN GWorldPtr TkMacGetDrawablePort _ANSI_ARGS_((Drawable drawable)); #pragma export reset diff --git a/mac/tkMacAppInit.c b/mac/tkMacAppInit.c index 226127f..c254835 100644 --- a/mac/tkMacAppInit.c +++ b/mac/tkMacAppInit.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacAppInit.c 1.36 97/11/07 21:20:46 + * RCS: @(#) $Id: tkMacAppInit.c,v 1.1.4.2 1998/09/30 02:18:01 stanton Exp $ */ #include <Gestalt.h> @@ -18,6 +18,7 @@ #include <Dialogs.h> #include <SegLoad.h> #include <Traps.h> +#include <Appearance.h> #include "tk.h" #include "tkInt.h" @@ -221,6 +222,17 @@ MacintoshInit() */ tcl_macQdPtr = &qd; + /* + * If appearance is present, then register Tk as an Appearance client + * This means that the mapping from non-Appearance to Appearance cdefs + * will be done for Tk regardless of the setting in the Appearance + * control panel. + */ + + if (TkMacHaveAppearance()) { + RegisterAppearanceClient(); + } + InitGraf(&tcl_macQdPtr->thePort); InitFonts(); InitWindows(); diff --git a/mac/tkMacApplication.r b/mac/tkMacApplication.r index 365035d..715d609 100644 --- a/mac/tkMacApplication.r +++ b/mac/tkMacApplication.r @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacApplication.r 1.3 97/11/03 17:16:24 + * RCS: @(#) $Id: tkMacApplication.r,v 1.1.4.1 1998/09/30 02:18:01 stanton Exp $ */ #include <Types.r> diff --git a/mac/tkMacBitmap.c b/mac/tkMacBitmap.c index 6571d43..26c55ef 100644 --- a/mac/tkMacBitmap.c +++ b/mac/tkMacBitmap.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacBitmap.c 1.7 98/01/22 17:00:58 + * RCS: @(#) $Id: tkMacBitmap.c,v 1.1.4.2 1998/09/30 02:18:02 stanton Exp $ */ #include "tkPort.h" diff --git a/mac/tkMacButton.c b/mac/tkMacButton.c index 287c2ef..40114ca 100644 --- a/mac/tkMacButton.c +++ b/mac/tkMacButton.c @@ -2,14 +2,14 @@ * tkMacButton.c -- * * This file implements the Macintosh specific portion of the - * button widgets. + * button widgets. * * Copyright (c) 1996-1997 by Sun Microsystems, Inc. * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacButton.c 1.20 98/02/18 10:48:42 + * RCS: @(#) $Id: tkMacButton.c,v 1.1.4.2 1998/09/30 02:18:02 stanton Exp $ */ #include "tkButton.h" @@ -18,6 +18,9 @@ #include <LowMem.h> #include <Appearance.h> + +#include <ToolUtils.h> + /* * Some defines used to control what type of control is drawn. */ @@ -25,6 +28,7 @@ #define DRAW_LABEL 0 /* Labels are treated genericly. */ #define DRAW_CONTROL 1 /* Draw using the Native control. */ #define DRAW_CUSTOM 2 /* Make our own button drawing. */ +#define DRAW_BEVEL 3 /* * The following structures are used to draw our controls. Rather than @@ -38,6 +42,21 @@ static CWindowRecord windowRecord; static ControlRef buttonHandle; static ControlRef checkHandle; static ControlRef radioHandle; +static ControlRef smallBevelHandle; +static ControlRef smallStickyBevelHandle; +static ControlRef medBevelHandle; +static ControlRef medStickyBevelHandle; +static ControlRef largeBevelHandle; +static ControlRef largeStickyBevelHandle; + +/* + * These are used to store the image content for + * beveled buttons - i.e. buttons with images. + */ + +static ControlButtonContentInfo bevelButtonContent; +static OpenCPicParams picParams; + static CCTabHandle buttonTabHandle; static CCTabHandle checkTabHandle; static CCTabHandle radioTabHandle; @@ -66,13 +85,17 @@ static pascal void UserPaneBackgroundProc(ControlHandle, */ static int UpdateControlColors _ANSI_ARGS_((TkButton *butPtr, - ControlRef controlHandle, CCTabHandle ccTabHandle, - RGBColor *saveColorPtr)); + ControlRef controlHandle, CCTabHandle ccTabHandle, + RGBColor *saveColorPtr)); static void DrawBufferedControl _ANSI_ARGS_((TkButton *butPtr, - GWorldPtr destPort)); + GWorldPtr destPort, GC gc, Pixmap pixmap)); +static void InitSampleControls(); +static void SetupBevelButton _ANSI_ARGS_((TkButton *butPtr, + ControlRef controlHandle, + GWorldPtr destPort, GC gc, Pixmap pixmap)); static void ChangeBackgroundWindowColor _ANSI_ARGS_(( - WindowRef macintoshWindow, RGBColor rgbColor, - RGBColor *oldColor)); + WindowRef macintoshWindow, RGBColor rgbColor, + RGBColor *oldColor)); static void ButtonExitProc _ANSI_ARGS_((ClientData clientData)); /* @@ -143,6 +166,7 @@ TkpDisplayButton( * it is an image button, so we offset the * image to make the button appear to move * up and down as the relief changes. */ + int hasImageOrBitmap; CGrafPtr saveWorld; GDHandle saveDevice; GWorldPtr destPort; @@ -155,6 +179,19 @@ TkpDisplayButton( return; } + /* + * In order to avoid screen flashes, this procedure redraws + * the button in a pixmap, then copies the pixmap to the + * screen in a single operation. This means that there's no + * point in time where the on-sreen image has been cleared. + */ + + pixmap = Tk_GetPixmap(butPtr->display, Tk_WindowId(tkwin), + Tk_Width(tkwin), Tk_Height(tkwin), Tk_Depth(tkwin)); + + hasImageOrBitmap = ((butPtr->image != NULL) || (butPtr->bitmap != None)); + offset = (butPtr->type == TYPE_BUTTON) && hasImageOrBitmap; + border = butPtr->normalBorder; if ((butPtr->state == STATE_DISABLED) && (butPtr->disabledFg != NULL)) { gc = butPtr->disabledGC; @@ -165,6 +202,7 @@ TkpDisplayButton( } else { gc = butPtr->normalTextGC; } + if ((butPtr->flags & SELECTED) && (butPtr->state != STATE_ACTIVE) && (butPtr->selectBorder != NULL) && !butPtr->indicatorOn) { border = butPtr->selectBorder; @@ -173,62 +211,91 @@ TkpDisplayButton( /* * Override the relief specified for the button if this is a * checkbutton or radiobutton and there's no indicator. + * However, don't do this in the presence of Appearance, since + * then the bevel button will take care of the relief. */ relief = butPtr->relief; - if ((butPtr->type >= TYPE_CHECK_BUTTON) && !butPtr->indicatorOn) { - relief = (butPtr->flags & SELECTED) ? TK_RELIEF_SUNKEN + + if ((butPtr->type >= TYPE_CHECK_BUTTON) && !butPtr->indicatorOn) { + if (!TkMacHaveAppearance() || !hasImageOrBitmap) { + relief = (butPtr->flags & SELECTED) ? TK_RELIEF_SUNKEN : TK_RELIEF_RAISED; + } } - offset = ((butPtr->type == TYPE_BUTTON) && - ((butPtr->image != NULL) || (butPtr->bitmap != None))); - - /* - * In order to avoid screen flashes, this procedure redraws - * the button in a pixmap, then copies the pixmap to the - * screen in a single operation. This means that there's no - * point in time where the on-sreen image has been cleared. - */ - - pixmap = Tk_GetPixmap(butPtr->display, Tk_WindowId(tkwin), - Tk_Width(tkwin), Tk_Height(tkwin), Tk_Depth(tkwin)); /* * See the comment in UpdateControlColors as to why we use the * highlightbackground for the border of Macintosh buttons. */ if (butPtr->type == TYPE_BUTTON) { - Tk_Fill3DRectangle(tkwin, pixmap, butPtr->highlightBorder, 0, 0, - Tk_Width(tkwin), Tk_Height(tkwin), 0, TK_RELIEF_FLAT); + Tk_Fill3DRectangle(tkwin, pixmap, butPtr->highlightBorder, 0, 0, + Tk_Width(tkwin), Tk_Height(tkwin), 0, TK_RELIEF_FLAT); } else { - Tk_Fill3DRectangle(tkwin, pixmap, butPtr->normalBorder, 0, 0, - Tk_Width(tkwin), Tk_Height(tkwin), 0, TK_RELIEF_FLAT); + Tk_Fill3DRectangle(tkwin, pixmap, butPtr->normalBorder, 0, 0, + Tk_Width(tkwin), Tk_Height(tkwin), 0, TK_RELIEF_FLAT); } if (butPtr->type == TYPE_LABEL) { drawType = DRAW_LABEL; } else if (butPtr->type == TYPE_BUTTON) { - if ((butPtr->image == None) && (butPtr->bitmap == None)) { + if (!hasImageOrBitmap) { drawType = DRAW_CONTROL; + } else if (butPtr->image != None) { + drawType = DRAW_BEVEL; } else { - drawType = DRAW_CUSTOM; + /* + * TO DO - The current way the we draw bitmaps (XCopyPlane) + * uses CopyDeepMask in this one case. The Picture recording + * does not record this call, and so we can't use the + * Appearance bevel button here. The only case that would + * exercise this is if you use a bitmap, with + * -data & -mask specified. We should probably draw the + * appearance button and overprint the image in this case. + * This just punts and draws the old-style, ugly, button. + */ + + if (gc->clip_mask == 0) { + drawType = DRAW_BEVEL; + } else { + TkpClipMask *clipPtr = (TkpClipMask*) gc->clip_mask; + if ((clipPtr->type == TKP_CLIP_PIXMAP) && + (clipPtr->value.pixmap != butPtr->bitmap)) { + drawType = DRAW_CUSTOM; + } else { + drawType = DRAW_BEVEL; + } + } } } else { if (butPtr->indicatorOn) { drawType = DRAW_CONTROL; + } else if (hasImageOrBitmap) { + if (gc->clip_mask == 0) { + drawType = DRAW_BEVEL; + } else { + TkpClipMask *clipPtr = (TkpClipMask*) gc->clip_mask; + if ((clipPtr->type == TKP_CLIP_PIXMAP) && + (clipPtr->value.pixmap != butPtr->bitmap)) { + drawType = DRAW_CUSTOM; + } else { + drawType = DRAW_BEVEL; + } + } } else { drawType = DRAW_CUSTOM; } } /* - * Draw the native portion of the buttons. Start by creating the control + * Draw the native portion of the buttons. Start by creating the control * if it doesn't already exist. Then configure the Macintosh control from * the Tk info. Finally, we call Draw1Control to draw to the screen. */ - if (drawType == DRAW_CONTROL) { + if ((drawType == DRAW_CONTROL) || + ((drawType == DRAW_BEVEL) && TkMacHaveAppearance())) { borderWidth = 0; /* @@ -238,7 +305,7 @@ TkpDisplayButton( destPort = TkMacGetDrawablePort(pixmap); SetGWorld(destPort, NULL); - DrawBufferedControl(butPtr, destPort); + DrawBufferedControl(butPtr, destPort, gc, pixmap); } if ((drawType == DRAW_CUSTOM) || (drawType == DRAW_LABEL)) { @@ -246,10 +313,14 @@ TkpDisplayButton( } /* - * Display image or bitmap or text for button. + * Display image or bitmap or text for button. This has + * already been done under Appearance with the Bevel + * button types. */ - if (butPtr->image != None) { + if ((drawType == DRAW_BEVEL) && TkMacHaveAppearance()) { + /* Empty Body */ + } else if (butPtr->image != None) { Tk_SizeOfImage(butPtr->image, &width, &height); imageOrBitmap: @@ -298,7 +369,7 @@ TkpDisplayButton( /* * If the button is disabled with a stipple rather than a special - * foreground color, generate the stippled effect. If the widget + * foreground color, generate the stippled effect. If the widget * is selected and we use a different background color when selected, * must temporarily modify the GC. */ @@ -371,28 +442,11 @@ TkpComputeButtonGeometry( int width, height, avgWidth; Tk_FontMetrics fm; - if (butPtr->highlightWidth < 0) { - butPtr->highlightWidth = 0; - } - if ((butPtr->type == TYPE_BUTTON) && (butPtr->image == None) - && (butPtr->bitmap == None)) { - butPtr->inset = 0; - } else if ((butPtr->type != TYPE_LABEL) && butPtr->indicatorOn) { - butPtr->inset = 0; - } else { - butPtr->inset = butPtr->borderWidth; - } /* - * The highlight width corresponds to the default ring on the Macintosh. - * As such, the highlight width is only added if the button is the default - * button. The actual width of the default ring is one less than the - * highlight width as there is also one pixel of spacing. + * First figure out the size of the contents of the button. */ - - if (butPtr->defaultState != DEFAULT_DISABLED) { - butPtr->inset += butPtr->highlightWidth; - } + butPtr->indicatorSpace = 0; if (butPtr->image != NULL) { Tk_SizeOfImage(butPtr->image, &width, &height); @@ -417,7 +471,7 @@ TkpComputeButtonGeometry( } else { Tk_FreeTextLayout(butPtr->textLayout); butPtr->textLayout = Tk_ComputeTextLayout(butPtr->tkfont, - Tcl_GetString(butPtr->textPtr), -1, butPtr->wrapLength, + Tcl_GetString(butPtr->text), -1, butPtr->wrapLength, butPtr->justify, 0, &butPtr->textWidth, &butPtr->textHeight); width = butPtr->textWidth; @@ -441,21 +495,87 @@ TkpComputeButtonGeometry( } /* + * Now figure out the size of the border decorations for the button. + */ + + if (butPtr->highlightWidth < 0) { + butPtr->highlightWidth = 0; + } + + /* + * The width and height calculation for Appearance buttons with images & + * non-Appearance buttons with images is different. In the latter case, + * we add the borderwidth to the inset, since we are going to stamp a + * 3-D border over the image. In the former, we add it to the height, + * directly, since Appearance will draw the border as part of our control. + * * When issuing the geometry request, add extra space for the indicator, * if any, and for the border and padding, plus if this is an image two * extra pixels so the display can be offset by 1 pixel in either * direction for the raised or lowered effect. + * + * The highlight width corresponds to the default ring on the Macintosh. + * As such, the highlight width is only added if the button is the default + * button. The actual width of the default ring is one less than the + * highlight width as there is also one pixel of spacing. + * Appearance buttons with images do not have a highlight ring, because the + * Bevel button type does not support one. */ - if ((butPtr->image == NULL) && (butPtr->bitmap == None)) { + if ((butPtr->image == None) && (butPtr->bitmap == None)) { width += 2*butPtr->padX; height += 2*butPtr->padY; } - if ((butPtr->type == TYPE_BUTTON) && - ((butPtr->image != NULL) || (butPtr->bitmap != None))) { - width += 2; - height += 2; + + if ((butPtr->type == TYPE_BUTTON)) { + if ((butPtr->image == None) && (butPtr->bitmap == None)) { + butPtr->inset = 0; + if (butPtr->defaultState != STATE_DISABLED) { + butPtr->inset += butPtr->highlightWidth; + } + } else if (TkMacHaveAppearance()) { + butPtr->inset = 0; + width += (2 * butPtr->borderWidth + 4); + height += (2 * butPtr->borderWidth + 4); + } else { + butPtr->inset = butPtr->borderWidth; + width += 2; + height += 2; + if (butPtr->defaultState != STATE_DISABLED) { + butPtr->inset += butPtr->highlightWidth; + } + } + } else if ((butPtr->type != TYPE_LABEL)) { + if (butPtr->indicatorOn) { + butPtr->inset = 0; + } else { + /* + * Under Appearance, the Checkbutton or radiobutton with an image + * is represented by a BevelButton with the Sticky defProc... + * So we must set its height in the same way as the Button + * with an image or bitmap. + */ + if (((butPtr->image != None) || (butPtr->bitmap != None)) + && TkMacHaveAppearance()) { + int border; + butPtr->inset = 0; + if ( butPtr->borderWidth <= 2 ) { + border = 6; + } else { + border = 2 * butPtr->borderWidth + 2; + } + width += border; + height += border; + } else { + butPtr->inset = butPtr->borderWidth; + } + } + } else { + butPtr->inset = butPtr->borderWidth; } + + + Tk_GeometryRequest(butPtr->tkwin, (int) (width + butPtr->indicatorSpace + 2*butPtr->inset), (int) (height + 2*butPtr->inset)); Tk_SetInternalBorder(butPtr->tkwin, butPtr->inset); @@ -507,131 +627,33 @@ TkpDestroyButton( static void DrawBufferedControl( TkButton *butPtr, /* Tk button. */ - GWorldPtr destPort) /* Off screen GWorld. */ + GWorldPtr destPort, /* Off screen GWorld. */ + GC gc, /* The GC we are drawing into - needed for + * the bevel button */ + Pixmap pixmap /* The pixmap we are drawing into - needed + for the bevel button */ + ) { ControlRef controlHandle; CCTabHandle ccTabHandle; int windowColorChanged = false; RGBColor saveBackColor; - + int isBevel = 0; + if (windowRef == NULL) { - Rect geometry = {0, 0, 10, 10}; - CWindowPeek windowList; - - /* - * Create a dummy window that we can draw to. We will - * actually replace this window's bitmap with the one - * we want to draw to at a later time. This window and - * the data structures attached to it are only deallocated - * on exit of the application. - */ - - windowRef = NewCWindow(NULL, &geometry, "\pempty", false, - zoomDocProc, (WindowRef) -1, true, 0); - if (windowRef == NULL) { - panic("Can't allocate buffer window."); - } - - /* - * Now add the three standard controls to hidden window. We - * only create one of each and reuse them for every widget in - * Tk. - * Under Appearance, we have to embed the controls in a UserPane - * control, so that we can color the background text in - * radiobuttons and checkbuttons. - */ - - SetPort(windowRef); - - if (TkMacHaveAppearance()) { - - OSErr err; - ControlRef dontCare; - - /* Adding UserPaneBackgroundProcs to the root control does - * not seem to work, so we have to add another UserPane to - * the root control. - */ - - err = CreateRootControl(windowRef, &dontCare); - if (err != noErr) { - panic("Can't create root control in DrawBufferedControl"); - } - - userPaneHandle = NewControl(windowRef, &geometry, "\p", - true, kControlSupportsEmbedding|kControlHasSpecialBackground, - 0, 1, kControlUserPaneProc, (SInt32) 5); - SetUserPaneSetUpSpecialBackgroundProc(userPaneHandle, - UserPaneBackgroundProc); - SetUserPaneDrawProc(userPaneHandle, UserPaneDraw); - - buttonHandle = NewControl(windowRef, &geometry, "\p", - false, 1, 0, 1, kControlPushButtonProc, (SInt32) 6); - EmbedControl(buttonHandle, userPaneHandle); - checkHandle = NewControl(windowRef, &geometry, "\p", - false, 1, 0, 1, kControlCheckBoxProc, (SInt32) 7); - EmbedControl(checkHandle, userPaneHandle); - radioHandle = NewControl(windowRef, &geometry, "\p", - false, 1, 0, 1, kControlRadioButtonProc, (SInt32) 8); - EmbedControl(radioHandle, userPaneHandle); - ((CWindowPeek) windowRef)->visible = true; - } else { - buttonHandle = NewControl(windowRef, &geometry, "\p", - false, 1, 0, 1, pushButProc, (SInt32) 0); - checkHandle = NewControl(windowRef, &geometry, "\p", - false, 1, 0, 1, checkBoxProc, (SInt32) 0); - radioHandle = NewControl(windowRef, &geometry, "\p", - false, 1, 0, 1, radioButProc, (SInt32) 0); - ((CWindowPeek) windowRef)->visible = true; - - buttonTabHandle = (CCTabHandle) NewHandle(sizeof(CtlCTab)); - checkTabHandle = (CCTabHandle) NewHandle(sizeof(CtlCTab)); - radioTabHandle = (CCTabHandle) NewHandle(sizeof(CtlCTab)); - } - - /* - * Remove our window from the window list. This way our - * applications and others will not be confused that this - * window exists - but no one knows about it. - */ - - windowList = (CWindowPeek) LMGetWindowList(); - if (windowList == (CWindowPeek) windowRef) { - LMSetWindowList((WindowRef) windowList->nextWindow); - } else { - while ((windowList != NULL) - && (windowList->nextWindow != (CWindowPeek) windowRef)) { - windowList = windowList->nextWindow; - } - if (windowList != NULL) { - windowList->nextWindow = windowList->nextWindow->nextWindow; - } - } - ((CWindowPeek) windowRef)->nextWindow = NULL; - - /* - * Create an exit handler to clean up this mess if we our - * unloaded etc. We need to remember the windows portPixMap - * so it isn't leaked. - * - * TODO: The ButtonExitProc doesn't currently work and the - * code it includes will crash the Mac on exit from Tk. - - oldPixPtr = ((CWindowPeek) windowRef)->port.portPixMap; - Tcl_CreateExitHandler(ButtonExitProc, (ClientData) NULL); - */ + InitSampleControls(); } /* * Now swap in the passed in GWorld for the portBits of our fake - * window. We also adjust various fields in the WindowRecord to make + * window. We also adjust various fields in the WindowRecord to make * the system think this is a normal window. * Note, we can use DrawControlInCurrentPort under Appearance, so we don't * need to swap pixmaps. */ if (!TkMacHaveAppearance()) { - ((CWindowPeek) windowRef)->port.portPixMap = destPort->portPixMap; + ((CWindowPeek) windowRef)->port.portPixMap = destPort->portPixMap; } ((CWindowPeek) windowRef)->port.portRect = destPort->portRect; @@ -643,30 +665,90 @@ DrawBufferedControl( /* * Set up control in hidden window to match what we need - * to draw in the buffered window. + * to draw in the buffered window. */ - + + isBevel = 0; switch (butPtr->type) { case TYPE_BUTTON: - controlHandle = buttonHandle; - ccTabHandle = buttonTabHandle; + if (TkMacHaveAppearance()) { + if ((butPtr->image == None) && (butPtr->bitmap == None)) { + controlHandle = buttonHandle; + ccTabHandle = buttonTabHandle; + } else { + if (butPtr->borderWidth <= 2) { + controlHandle = smallBevelHandle; + } else if (butPtr->borderWidth == 3) { + controlHandle = medBevelHandle; + } else { + controlHandle = largeBevelHandle; + } + ccTabHandle = buttonTabHandle; + SetupBevelButton(butPtr, controlHandle, destPort, + gc, pixmap); + isBevel = 1; + } + } else { + controlHandle = buttonHandle; + ccTabHandle = buttonTabHandle; + } break; case TYPE_RADIO_BUTTON: - controlHandle = radioHandle; - ccTabHandle = radioTabHandle; + if (TkMacHaveAppearance()) { + if (((butPtr->image == None) && (butPtr->bitmap == None)) + || (butPtr->indicatorOn)) { + controlHandle = radioHandle; + ccTabHandle = radioTabHandle; + } else { + if (butPtr->borderWidth <= 2) { + controlHandle = smallStickyBevelHandle; + } else if (butPtr->borderWidth == 3) { + controlHandle = medStickyBevelHandle; + } else { + controlHandle = largeStickyBevelHandle; + } + ccTabHandle = radioTabHandle; + SetupBevelButton(butPtr, controlHandle, destPort, + gc, pixmap); + isBevel = 1; + } + } else { + controlHandle = radioHandle; + ccTabHandle = radioTabHandle; + } break; case TYPE_CHECK_BUTTON: - controlHandle = checkHandle; - ccTabHandle = checkTabHandle; + if (TkMacHaveAppearance()) { + if (((butPtr->image == None) && (butPtr->bitmap == None)) + || (butPtr->indicatorOn)) { + controlHandle = checkHandle; + ccTabHandle = checkTabHandle; + } else { + if (butPtr->borderWidth <= 2) { + controlHandle = smallStickyBevelHandle; + } else if (butPtr->borderWidth == 3) { + controlHandle = medStickyBevelHandle; + } else { + controlHandle = largeStickyBevelHandle; + } + ccTabHandle = checkTabHandle; + SetupBevelButton(butPtr, controlHandle, destPort, + gc, pixmap); + isBevel = 1; + } + } else { + controlHandle = checkHandle; + ccTabHandle = checkTabHandle; + } break; } (**controlHandle).contrlRect.left = butPtr->inset; (**controlHandle).contrlRect.top = butPtr->inset; (**controlHandle).contrlRect.right = Tk_Width(butPtr->tkwin) - - butPtr->inset; + - butPtr->inset; (**controlHandle).contrlRect.bottom = Tk_Height(butPtr->tkwin) - - butPtr->inset; + - butPtr->inset; /* * Setting the control visibility by hand does not @@ -674,16 +756,16 @@ DrawBufferedControl( */ if (TkMacHaveAppearance()) { - SetControlVisibility(controlHandle, true, false); - (**userPaneHandle).contrlRect.left = 0; - (**userPaneHandle).contrlRect.top = 0; - (**userPaneHandle).contrlRect.right = Tk_Width(butPtr->tkwin); - (**userPaneHandle).contrlRect.bottom = Tk_Height(butPtr->tkwin); - } else { - (**controlHandle).contrlVis = 255; - } + SetControlVisibility(controlHandle, true, false); + (**userPaneHandle).contrlRect.left = 0; + (**userPaneHandle).contrlRect.top = 0; + (**userPaneHandle).contrlRect.right = Tk_Width(butPtr->tkwin); + (**userPaneHandle).contrlRect.bottom = Tk_Height(butPtr->tkwin); + } else { + (**controlHandle).contrlVis = 255; + } - + if (butPtr->flags & SELECTED) { (**controlHandle).contrlValue = 1; @@ -692,16 +774,20 @@ DrawBufferedControl( } if (butPtr->state == STATE_ACTIVE) { - switch (butPtr->type) { - case TYPE_BUTTON: - (**controlHandle).contrlHilite = kControlButtonPart; - break; - case TYPE_RADIO_BUTTON: - (**controlHandle).contrlHilite = kControlRadioButtonPart; - break; - case TYPE_CHECK_BUTTON: - (**controlHandle).contrlHilite = kControlCheckBoxPart; - break; + if (isBevel) { + (**controlHandle).contrlHilite = kControlButtonPart; + } else { + switch (butPtr->type) { + case TYPE_BUTTON: + (**controlHandle).contrlHilite = kControlButtonPart; + break; + case TYPE_RADIO_BUTTON: + (**controlHandle).contrlHilite = kControlRadioButtonPart; + break; + case TYPE_CHECK_BUTTON: + (**controlHandle).contrlHilite = kControlCheckBoxPart; + break; + } } } else if (butPtr->state == STATE_DISABLED) { (**controlHandle).contrlHilite = kControlInactivePart; @@ -729,36 +815,36 @@ DrawBufferedControl( */ if (TkMacHaveAppearance()) { - SetPort((GrafPort *) destPort); + SetPort((GrafPort *) destPort); } else { - SetPort(windowRef); + SetPort(windowRef); } windowColorChanged = UpdateControlColors(butPtr, controlHandle, - ccTabHandle, &saveBackColor); + ccTabHandle, &saveBackColor); if ((butPtr->type == TYPE_BUTTON) && TkMacHaveAppearance()) { - Boolean isDefault; - - if (butPtr->defaultState == DEFAULT_ACTIVE) { + Boolean isDefault; + + if (butPtr->defaultState == STATE_ACTIVE) { isDefault = true; } else { isDefault = false; } SetControlData(controlHandle, kControlNoPart, - kControlPushButtonDefaultTag, - sizeof(isDefault), (Ptr) &isDefault); + kControlPushButtonDefaultTag, + sizeof(isDefault), (Ptr) &isDefault); } if (TkMacHaveAppearance()) { - DrawControlInCurrentPort(userPaneHandle); + DrawControlInCurrentPort(userPaneHandle); } else { - Draw1Control(controlHandle); + Draw1Control(controlHandle); } if (!TkMacHaveAppearance() && - (butPtr->type == TYPE_BUTTON) && - (butPtr->defaultState == DEFAULT_ACTIVE)) { + (butPtr->type == TYPE_BUTTON) && + (butPtr->defaultState == STATE_ACTIVE)) { Rect box = (**controlHandle).contrlRect; RGBColor rgbColor; @@ -780,21 +866,304 @@ DrawBufferedControl( */ if (TkMacHaveAppearance()) { - SetControlVisibility(controlHandle, false, false); - } else { - (**controlHandle).contrlVis = 0; - } + SetControlVisibility(controlHandle, false, false); + if (isBevel) { + KillPicture(bevelButtonContent.u.picture); + } + } else { + (**controlHandle).contrlVis = 0; + } LMSetWindowList((WindowRef) ((CWindowPeek) windowRef)->nextWindow); } /* *-------------------------------------------------------------- * + * InitSampleControls -- + * + * This function initializes a dummy Macintosh window and + * sample controls to allow drawing Mac controls to any GWorld + * (including off-screen bitmaps). + * + * Results: + * None. + * + * Side effects: + * Controls & a window are created. + * + *-------------------------------------------------------------- + */ + +static void +InitSampleControls() +{ + Rect geometry = {0, 0, 10, 10}; + CWindowPeek windowList; + + /* + * Create a dummy window that we can draw to. We will + * actually replace this window's bitmap with the one + * we want to draw to at a later time. This window and + * the data structures attached to it are only deallocated + * on exit of the application. + */ + + windowRef = NewCWindow(NULL, &geometry, "\pempty", false, + zoomDocProc, (WindowRef) -1, true, 0); + if (windowRef == NULL) { + panic("Can't allocate buffer window."); + } + + /* + * Now add the three standard controls to hidden window. We + * only create one of each and reuse them for every widget in + * Tk. + * Under Appearance, we have to embed the controls in a UserPane + * control, so that we can color the background text in + * radiobuttons and checkbuttons. + */ + + SetPort(windowRef); + + if (TkMacHaveAppearance()) { + + OSErr err; + ControlRef dontCare; + + /* Adding UserPaneBackgroundProcs to the root control does + * not seem to work, so we have to add another UserPane to + * the root control. + */ + + err = CreateRootControl(windowRef, &dontCare); + if (err != noErr) { + panic("Can't create root control in DrawBufferedControl"); + } + + userPaneHandle = NewControl(windowRef, &geometry, "\p", + true, kControlSupportsEmbedding|kControlHasSpecialBackground, + 0, 1, kControlUserPaneProc, (SInt32) 0); + SetUserPaneSetUpSpecialBackgroundProc(userPaneHandle, + UserPaneBackgroundProc); + SetUserPaneDrawProc(userPaneHandle, UserPaneDraw); + + buttonHandle = NewControl(windowRef, &geometry, "\p", + false, 1, 0, 1, kControlPushButtonProc, (SInt32) 0); + EmbedControl(buttonHandle, userPaneHandle); + checkHandle = NewControl(windowRef, &geometry, "\p", + false, 1, 0, 1, kControlCheckBoxProc, (SInt32) 0); + EmbedControl(checkHandle, userPaneHandle); + radioHandle = NewControl(windowRef, &geometry, "\p", + false, 1, 0, 1, kControlRadioButtonProc, (SInt32) 0); + EmbedControl(radioHandle, userPaneHandle); + smallBevelHandle = NewControl(windowRef, &geometry, "\p", + false, 0, 0, + kControlBehaviorOffsetContents << 16 + | kControlContentPictHandle, + kControlBevelButtonSmallBevelProc, (SInt32) 0); + EmbedControl(smallBevelHandle, userPaneHandle); + medBevelHandle = NewControl(windowRef, &geometry, "\p", + false, 0, 0, + kControlBehaviorOffsetContents << 16 + | kControlContentPictHandle, + kControlBevelButtonNormalBevelProc, (SInt32) 0); + EmbedControl(medBevelHandle, userPaneHandle); + largeBevelHandle = NewControl(windowRef, &geometry, "\p", + false, 0, 0, + kControlBehaviorOffsetContents << 16 + | kControlContentPictHandle, + kControlBevelButtonLargeBevelProc, (SInt32) 0); + EmbedControl(largeBevelHandle, userPaneHandle); + bevelButtonContent.contentType = kControlContentPictHandle; + smallStickyBevelHandle = NewControl(windowRef, &geometry, "\p", + false, 0, 0, + (kControlBehaviorOffsetContents + | kControlBehaviorSticky) << 16 + | kControlContentPictHandle, + kControlBevelButtonSmallBevelProc, (SInt32) 0); + EmbedControl(smallStickyBevelHandle, userPaneHandle); + medStickyBevelHandle = NewControl(windowRef, &geometry, "\p", + false, 0, 0, + (kControlBehaviorOffsetContents + | kControlBehaviorSticky) << 16 + | kControlContentPictHandle, + kControlBevelButtonNormalBevelProc, (SInt32) 0); + EmbedControl(medStickyBevelHandle, userPaneHandle); + largeStickyBevelHandle = NewControl(windowRef, &geometry, "\p", + false, 0, 0, + (kControlBehaviorOffsetContents + | kControlBehaviorSticky) << 16 + | kControlContentPictHandle, + kControlBevelButtonLargeBevelProc, (SInt32) 0); + EmbedControl(largeStickyBevelHandle, userPaneHandle); + + picParams.version = -2; + picParams.hRes = 0x00480000; + picParams.vRes = 0x00480000; + picParams.srcRect.top = 0; + picParams.srcRect.left = 0; + + ((CWindowPeek) windowRef)->visible = true; + } else { + buttonHandle = NewControl(windowRef, &geometry, "\p", + false, 1, 0, 1, pushButProc, (SInt32) 0); + checkHandle = NewControl(windowRef, &geometry, "\p", + false, 1, 0, 1, checkBoxProc, (SInt32) 0); + radioHandle = NewControl(windowRef, &geometry, "\p", + false, 1, 0, 1, radioButProc, (SInt32) 0); + ((CWindowPeek) windowRef)->visible = true; + + buttonTabHandle = (CCTabHandle) NewHandle(sizeof(CtlCTab)); + checkTabHandle = (CCTabHandle) NewHandle(sizeof(CtlCTab)); + radioTabHandle = (CCTabHandle) NewHandle(sizeof(CtlCTab)); + } + + /* + * Remove our window from the window list. This way our + * applications and others will not be confused that this + * window exists - but no one knows about it. + */ + + windowList = (CWindowPeek) LMGetWindowList(); + if (windowList == (CWindowPeek) windowRef) { + LMSetWindowList((WindowRef) windowList->nextWindow); + } else { + while ((windowList != NULL) + && (windowList->nextWindow != (CWindowPeek) windowRef)) { + windowList = windowList->nextWindow; + } + if (windowList != NULL) { + windowList->nextWindow = windowList->nextWindow->nextWindow; + } + } + ((CWindowPeek) windowRef)->nextWindow = NULL; + + /* + * Create an exit handler to clean up this mess if we our + * unloaded etc. We need to remember the windows portPixMap + * so it isn't leaked. + * + * TODO: The ButtonExitProc doesn't currently work and the + * code it includes will crash the Mac on exit from Tk. + + oldPixPtr = ((CWindowPeek) windowRef)->port.portPixMap; + Tcl_CreateExitHandler(ButtonExitProc, (ClientData) NULL); + */ + +} + +/* + *-------------------------------------------------------------- + * + * SetupBevelButton -- + * + * Sets up the Bevel Button with image by copying the + * source image onto the PicHandle for the button. + * + * Results: + * None + * + * Side effects: + * The image or bitmap for the button is copied over to a picture. + * + *-------------------------------------------------------------- + */ +void +SetupBevelButton( + TkButton *butPtr, /* Tk button. */ + ControlRef controlHandle, /* The control to set this picture to */ + GWorldPtr destPort, /* Off screen GWorld. */ + GC gc, /* The GC we are drawing into - needed for + * the bevel button */ + Pixmap pixmap /* The pixmap we are drawing into - needed + for the bevel button */ + ) +{ + int height, width; + ControlButtonGraphicAlignment theAlignment; + + SetPort((GrafPtr) destPort); + + if (butPtr->image != None) { + Tk_SizeOfImage(butPtr->image, + &width, &height); + } else { + Tk_SizeOfBitmap(butPtr->display, butPtr->bitmap, + &width, &height); + } + + if ((butPtr->width > 0) && (butPtr->width < width)) { + width = butPtr->width; + } + if ((butPtr->height > 0) && (butPtr->height < height)) { + height = butPtr->height; + } + + picParams.srcRect.right = width; + picParams.srcRect.bottom = height; + + bevelButtonContent.u.picture = OpenCPicture(&picParams); + + /* + * TO DO - There is one case where XCopyPlane calls CopyDeepMask, + * which does not get recorded in the picture. So the bitmap code + * will fail in that case. + */ + + if ((butPtr->selectImage != NULL) && (butPtr->flags & SELECTED)) { + Tk_RedrawImage(butPtr->selectImage, 0, 0, width, height, + pixmap, 0, 0); + } else if (butPtr->image != NULL) { + Tk_RedrawImage(butPtr->image, 0, 0, width, + height, pixmap, 0, 0); + } else { + XSetClipOrigin(butPtr->display, gc, 0, 0); + XCopyPlane(butPtr->display, butPtr->bitmap, pixmap, gc, 0, 0, + (unsigned int) width, (unsigned int) height, 0, 0, 1); + } + + ClosePicture(); + + SetControlData(controlHandle, kControlButtonPart, + kControlBevelButtonContentTag, + sizeof(ControlButtonContentInfo), + (char *) &bevelButtonContent); + + if (butPtr->anchor == TK_ANCHOR_N) { + theAlignment = kControlBevelButtonAlignTop; + } else if (butPtr->anchor == TK_ANCHOR_NE) { + theAlignment = kControlBevelButtonAlignTopRight; + } else if (butPtr->anchor == TK_ANCHOR_E) { + theAlignment = kControlBevelButtonAlignRight; + } else if (butPtr->anchor == TK_ANCHOR_SE) { + theAlignment = kControlBevelButtonAlignBottomRight; + } else if (butPtr->anchor == TK_ANCHOR_S) { + theAlignment = kControlBevelButtonAlignBottom; + } else if (butPtr->anchor == TK_ANCHOR_SW) { + theAlignment = kControlBevelButtonAlignBottomLeft; + } else if (butPtr->anchor == TK_ANCHOR_W) { + theAlignment = kControlBevelButtonAlignLeft; + } else if (butPtr->anchor == TK_ANCHOR_NW) { + theAlignment = kControlBevelButtonAlignTopLeft; + } else if (butPtr->anchor == TK_ANCHOR_CENTER) { + theAlignment = kControlBevelButtonAlignCenter; + } + + SetControlData(controlHandle, kControlButtonPart, + kControlBevelButtonGraphicAlignTag, + sizeof(ControlButtonGraphicAlignment), + (char *) &theAlignment); + +} + +/* + *-------------------------------------------------------------- + * * SetUserPaneDrawProc -- * * Utility function to add a UserPaneDrawProc - * to a userPane control. From MoreControls code - * from Apple DTS. + * to a userPane control. From MoreControls code + * from Apple DTS. * * Results: * MacOS system error. @@ -805,15 +1174,15 @@ DrawBufferedControl( *-------------------------------------------------------------- */ pascal OSErr SetUserPaneDrawProc ( - ControlRef control, - ControlUserPaneDrawProcPtr upp) + ControlRef control, + ControlUserPaneDrawProcPtr upp) { ControlUserPaneDrawUPP myControlUserPaneDrawUPP; myControlUserPaneDrawUPP = NewControlUserPaneDrawProc(upp); return SetControlData (control, - kControlNoPart, kControlUserPaneDrawProcTag, - sizeof(myControlUserPaneDrawUPP), - (Ptr) &myControlUserPaneDrawUPP); + kControlNoPart, kControlUserPaneDrawProcTag, + sizeof(myControlUserPaneDrawUPP), + (Ptr) &myControlUserPaneDrawUPP); } /* @@ -822,7 +1191,7 @@ pascal OSErr SetUserPaneDrawProc ( * SetUserPaneSetUpSpecialBackgroundProc -- * * Utility function to add a UserPaneBackgroundProc - * to a userPane control + * to a userPane control * * Results: * MacOS system error. @@ -840,9 +1209,9 @@ SetUserPaneSetUpSpecialBackgroundProc( ControlUserPaneBackgroundUPP myControlUserPaneBackgroundUPP; myControlUserPaneBackgroundUPP = NewControlUserPaneBackgroundProc(upp); return SetControlData (control, kControlNoPart, - kControlUserPaneBackgroundProcTag, - sizeof(myControlUserPaneBackgroundUPP), - (Ptr) &myControlUserPaneBackgroundUPP); + kControlUserPaneBackgroundProcTag, + sizeof(myControlUserPaneBackgroundUPP), + (Ptr) &myControlUserPaneBackgroundUPP); } /* @@ -851,7 +1220,7 @@ SetUserPaneSetUpSpecialBackgroundProc( * UserPaneDraw -- * * This function draws the background of the user pane that will - * lie under checkboxes and radiobuttons. + * lie under checkboxes and radiobuttons. * * Results: * None. @@ -866,9 +1235,9 @@ UserPaneDraw( ControlRef control, ControlPartCode cpc) { - Rect contrlRect = (**control).contrlRect; - RGBBackColor (&gUserPaneBackground); - EraseRect (&contrlRect); + Rect contrlRect = (**control).contrlRect; + RGBBackColor (&gUserPaneBackground); + EraseRect (&contrlRect); } /* @@ -877,7 +1246,7 @@ UserPaneDraw( * UserPaneBackgroundProc -- * * This function sets up the background of the user pane that will - * lie under checkboxes and radiobuttons. + * lie under checkboxes and radiobuttons. * * Results: * None. @@ -894,7 +1263,7 @@ UserPaneBackgroundProc( ControlBackgroundPtr info) { if (info->colorDevice) { - RGBBackColor (&gUserPaneBackground); + RGBBackColor (&gUserPaneBackground); } } @@ -908,8 +1277,8 @@ UserPaneBackgroundProc( * used we create a custom palette for the button, populate * with the colors for the button and install the palette. * - * Under Appearance, we just set the pointer that will be - * used by the UserPaneDrawProc. + * Under Appearance, we just set the pointer that will be + * used by the UserPaneDrawProc. * * Results: * None. @@ -932,7 +1301,7 @@ UpdateControlColors( /* * Under Appearance we cannot change the background of the * button itself. However, the color we are setting is the color - * of the containing userPane. This will be the color that peeks + * of the containing userPane. This will be the color that peeks * around the rounded corners of the button. * We make this the highlightbackground rather than the background, * because if you color the background of a frame containing a @@ -941,38 +1310,39 @@ UpdateControlColors( */ if (TkMacHaveAppearance() && (butPtr->type == TYPE_BUTTON)) { - xcolor = Tk_3DBorderColor(butPtr->highlightBorder); + xcolor = Tk_3DBorderColor(butPtr->highlightBorder); } else { - xcolor = Tk_3DBorderColor(butPtr->normalBorder); + xcolor = Tk_3DBorderColor(butPtr->normalBorder); } if (TkMacHaveAppearance()) { - TkSetMacColor(xcolor->pixel, &gUserPaneBackground); - } else { - (**ccTabHandle).ccSeed = 0; - (**ccTabHandle).ccRider = 0; - (**ccTabHandle).ctSize = 3; - (**ccTabHandle).ctTable[0].value = cBodyColor; - TkSetMacColor(xcolor->pixel, - &(**ccTabHandle).ctTable[0].rgb); - (**ccTabHandle).ctTable[1].value = cTextColor; - TkSetMacColor(butPtr->normalFg->pixel, - &(**ccTabHandle).ctTable[1].rgb); - (**ccTabHandle).ctTable[2].value = cFrameColor; - TkSetMacColor(butPtr->highlightColorPtr->pixel, - &(**ccTabHandle).ctTable[2].rgb); - SetControlColor(controlHandle, ccTabHandle); - if (((xcolor->pixel >> 24) != CONTROL_BODY_PIXEL) && - ((butPtr->type == TYPE_CHECK_BUTTON) || - (butPtr->type == TYPE_RADIO_BUTTON))) { - RGBColor newColor; + TkSetMacColor(xcolor->pixel, &gUserPaneBackground); + } else { + (**ccTabHandle).ccSeed = 0; + (**ccTabHandle).ccRider = 0; + (**ccTabHandle).ctSize = 3; + (**ccTabHandle).ctTable[0].value = cBodyColor; + TkSetMacColor(xcolor->pixel, + &(**ccTabHandle).ctTable[0].rgb); + (**ccTabHandle).ctTable[1].value = cTextColor; + TkSetMacColor(butPtr->normalFg->pixel, + &(**ccTabHandle).ctTable[1].rgb); + (**ccTabHandle).ctTable[2].value = cFrameColor; + TkSetMacColor(butPtr->highlightColorPtr->pixel, + &(**ccTabHandle).ctTable[2].rgb); + SetControlColor(controlHandle, ccTabHandle); + + if (((xcolor->pixel >> 24) != CONTROL_BODY_PIXEL) && + ((butPtr->type == TYPE_CHECK_BUTTON) || + (butPtr->type == TYPE_RADIO_BUTTON))) { + RGBColor newColor; TkSetMacColor(xcolor->pixel, &newColor); ChangeBackgroundWindowColor((**controlHandle).contrlOwner, newColor, saveColorPtr); - return true; + return true; } } - + return false; } @@ -983,7 +1353,7 @@ UpdateControlColors( * * This procedure will change the background color entry * in the Window's colortable. The system isn't notified - * of the change. This call should only be used to fool + * of the change. This call should only be used to fool * the drawing routines for checkboxes and radiobuttons. * Any change should be temporary and be reverted after * the widget is drawn. @@ -1057,7 +1427,7 @@ ButtonExitProc(clientData) /* * Restore our dummy window to it's origional state by putting it - * back in the window list and restoring it's bits. The destroy + * back in the window list and restoring it's bits. The destroy * the controls and window. */ diff --git a/mac/tkMacClipboard.c b/mac/tkMacClipboard.c index 1ae497c..e681125 100644 --- a/mac/tkMacClipboard.c +++ b/mac/tkMacClipboard.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacClipboard.c 1.19 97/11/07 21:21:42 + * RCS: @(#) $Id: tkMacClipboard.c,v 1.1.4.2 1998/09/30 02:18:03 stanton Exp $ */ #include "tkInt.h" diff --git a/mac/tkMacColor.c b/mac/tkMacColor.c index 56fe38d..35fc4ab 100644 --- a/mac/tkMacColor.c +++ b/mac/tkMacColor.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. * - * SCCS: @(#) tkMacColor.c 1.36 96/11/25 11:02:12 + * RCS: @(#) $Id: tkMacColor.c,v 1.1.4.1 1998/09/30 02:18:03 stanton Exp $ */ #include <tkColor.h> diff --git a/mac/tkMacConfig.c b/mac/tkMacConfig.c index 83da6cf..59bb91a 100644 --- a/mac/tkMacConfig.c +++ b/mac/tkMacConfig.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacConfig.c 1.3 97/10/08 10:07:55 + * RCS: @(#) $Id: tkMacConfig.c,v 1.1.2.2 1998/09/30 02:18:04 stanton Exp $ */ #include "tk.h" diff --git a/mac/tkMacCursor.c b/mac/tkMacCursor.c index 3f34434..6a2b228 100644 --- a/mac/tkMacCursor.c +++ b/mac/tkMacCursor.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacCursor.c 1.24 98/01/22 17:00:29 + * RCS: @(#) $Id: tkMacCursor.c,v 1.1.4.2 1998/09/30 02:18:04 stanton Exp $ */ #include "tkPort.h" diff --git a/mac/tkMacCursors.r b/mac/tkMacCursors.r index 44ad02e..016eba4 100644 --- a/mac/tkMacCursors.r +++ b/mac/tkMacCursors.r @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacCursors.r 1.3 96/01/25 10:24:15 + * RCS: @(#) $Id: tkMacCursors.r,v 1.1.4.1 1998/09/30 02:18:04 stanton Exp $ */ /* diff --git a/mac/tkMacDefault.h b/mac/tkMacDefault.h index da574fd..29fc14c 100644 --- a/mac/tkMacDefault.h +++ b/mac/tkMacDefault.h @@ -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. * - * SCCS: @(#) tkMacDefault.h 1.49 98/01/08 13:18:41 + * RCS: @(#) $Id: tkMacDefault.h,v 1.1.4.2 1998/09/30 02:18:05 stanton Exp $ */ #ifndef _TKMACDEFAULT diff --git a/mac/tkMacDialog.c b/mac/tkMacDialog.c index e1031d9..6f40831 100644 --- a/mac/tkMacDialog.c +++ b/mac/tkMacDialog.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacDialog.c 1.20 97/11/07 21:23:36 + * RCS: @(#) $Id: tkMacDialog.c,v 1.1.4.2 1998/09/30 02:18:05 stanton Exp $ */ #include <Gestalt.h> diff --git a/mac/tkMacDraw.c b/mac/tkMacDraw.c index 9624041..5935d12 100644 --- a/mac/tkMacDraw.c +++ b/mac/tkMacDraw.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. * - * SCCS: @(#) tkMacDraw.c 1.55 97/11/20 18:28:56 + * RCS: @(#) $Id: tkMacDraw.c,v 1.1.4.1 1998/09/30 02:18:06 stanton Exp $ */ #include "tkInt.h" diff --git a/mac/tkMacEmbed.c b/mac/tkMacEmbed.c index 21e4803..58c6716 100644 --- a/mac/tkMacEmbed.c +++ b/mac/tkMacEmbed.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. * - * SCCS: @(#) tkMacEmbed.c 1.8 97/12/03 18:56:10 + * RCS: @(#) $Id: tkMacEmbed.c,v 1.1.4.2 1998/09/30 02:18:06 stanton Exp $ */ #include "tkInt.h" diff --git a/mac/tkMacFont.c b/mac/tkMacFont.c index 616034e..4cd088b 100644 --- a/mac/tkMacFont.c +++ b/mac/tkMacFont.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. * - * SCCS: @(#) tkMacFont.c 1.54 97/11/26 10:51:12 + * RCS: @(#) $Id: tkMacFont.c,v 1.1.4.2 1998/09/30 02:18:07 stanton Exp $ */ #include <Windows.h> diff --git a/mac/tkMacHLEvents.c b/mac/tkMacHLEvents.c index bbf56fb..e767cba 100644 --- a/mac/tkMacHLEvents.c +++ b/mac/tkMacHLEvents.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacHLEvents.c 1.22 97/11/07 21:20:50 + * RCS: @(#) $Id: tkMacHLEvents.c,v 1.1.4.2 1998/09/30 02:18:08 stanton Exp $ */ #include "tcl.h" diff --git a/mac/tkMacInit.c b/mac/tkMacInit.c index 11f730a..f14941d 100644 --- a/mac/tkMacInit.c +++ b/mac/tkMacInit.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacInit.c 1.30 96/12/17 15:20:16 + * RCS: @(#) $Id: tkMacInit.c,v 1.1.4.2 1998/09/30 02:18:08 stanton Exp $ */ #include <Resources.h> diff --git a/mac/tkMacInt.h b/mac/tkMacInt.h index 7cbb21e..c4e305e 100644 --- a/mac/tkMacInt.h +++ b/mac/tkMacInt.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS:@(#) tkMacInt.h 1.69 98/02/18 10:50:53 + * RCS: @(#) $Id: tkMacInt.h,v 1.1.4.2 1998/09/30 02:18:09 stanton Exp $ */ #ifndef _TKMACINT diff --git a/mac/tkMacKeyboard.c b/mac/tkMacKeyboard.c index 3c10b58..0122504 100644 --- a/mac/tkMacKeyboard.c +++ b/mac/tkMacKeyboard.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacKeyboard.c 1.16 98/01/16 10:42:35 + * RCS: @(#) $Id: tkMacKeyboard.c,v 1.1.4.2 1998/09/30 02:18:09 stanton Exp $ */ #include "tkInt.h" diff --git a/mac/tkMacLibrary.r b/mac/tkMacLibrary.r index 1d9c041..1b2cfe8 100644 --- a/mac/tkMacLibrary.r +++ b/mac/tkMacLibrary.r @@ -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. * - * SCCS: @(#) tkMacLibrary.r 1.10 98/02/10 10:37:21 + * RCS: @(#) $Id: tkMacLibrary.r,v 1.1.4.2 1998/09/30 02:18:10 stanton Exp $ */ /* diff --git a/mac/tkMacMDEF.c b/mac/tkMacMDEF.c index f7ce485..29371c1 100644 --- a/mac/tkMacMDEF.c +++ b/mac/tkMacMDEF.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacMDEF.c 1.5 97/07/11 %V% + * RCS: @(#) $Id: tkMacMDEF.c,v 1.1.4.1 1998/09/30 02:18:10 stanton Exp $ */ #define MAC_TCL diff --git a/mac/tkMacMDEF.r b/mac/tkMacMDEF.r index 5c18104..c84c5dd 100644 --- a/mac/tkMacMDEF.r +++ b/mac/tkMacMDEF.r @@ -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. * - * SCCS: @(#) tkMacMDEF.r 1.6 97/07/11 18:09:47 + * RCS: @(#) $Id: tkMacMDEF.r,v 1.1.4.1 1998/09/30 02:18:10 stanton Exp $ */ #include <Types.r> diff --git a/mac/tkMacMenu.c b/mac/tkMacMenu.c index a44636c..54aa33d 100644 --- a/mac/tkMacMenu.c +++ b/mac/tkMacMenu.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacMenu.c 1.111 98/01/21 22:04:59 + * RCS: @(#) $Id: tkMacMenu.c,v 1.1.4.2 1998/09/30 02:18:11 stanton Exp $ */ #include <Menus.h> @@ -510,9 +510,8 @@ TkpNewMenu( macMenuHdl = NewMenu(menuID, itemText); #ifdef GENERATINGCFM { - Handle mdefProc = GetResource('MDEF', 591); - Handle sicnHandle = GetResource('SICN', SICN_RESOURCE_NUMBER); - if ((mdefProc != NULL) && (sicnHandle != NULL)) { + Handle mdefProc = FixMDEF(); + if ((mdefProc != NULL)) { (*macMenuHdl)->menuProc = mdefProc; } } @@ -4067,8 +4066,8 @@ TkMacClearMenubarActive(void) { if ((menuBarRefPtr != NULL) && (menuBarRefPtr->menuPtr != NULL)) { TkMenu *menuPtr; - for (menuPtr = menuBarRefPtr->menuPtr->masterMenuPtr; - menuPtr != NULL; + for (menuPtr = menuBarRefPtr->menuPtr->masterMenuPtr; + menuPtr != NULL; menuPtr = menuPtr->nextInstancePtr) { if (menuPtr->menuType == MENUBAR) { RecursivelyClearActiveMenu(menuPtr); @@ -4126,29 +4125,33 @@ TkpMenuNotifyToplevelCreate( * figure it out. * * Results: - * None. + * Returns the MDEF handle. * * Side effects: - * Allcates a hash table. + * The MDEF is read in and massaged. * *---------------------------------------------------------------------- */ -static void +static Handle FixMDEF(void) { #ifdef GENERATINGCFM Handle MDEFHandle = GetResource('MDEF', 591); Handle SICNHandle = GetResource('SICN', SICN_RESOURCE_NUMBER); if ((MDEFHandle != NULL) && (SICNHandle != NULL)) { - MoveHHi(MDEFHandle); - HLock(MDEFHandle); - if ( menuDefProc == NULL) { - menuDefProc = TkNewMenuDefProc(MenuDefProc); + HLock(MDEFHandle); + HLock(SICNHandle); + if (menuDefProc == NULL) { + menuDefProc = TkNewMenuDefProc(MenuDefProc); } memmove((void *) (((long) (*MDEFHandle)) + 0x24), &menuDefProc, 4); + return MDEFHandle; + } else { + return NULL; } - +#else + return NULL; #endif } diff --git a/mac/tkMacMenu.r b/mac/tkMacMenu.r index 9952cea..904295a 100644 --- a/mac/tkMacMenu.r +++ b/mac/tkMacMenu.r @@ -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. * - * SCCS: @(#) tkMacMenu.r 1.1 97/07/11 18:06:27 + * RCS: @(#) $Id: tkMacMenu.r,v 1.1.4.1 1998/09/30 02:18:12 stanton Exp $ */ #include <Types.r> @@ -20,7 +20,7 @@ * Icons used in menu items. */ -resource 'SICN' (128, preload) { +resource 'SICN' (128, preload, locked) { { /* array: 7 elements */ /* [1] */ $"0000 0000 8000 C000 E000 F000 F800 FC00" diff --git a/mac/tkMacMenubutton.c b/mac/tkMacMenubutton.c index 42b8d2b..5eba33e 100644 --- a/mac/tkMacMenubutton.c +++ b/mac/tkMacMenubutton.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacMenubutton.c 1.4 97/01/03 13:55:19 + * RCS: @(#) $Id: tkMacMenubutton.c,v 1.1.4.1 1998/09/30 02:18:12 stanton Exp $ */ #include "tkMenubutton.h" diff --git a/mac/tkMacMenus.c b/mac/tkMacMenus.c index 6eaf0ae..ce885b8 100644 --- a/mac/tkMacMenus.c +++ b/mac/tkMacMenus.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacMenus.c 1.38 97/10/31 17:37:03 + * RCS: @(#) $Id: tkMacMenus.c,v 1.1.4.1 1998/09/30 02:18:13 stanton Exp $ */ #include "tcl.h" diff --git a/mac/tkMacPort.h b/mac/tkMacPort.h index e05b7ba..beb6979 100644 --- a/mac/tkMacPort.h +++ b/mac/tkMacPort.h @@ -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. * - * SCCS: @(#) tkMacPort.h 1.53 98/01/08 14:59:32 + * RCS: @(#) $Id: tkMacPort.h,v 1.1.4.2 1998/09/30 02:18:13 stanton Exp $ */ #ifndef _TKMACPORT diff --git a/mac/tkMacRegion.c b/mac/tkMacRegion.c index 534624c..25e2e88 100644 --- a/mac/tkMacRegion.c +++ b/mac/tkMacRegion.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacRegion.c 1.9 96/12/03 11:46:50 + * RCS: @(#) $Id: tkMacRegion.c,v 1.1.4.1 1998/09/30 02:18:14 stanton Exp $ */ #include "tkInt.h" diff --git a/mac/tkMacResource.r b/mac/tkMacResource.r index 76bd528..b5c2220 100644 --- a/mac/tkMacResource.r +++ b/mac/tkMacResource.r @@ -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. * - * SCCS: @(#) tkMacResource.r 1.38 98/02/10 10:38:07 + * RCS: @(#) $Id: tkMacResource.r,v 1.1.4.2 1998/09/30 02:18:14 stanton Exp $ */ /* @@ -93,7 +93,6 @@ read 'TEXT' (24, "Console", purgeable, preload) "::library:console.tcl"; read 'TEXT' (25, "msgbox", purgeable, preload) "::library:msgbox.tcl"; read 'TEXT' (26, "comdlg", purgeable, preload) "::library:comdlg.tcl"; - /* * The following resource is used when creating the 'env' variable in * the Macintosh environment. The creation mechanisim looks for the diff --git a/mac/tkMacScale.c b/mac/tkMacScale.c index 292a064..b0ec4f5 100644 --- a/mac/tkMacScale.c +++ b/mac/tkMacScale.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacScale.c 1.3 96/10/17 13:16:18 + * RCS: @(#) $Id: tkMacScale.c,v 1.1.4.1 1998/09/30 02:18:15 stanton Exp $ */ #include "tkScale.h" diff --git a/mac/tkMacScrlbr.c b/mac/tkMacScrlbr.c index c76daec..cc54900 100644 --- a/mac/tkMacScrlbr.c +++ b/mac/tkMacScrlbr.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. * - * SCCS: @(#) tkMacScrlbr.c 1.9 96/12/10 20:04:39 + * RCS: @(#) $Id: tkMacScrlbr.c,v 1.1.4.1 1998/09/30 02:18:15 stanton Exp $ */ #include "tkScrollbar.h" diff --git a/mac/tkMacSend.c b/mac/tkMacSend.c index dc4e8fd..05b5052 100644 --- a/mac/tkMacSend.c +++ b/mac/tkMacSend.c @@ -31,7 +31,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacSend.c 1.9 98/02/18 11:01:26 + * RCS: @(#) $Id: tkMacSend.c,v 1.1.4.2 1998/09/30 02:18:16 stanton Exp $ */ #include <Gestalt.h> diff --git a/mac/tkMacShLib.exp b/mac/tkMacShLib.exp index 04e397a..e6b4aa5 100644 --- a/mac/tkMacShLib.exp +++ b/mac/tkMacShLib.exp @@ -544,7 +544,7 @@ XChangeWindowAttributes XConfigureWindow XCopyArea XCopyPlane -XCreateBitmapFromData +TkCreateBitmapFromData XCreateColormap XCreateGC XCreateImage @@ -583,7 +583,7 @@ XMoveWindow XParseColor XQueryPointer XRaiseWindow -XReadBitmapFile +TkReadBitmapFile XRefreshKeyboardMapping XResizeWindow XRootWindow diff --git a/mac/tkMacSubwindows.c b/mac/tkMacSubwindows.c index 562a977..62cc561 100644 --- a/mac/tkMacSubwindows.c +++ b/mac/tkMacSubwindows.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacSubwindows.c 1.84 98/02/19 14:56:28 + * RCS: @(#) $Id: tkMacSubwindows.c,v 1.1.4.2 1998/09/30 02:18:17 stanton Exp $ */ #include "tkInt.h" @@ -27,7 +27,7 @@ static RgnHandle tmpRgn = NULL; static void UpdateOffsets _ANSI_ARGS_((TkWindow *winPtr, int deltaX, int deltaY)); -void MacMoveWindow _ANSI_ARGS_((WindowRef window, int x, int y)); +void tkMacMoveWindow _ANSI_ARGS_((WindowRef window, int x, int y)); /* *---------------------------------------------------------------------- @@ -405,7 +405,7 @@ XMoveResizeWindow( SizeWindow((WindowRef) destPort, (short) width, (short) height, false); - MacMoveWindow((WindowRef) destPort, x, y); + tkMacMoveWindow((WindowRef) destPort, x, y); /* TODO: is the following right? */ TkMacInvalidateWindow(macWin, TK_WINDOW_ONLY); @@ -507,7 +507,7 @@ XMoveWindow( * region. It is currently assumed that Tk will need * to completely redraw anway. */ - MacMoveWindow((WindowRef) destPort, x, y); + tkMacMoveWindow((WindowRef) destPort, x, y); /* TODO: is the following right? */ TkMacInvalidateWindow(macWin, TK_WINDOW_ONLY); @@ -931,24 +931,21 @@ TkMacGetDrawablePort( if (contWinPtr != NULL) { resultPort = TkMacGetDrawablePort( - (Drawable) contWinPtr->privatePtr); + (Drawable) contWinPtr->privatePtr); } else if (gMacEmbedHandler != NULL) { resultPort = gMacEmbedHandler->getPortProc( (Tk_Window) macWin->winPtr); - if (resultPort == NULL) { - panic("Embed Handler couldn't find port"); - return NULL; - } - } else { - panic("TkMacGetDrawablePort couldn't find container"); - return NULL; + } + + if (resultPort == NULL) { + panic("TkMacGetDrawablePort couldn't find container"); + return NULL; + } - /* - * NOTE: Here we should handle out of process embedding. - */ + /* + * NOTE: Here we should handle out of process embedding. + */ - } - } return resultPort; } @@ -1054,7 +1051,7 @@ TkMacWinBounds( /* *---------------------------------------------------------------------- * - * MacMoveWindow -- + * tkMacMoveWindow -- * * A replacement for the Macintosh MoveWindow function. This * function adjusts the inputs to MoveWindow to offset the root of @@ -1071,7 +1068,7 @@ TkMacWinBounds( */ void -MacMoveWindow( +tkMacMoveWindow( WindowRef window, int x, int y) diff --git a/mac/tkMacTest.c b/mac/tkMacTest.c index b1b9db0..2717a8f 100644 --- a/mac/tkMacTest.c +++ b/mac/tkMacTest.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacTest.c 1.3 97/09/23 16:25:54 + * RCS: @(#) $Id: tkMacTest.c,v 1.1.4.2 1998/09/30 02:18:17 stanton Exp $ */ #include <Types.h> diff --git a/mac/tkMacWindowMgr.c b/mac/tkMacWindowMgr.c index e04abd6..bc6d497 100644 --- a/mac/tkMacWindowMgr.c +++ b/mac/tkMacWindowMgr.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkMacWindowMgr.c 1.62 98/01/16 10:42:51 + * RCS: @(#) $Id: tkMacWindowMgr.c,v 1.1.4.2 1998/09/30 02:18:18 stanton Exp $ */ #include <Events.h> diff --git a/mac/tkMacWm.c b/mac/tkMacWm.c index 4cd7920..7435fe2 100644 --- a/mac/tkMacWm.c +++ b/mac/tkMacWm.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. * - * SCCS: @(#) tkMacWm.c 1.77 98/02/18 11:03:54 + * RCS: @(#) $Id: tkMacWm.c,v 1.1.4.2 1998/09/30 02:18:18 stanton Exp $ */ #include <Gestalt.h> @@ -306,7 +306,7 @@ static Tk_GeomMgr wmMgrType = { static Tcl_HashTable windowTable; static int windowHashInit = false; -void MacMoveWindow(WindowRef window, int x, int y); +void tkMacMoveWindow(WindowRef window, int x, int y); /* * Forward declarations for procedures defined in this file: @@ -3941,7 +3941,7 @@ TkMacMakeRealWindowExist( tkMacWindowListPtr = listPtr; macWin->portPtr = (GWorldPtr) newWindow; - MacMoveWindow(newWindow, (int) geometry.left, (int) geometry.top); + tkMacMoveWindow(newWindow, (int) geometry.left, (int) geometry.top); SetPort((GrafPtr) newWindow); if (!windowHashInit) { diff --git a/mac/tkMacXCursors.r b/mac/tkMacXCursors.r index 29ddc3e..4982988 100644 --- a/mac/tkMacXCursors.r +++ b/mac/tkMacXCursors.r @@ -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. * - * SCCS: @(#) tkMacXCursors.r 1.4 96/01/11 13:18:22 + * RCS: @(#) $Id: tkMacXCursors.r,v 1.1.4.1 1998/09/30 02:18:20 stanton Exp $ */ /* diff --git a/mac/tkMacXStubs.c b/mac/tkMacXStubs.c index 4f52e41..a6180fb 100644 --- a/mac/tkMacXStubs.c +++ b/mac/tkMacXStubs.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. * - * SCCS: @(#) tkMacXStubs.c 1.89 97/11/26 13:10:52 + * RCS: @(#) $Id: tkMacXStubs.c,v 1.1.4.2 1998/09/30 02:18:20 stanton Exp $ */ #include "tkInt.h" diff --git a/tests/README b/tests/README index 2ae2a44..5aaea27 100644 --- a/tests/README +++ b/tests/README @@ -1,7 +1,7 @@ Tk Test Suite -------------- -SCCS: @(#) README 1.2 96/03/27 08:52:21 +RCS: @(#) $Id: README,v 1.1.4.1 1998/09/30 02:18:21 stanton Exp $ This directory contains a set of validation tests for Tk. Each of the files whose name ends in ".test" is intended to @@ -2,7 +2,7 @@ # tests. Execute it by invoking "source all" when running tclTest # in this directory. # -# SCCS: @(#) all 1.28 97/12/23 15:00:50 +# RCS: @(#) $Id: all,v 1.1.4.2 1998/09/30 02:18:21 stanton Exp $ # These tests are not done because they cause the new configuration package # to crash. diff --git a/tests/arc.tcl b/tests/arc.tcl index 62ea96d..0ed570d 100644 --- a/tests/arc.tcl +++ b/tests/arc.tcl @@ -1,7 +1,7 @@ # This file creates a visual test for arcs. It is part of the Tk # visual test suite, which is invoked via the "visual" script. # -# SCCS: @(#) arc.tcl 1.5 96/02/16 10:55:40 +# RCS: @(#) $Id: arc.tcl,v 1.1.4.1 1998/09/30 02:18:22 stanton Exp $ catch {destroy .t} toplevel .t diff --git a/tests/bell.test b/tests/bell.test index 97d015e..1bf62c6 100644 --- a/tests/bell.test +++ b/tests/bell.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) bell.test 1.5 96/04/09 23:47:12 +# RCS: @(#) $Id: bell.test,v 1.1.4.1 1998/09/30 02:18:22 stanton Exp $ if {[string compare test [info procs test]] == 1} { source defs diff --git a/tests/bevel.tcl b/tests/bevel.tcl index 60c913a..2123927 100644 --- a/tests/bevel.tcl +++ b/tests/bevel.tcl @@ -2,7 +2,7 @@ # widgets. It is part of the Tk visual test suite, which is invoked # via the "visual" script. # -# SCCS: @(#) bevel.tcl 1.4 96/06/24 16:48:14 +# RCS: @(#) $Id: bevel.tcl,v 1.1.4.1 1998/09/30 02:18:23 stanton Exp $ catch {destroy .t} toplevel .t diff --git a/tests/bgerror.test b/tests/bgerror.test index 72b5400..c99f216 100644 --- a/tests/bgerror.test +++ b/tests/bgerror.test @@ -6,7 +6,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) bgerror.test 1.1 97/08/06 09:28:30 +# RCS: @(#) $Id: bgerror.test,v 1.1.4.1 1998/09/30 02:18:23 stanton Exp $ if {[info commands test] == ""} { source defs diff --git a/tests/bind.test b/tests/bind.test index 5faaedf..74a0877 100644 --- a/tests/bind.test +++ b/tests/bind.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) bind.test 1.43 98/01/13 17:20:56 +# RCS: @(#) $Id: bind.test,v 1.1.4.2 1998/09/30 02:18:24 stanton Exp $ if {[string compare test [info procs test]] != 0} { source defs @@ -216,6 +216,12 @@ test bind-5.1 {Tk_CreateBindingTable procedure} { } {} +if {[string compare testcbind [info commands testcbind]] != 0} { + puts "This application hasn't been compiled with the testcbind command," + puts "therefore I am skipping all of these tests." + return +} + test bind-6.1 {Tk_DeleteBindTable procedure} { catch {destroy .b.c} canvas .b.c diff --git a/tests/bitmap.test b/tests/bitmap.test index 9fa98a3..6975f86 100644 --- a/tests/bitmap.test +++ b/tests/bitmap.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) bitmap.test 1.1 97/12/24 15:17:34 +# RCS: @(#) $Id: bitmap.test,v 1.1.2.2 1998/09/30 02:18:24 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/border.test b/tests/border.test index d990ae0..835a807 100644 --- a/tests/border.test +++ b/tests/border.test @@ -6,7 +6,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) border.test 1.2 97/12/24 16:17:03 +# RCS: @(#) $Id: border.test,v 1.1.2.2 1998/09/30 02:18:25 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/bugs.tcl b/tests/bugs.tcl index 1f4e5b7..78a8c12 100644 --- a/tests/bugs.tcl +++ b/tests/bugs.tcl @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) bugs.tcl 1.1 96/07/25 15:49:45 +# RCS: @(#) $Id: bugs.tcl,v 1.1.4.1 1998/09/30 02:18:25 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/butGeom.tcl b/tests/butGeom.tcl index 352712b..17b0598 100644 --- a/tests/butGeom.tcl +++ b/tests/butGeom.tcl @@ -1,7 +1,7 @@ # This file creates a visual test for button layout. It is part of # the Tk visual test suite, which is invoked via the "visual" script. # -# SCCS: @(#) butGeom.tcl 1.3 97/06/13 13:46:57 +# RCS: @(#) $Id: butGeom.tcl,v 1.1.4.1 1998/09/30 02:18:26 stanton Exp $ catch {destroy .t} toplevel .t diff --git a/tests/butGeom2.tcl b/tests/butGeom2.tcl index f1293a0..23af827 100644 --- a/tests/butGeom2.tcl +++ b/tests/butGeom2.tcl @@ -1,7 +1,7 @@ # This file creates a visual test for button layout. It is part of # the Tk visual test suite, which is invoked via the "visual" script. # -# SCCS: @(#) butGeom2.tcl 1.3 97/06/13 17:00:32 +# RCS: @(#) $Id: butGeom2.tcl,v 1.1.4.1 1998/09/30 02:18:26 stanton Exp $ catch {destroy .t} toplevel .t diff --git a/tests/button.test b/tests/button.test index e72929b..0f3c494 100644 --- a/tests/button.test +++ b/tests/button.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) button.test 1.41 97/12/24 16:10:22 +# RCS: @(#) $Id: button.test,v 1.1.4.2 1998/09/30 02:18:26 stanton Exp $ if {[lsearch [image types] test] < 0} { puts "This application hasn't been compiled with the \"test\"" diff --git a/tests/canvImg.test b/tests/canvImg.test index 59ceaa2..dbd9031 100644 --- a/tests/canvImg.test +++ b/tests/canvImg.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) canvImg.test 1.17 97/07/02 11:28:26 +# RCS: @(#) $Id: canvImg.test,v 1.1.4.1 1998/09/30 02:18:27 stanton Exp $ if {[lsearch [image types] test] < 0} { puts "This application hasn't been compiled with the \"test\" image" diff --git a/tests/canvPs.test b/tests/canvPs.test index 5ee56b9..2087a31 100644 --- a/tests/canvPs.test +++ b/tests/canvPs.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) canvPs.test 1.5 97/06/10 15:49:35 +# RCS: @(#) $Id: canvPs.test,v 1.1.4.1 1998/09/30 02:18:27 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/canvPsArc.tcl b/tests/canvPsArc.tcl index 333765a..81c12be 100644 --- a/tests/canvPsArc.tcl +++ b/tests/canvPsArc.tcl @@ -2,7 +2,7 @@ # for bitmaps in canvases. It is part of the Tk visual test suite, # which is invoked via the "visual" script. # -# SCCS: @(#) canvPsArc.tcl 1.3 96/02/16 10:55:43 +# RCS: @(#) $Id: canvPsArc.tcl,v 1.1.4.1 1998/09/30 02:18:28 stanton Exp $ catch {destroy .t} toplevel .t diff --git a/tests/canvPsBmap.tcl b/tests/canvPsBmap.tcl index 385e998..9222713 100644 --- a/tests/canvPsBmap.tcl +++ b/tests/canvPsBmap.tcl @@ -2,7 +2,7 @@ # for bitmaps in canvases. It is part of the Tk visual test suite, # which is invoked via the "visual" script. # -# SCCS: @(#) canvPsBmap.tcl 1.5 96/07/25 15:54:14 +# RCS: @(#) $Id: canvPsBmap.tcl,v 1.1.4.1 1998/09/30 02:18:28 stanton Exp $ catch {destroy .t} toplevel .t diff --git a/tests/canvPsGrph.tcl b/tests/canvPsGrph.tcl index 55b90d7..eb58c7e 100644 --- a/tests/canvPsGrph.tcl +++ b/tests/canvPsGrph.tcl @@ -2,7 +2,7 @@ # for some of the graphical objects in canvases. It is part of the Tk # visual test suite, which is invoked via the "visual" script. # -# SCCS: @(#) canvPsGrph.tcl 1.3 96/02/16 10:56:07 +# RCS: @(#) $Id: canvPsGrph.tcl,v 1.1.4.1 1998/09/30 02:18:28 stanton Exp $ catch {destroy .t} toplevel .t diff --git a/tests/canvPsText.tcl b/tests/canvPsText.tcl index 8bcc713..4364bb1 100644 --- a/tests/canvPsText.tcl +++ b/tests/canvPsText.tcl @@ -2,7 +2,7 @@ # for text in canvases. It is part of the Tk visual test suite, # which is invoked via the "visual" script. # -# SCCS: @(#) canvPsText.tcl 1.3 96/06/24 16:49:12 +# RCS: @(#) $Id: canvPsText.tcl,v 1.1.4.1 1998/09/30 02:18:29 stanton Exp $ catch {destroy .t} toplevel .t diff --git a/tests/canvRect.test b/tests/canvRect.test index e910906..d6d050f 100644 --- a/tests/canvRect.test +++ b/tests/canvRect.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) canvRect.test 1.18 97/08/06 15:33:39 +# RCS: @(#) $Id: canvRect.test,v 1.1.4.1 1998/09/30 02:18:29 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/canvText.test b/tests/canvText.test index c09182f..b0879b1 100644 --- a/tests/canvText.test +++ b/tests/canvText.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) canvText.test 1.9 97/07/07 11:39:35 +# RCS: @(#) $Id: canvText.test,v 1.1.4.2 1998/09/30 02:18:30 stanton Exp $ if {"[info procs test]" != "test"} { source defs diff --git a/tests/canvWind.test b/tests/canvWind.test index d8c6835..5aaae82 100644 --- a/tests/canvWind.test +++ b/tests/canvWind.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) canvWind.test 1.2 97/11/06 13:49:14 +# RCS: @(#) $Id: canvWind.test,v 1.1.4.1 1998/09/30 02:18:30 stanton Exp $ if {"[info procs test]" != "test"} { source defs diff --git a/tests/canvas.test b/tests/canvas.test index e9eca28..79d3d18 100644 --- a/tests/canvas.test +++ b/tests/canvas.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) canvas.test 1.11 97/12/16 16:20:53 +# RCS: @(#) $Id: canvas.test,v 1.1.4.2 1998/09/30 02:18:30 stanton Exp $ if {[info procs test] != "test"} { source defs @@ -199,3 +199,15 @@ test canvas-7.1 {canvas widget vs hidden commands} { destroy .c list [winfo children .] [interp hidden] } [list {} $l] + +test canvas-8.1 {canvas arc bbox} { + catch {destroy .c} + canvas .c + .c create arc -100 10 100 210 -start 10 -extent 50 -style arc -tags arc1 + set arcBox [.c bbox arc1] + .c create arc 100 10 300 210 -start 10 -extent 50 -style chord -tags arc2 + set coordBox [.c bbox arc2] + .c create arc 300 10 500 210 -start 10 -extent 50 -style pieslice -tags arc3 + set pieBox [.c bbox arc3] + list $arcBox $coordBox $pieBox +} {{48 21 100 94} {248 21 300 94} {398 21 500 112}} diff --git a/tests/clipboard.test b/tests/clipboard.test index 90f4ecb..b2f19d4 100644 --- a/tests/clipboard.test +++ b/tests/clipboard.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) clipboard.test 1.15 96/12/09 17:26:02 +# RCS: @(#) $Id: clipboard.test,v 1.1.4.1 1998/09/30 02:18:31 stanton Exp $ # # Note: Multiple display clipboard handling will only be tested if the diff --git a/tests/clrpick.test b/tests/clrpick.test index 7584bac..133b333 100644 --- a/tests/clrpick.test +++ b/tests/clrpick.test @@ -6,7 +6,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# @(#) clrpick.test 1.10 97/10/29 10:33:44 +# RCS: @(#) $Id: clrpick.test,v 1.1.4.2 1998/09/30 02:18:31 stanton Exp $ # if {[string compare test [info procs test]] == 1} { diff --git a/tests/cmap.tcl b/tests/cmap.tcl index 13c350d..f69986a 100644 --- a/tests/cmap.tcl +++ b/tests/cmap.tcl @@ -2,7 +2,7 @@ # property. It is part of the Tk visual test suite, which is invoked # via the "visual" script. # -# SCCS: @(#) cmap.tcl 1.2 96/02/16 10:55:47 +# RCS: @(#) $Id: cmap.tcl,v 1.1.4.1 1998/09/30 02:18:32 stanton Exp $ catch {destroy .t} toplevel .t -colormap new diff --git a/tests/cmds.test b/tests/cmds.test index 71b14f4..578b06b 100644 --- a/tests/cmds.test +++ b/tests/cmds.test @@ -6,7 +6,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) cmds.test 1.1 96/03/14 13:25:24 +# RCS: @(#) $Id: cmds.test,v 1.1.4.1 1998/09/30 02:18:32 stanton Exp $ if {[string compare test [info procs test]] == 1} { source defs diff --git a/tests/color.test b/tests/color.test index 23a41c9..528c1de 100644 --- a/tests/color.test +++ b/tests/color.test @@ -6,7 +6,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) color.test 1.7 98/01/12 13:23:09 +# RCS: @(#) $Id: color.test,v 1.1.4.2 1998/09/30 02:18:32 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/config.test b/tests/config.test index 96a01e6..eec6634 100644 --- a/tests/config.test +++ b/tests/config.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) config.test 1.21 98/01/09 16:47:32 +# RCS: @(#) $Id: config.test,v 1.1.2.2 1998/09/30 02:18:33 stanton Exp $ if {[info command testobjconfig] != "testobjconfig"} { puts "This application hasn't been compiled with the \"testobjconfig\"" diff --git a/tests/cursor.test b/tests/cursor.test index 21259be..8f5af68 100644 --- a/tests/cursor.test +++ b/tests/cursor.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) cursor.test 1.1 97/12/24 15:17:35 +# RCS: @(#) $Id: cursor.test,v 1.1.2.2 1998/09/30 02:18:33 stanton Exp $ if {[info procs test] != "test"} { source defs @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) defs 1.43 98/01/13 17:21:10 +# RCS: @(#) $Id: defs,v 1.1.4.2 1998/09/30 02:18:34 stanton Exp $ if ![info exists VERBOSE] { set VERBOSE 0 diff --git a/tests/entry.test b/tests/entry.test index 6250bbb..8842bd1 100644 --- a/tests/entry.test +++ b/tests/entry.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) entry.test 1.51 98/01/21 00:22:38 +# RCS: @(#) $Id: entry.test,v 1.1.4.2 1998/09/30 02:18:34 stanton Exp $ if {[lsearch [image types] test] < 0} { puts "This application hasn't been compiled with the \"test\"" diff --git a/tests/event.test b/tests/event.test index a8ab3de..5790c6c 100644 --- a/tests/event.test +++ b/tests/event.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) event.test 1.6 96/09/12 09:25:44 +# RCS: @(#) $Id: event.test,v 1.1.4.1 1998/09/30 02:18:35 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/filebox.test b/tests/filebox.test index 1956c09..85f0204 100644 --- a/tests/filebox.test +++ b/tests/filebox.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) filebox.test 1.7 97/10/20 14:49:37 +# RCS: @(#) $Id: filebox.test,v 1.1.4.2 1998/09/30 02:18:35 stanton Exp $ # set tk_strictMotif_old $tk_strictMotif @@ -40,7 +40,11 @@ proc PressButton {btn} { proc EnterFileByKey {parent fileName fileDir} { global tk_strictMotif - set w .__tk_filedialog + if {$parent == "."} { + set w .__tk_filedialog + } else { + set w $parent.__tk_filedialog + } upvar #0 [winfo name $w] data if {$tk_strictMotif} { @@ -57,7 +61,11 @@ proc EnterFileByKey {parent fileName fileDir} { proc SendButtonPress {parent btn type} { global tk_strictMotif - set w .__tk_filedialog + if {$parent == "."} { + set w .__tk_filedialog + } else { + set w $parent.__tk_filedialog + } upvar #0 [winfo name $w] data set button $data($btn\Btn) @@ -197,6 +205,45 @@ foreach mode $modes { -parent $parent -initialdir $fileDir] } $pathName + test filebox-2.4 "$command command" { + ToPressButton $parent ok + set choice [$command -title "Enter \"$fileName\" and press Ok" \ + -parent $parent -initialdir . \ + -initialfile $fileName] + } $pathName + + test filebox-2.5 "$command command" { + ToPressButton $parent ok + set choice [$command -title "Enter \"$fileName\" and press Ok" \ + -parent $parent -initialdir /badpath \ + -initialfile $fileName] + } $pathName + + test filebox-2.6 "$command command" { + toplevel .t1; toplevel .t2 + ToPressButton .t1 ok + set choice {} + lappend choice [$command \ + -title "Enter \"$fileName\" and press Ok" \ + -parent .t1 -initialdir $fileDir \ + -initialfile $fileName] + ToPressButton .t2 ok + lappend choice [$command \ + -title "Enter \"$fileName\" and press Ok" \ + -parent .t2 -initialdir $fileDir \ + -initialfile $fileName] + ToPressButton .t1 ok + lappend choice [$command \ + -title "Enter \"$fileName\" and press Ok" \ + -parent .t1 -initialdir $fileDir \ + -initialfile $fileName] + destroy .t1 + destroy .t2 + set choice + } [list $pathName $pathName $pathName] + + + set filters(1) {} set filters(2) { diff --git a/tests/focus.test b/tests/focus.test index 4aa4da3..febc207 100644 --- a/tests/focus.test +++ b/tests/focus.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) focus.test 1.24 97/08/11 09:39:34 +# RCS: @(#) $Id: focus.test,v 1.1.4.1 1998/09/30 02:18:36 stanton Exp $ if {$tcl_platform(platform) != "unix"} { return @@ -198,6 +198,12 @@ test focus-1.25 {Tk_FocusCmd procedure} { list [catch {focus -unknown} msg] $msg } {1 {bad option "-unknown": must be -displayof, -force, or -lastfor}} +if {[string compare testwrapper [info commands testwrapper]] != 0} { + puts "This application hasn't been compiled with the testwrapper command," + puts "therefore I am skipping all of these tests." + return +} + test focus-2.1 {TkFocusFilterEvent procedure} {nonPortable} { focus -force .b destroy .t diff --git a/tests/focusTcl.test b/tests/focusTcl.test index 2154041..b7ebc1f 100644 --- a/tests/focusTcl.test +++ b/tests/focusTcl.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) focusTcl.test 1.7 96/09/26 10:25:58 +# RCS: @(#) $Id: focusTcl.test,v 1.1.4.1 1998/09/30 02:18:36 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/font.test b/tests/font.test index 30aa3f5..ce87d70 100644 --- a/tests/font.test +++ b/tests/font.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) font.test 1.29 98/01/16 10:47:57 +# RCS: @(#) $Id: font.test,v 1.1.4.2 1998/09/30 02:18:36 stanton Exp $ if {[string compare test [info procs test]] != 0} { source defs @@ -31,10 +31,10 @@ proc setup {} { update } -label .b.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left -text "0" -font "Helvetica -12 bold" +label .b.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left -text "0" -font "Courier -12" pack .b.l canvas .b.c -closeenough 0 -.b.c create text 0 0 -tags text -anchor nw -just left -font "Helvetica -12 bold" +.b.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12" pack .b.c update diff --git a/tests/frame.test b/tests/frame.test index c23d851..bbe38a8 100644 --- a/tests/frame.test +++ b/tests/frame.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) frame.test 1.29 97/10/10 15:52:19 +# RCS: @(#) $Id: frame.test,v 1.1.4.1 1998/09/30 02:18:37 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/geometry.test b/tests/geometry.test index d5d1f01..182a67d 100644 --- a/tests/geometry.test +++ b/tests/geometry.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) geometry.test 1.9 96/02/16 10:55:06 +# RCS: @(#) $Id: geometry.test,v 1.1.4.1 1998/09/30 02:18:38 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/get.test b/tests/get.test index 9c57128..c68b7e7 100644 --- a/tests/get.test +++ b/tests/get.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) get.test 1.1 97/12/24 16:16:50 +# RCS: @(#) $Id: get.test,v 1.1.2.2 1998/09/30 02:18:39 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/grid.test b/tests/grid.test index fae31fe..7ed0558 100644 --- a/tests/grid.test +++ b/tests/grid.test @@ -6,7 +6,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) grid.test 1.22 97/10/10 10:07:31 +# RCS: @(#) $Id: grid.test,v 1.1.4.1 1998/09/30 02:18:40 stanton Exp $ if {[string compare test [info procs test]] == 1} then \ {source ../tests/defs} diff --git a/tests/id.test b/tests/id.test index 2589d48..61fb97f 100644 --- a/tests/id.test +++ b/tests/id.test @@ -7,12 +7,18 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) id.test 1.7 97/05/15 09:47:10 +# RCS: @(#) $Id: id.test,v 1.1.4.1 1998/09/30 02:18:41 stanton Exp $ if {[info procs test] != "test"} { source defs } +if {[string compare testwrapper [info commands testwrapper]] != 0} { + puts "This application hasn't been compiled with the testwrapper command," + puts "therefore I am skipping all of these tests." + return +} + foreach i [winfo children .] { destroy $i } diff --git a/tests/image.test b/tests/image.test index b4e7ad7..fce2199 100644 --- a/tests/image.test +++ b/tests/image.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) image.test 1.15 97/07/31 10:17:25 +# RCS: @(#) $Id: image.test,v 1.1.4.1 1998/09/30 02:18:42 stanton Exp $ if {[lsearch [image types] test] < 0} { puts "This application hasn't been compiled with the \"test\" image" diff --git a/tests/imgBmap.test b/tests/imgBmap.test index 928f7a4..1d70d15 100644 --- a/tests/imgBmap.test +++ b/tests/imgBmap.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) imgBmap.test 1.15 97/03/10 14:12:38 +# RCS: @(#) $Id: imgBmap.test,v 1.1.4.1 1998/09/30 02:18:42 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/imgPPM.test b/tests/imgPPM.test index 044a274..baed63f 100644 --- a/tests/imgPPM.test +++ b/tests/imgPPM.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) imgPPM.test 1.14 97/10/28 14:47:05 +# RCS: @(#) $Id: imgPPM.test,v 1.1.4.1 1998/09/30 02:18:43 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test index ec7c635..5c2af43 100644 --- a/tests/imgPhoto.test +++ b/tests/imgPhoto.test @@ -10,7 +10,7 @@ # # Author: Paul Mackerras (paulus@cs.anu.edu.au) # -# SCCS: @(#) imgPhoto.test 1.23 97/08/08 11:29:25 +# RCS: @(#) $Id: imgPhoto.test,v 1.1.4.1 1998/09/30 02:18:43 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/listbox.test b/tests/listbox.test index cb1a4e3..2eed971 100644 --- a/tests/listbox.test +++ b/tests/listbox.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) listbox.test 1.45 97/10/29 13:05:46 +# RCS: @(#) $Id: listbox.test,v 1.1.4.1 1998/09/30 02:18:44 stanton Exp $ if {[string compare test [info procs test]] == 1} then \ {source defs} diff --git a/tests/macEmbed.test b/tests/macEmbed.test index f912dcd..89c831c 100644 --- a/tests/macEmbed.test +++ b/tests/macEmbed.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) macEmbed.test 1.1 97/08/06 21:18:53 +# RCS: @(#) $Id: macEmbed.test,v 1.1.4.1 1998/09/30 02:18:45 stanton Exp $ if {$tcl_platform(platform) != "macintosh"} { return @@ -30,6 +30,13 @@ test macEmbed-1.2 {TkpUseWindow procedure, bad window identifier} { catch {destroy .t} list [catch {toplevel .t -use 47} msg] $msg } {1 {The window ID 47 does not correspond to a valid Tk Window.}} + +if {[string compare testembed [info commands testembed]] != 0} { + puts "This application hasn't been compiled with the testembed command," + puts "therefore I am skipping all of these tests." + return +} + test macEmbed-1.3 {TkpUseWindow procedure, creating Container records} { eval destroy [winfo child .] frame .f1 -container 1 -width 200 -height 50 diff --git a/tests/macFont.test b/tests/macFont.test index bafbb8e..51fa738 100644 --- a/tests/macFont.test +++ b/tests/macFont.test @@ -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. # -# SCCS: @(#) macFont.test 1.8 97/12/24 15:26:20 +# RCS: @(#) $Id: macFont.test,v 1.1.4.2 1998/09/30 02:18:45 stanton Exp $ if {$tcl_platform(platform)!="macintosh"} { return diff --git a/tests/macMenu.test b/tests/macMenu.test index 2c10e86..ccf9759 100644 --- a/tests/macMenu.test +++ b/tests/macMenu.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) macMenu.test 1.23 97/07/10 13:35:52 +# RCS: @(#) $Id: macMenu.test,v 1.1.4.1 1998/09/30 02:18:46 stanton Exp $ if {$tcl_platform(platform) != "macintosh"} { return diff --git a/tests/macWinMenu.test b/tests/macWinMenu.test index 7b6ac12..2db2f8c 100644 --- a/tests/macWinMenu.test +++ b/tests/macWinMenu.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) macWinMenu.test 1.13 97/04/10 14:41:29 +# RCS: @(#) $Id: macWinMenu.test,v 1.1.4.1 1998/09/30 02:18:46 stanton Exp $ if {$tcl_platform(platform) == "unix"} { return diff --git a/tests/macscrollbar.test b/tests/macscrollbar.test index 0dd6646..bb32323 100644 --- a/tests/macscrollbar.test +++ b/tests/macscrollbar.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) macscrollbar.test 1.3 97/06/24 13:48:34 +# RCS: @(#) $Id: macscrollbar.test,v 1.1.4.1 1998/09/30 02:18:47 stanton Exp $ # Only run this test on the Macintosh if {$tcl_platform(platform) != "macintosh"} return diff --git a/tests/main.test b/tests/main.test index 49365c3..1d75215 100644 --- a/tests/main.test +++ b/tests/main.test @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) main.test 1.2 97/09/10 17:49:20 +# RCS: @(#) $Id: main.test,v 1.1.4.1 1998/09/30 02:18:47 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/menu.test b/tests/menu.test index 50a5b27..a2aeaf1 100644 --- a/tests/menu.test +++ b/tests/menu.test @@ -6,7 +6,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) menu.test 1.47 98/02/04 11:08:25 +# RCS: @(#) $Id: menu.test,v 1.1.4.2 1998/09/30 02:18:47 stanton Exp $ if {[lsearch [image types] test] < 0} { puts "This application hasn't been compiled with the \"test\" image" diff --git a/tests/menuDraw.test b/tests/menuDraw.test index 212eacf..7dd7d80 100644 --- a/tests/menuDraw.test +++ b/tests/menuDraw.test @@ -6,7 +6,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) menuDraw.test 1.15 97/12/23 08:58:07 +# RCS: @(#) $Id: menuDraw.test,v 1.1.4.2 1998/09/30 02:18:48 stanton Exp $ if {[lsearch [image types] test] < 0} { puts "This application hasn't been compiled with the \"test\" image" diff --git a/tests/menubut.test b/tests/menubut.test index 8a5c14a..a0054ba 100644 --- a/tests/menubut.test +++ b/tests/menubut.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) menubut.test 1.26 97/07/31 10:08:50 +# RCS: @(#) $Id: menubut.test,v 1.1.4.1 1998/09/30 02:18:49 stanton Exp $ # XXX This test file is woefully incomplete right now. If any part # XXX of a procedure has tests then the whole procedure has tests, diff --git a/tests/msgbox.test b/tests/msgbox.test index b41ad70..8beea58 100644 --- a/tests/msgbox.test +++ b/tests/msgbox.test @@ -6,7 +6,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) msgbox.test 1.10 97/10/21 09:54:32 +# RCS: @(#) $Id: msgbox.test,v 1.1.4.2 1998/09/30 02:18:49 stanton Exp $ # if {[string compare test [info procs test]] == 1} { diff --git a/tests/obj.test b/tests/obj.test index 1e3c524..20e1572 100644 --- a/tests/obj.test +++ b/tests/obj.test @@ -6,7 +6,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) obj.test 1.2 97/11/17 11:20:18 +# RCS: @(#) $Id: obj.test,v 1.1.2.2 1998/09/30 02:18:50 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/oldpack.test b/tests/oldpack.test index a63eaef..2448fb5 100644 --- a/tests/oldpack.test +++ b/tests/oldpack.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) oldpack.test 1.10 97/06/24 13:32:16 +# RCS: @(#) $Id: oldpack.test,v 1.1.4.1 1998/09/30 02:18:50 stanton Exp $ if {[string compare test [info procs test]] == 1} then \ {source defs} diff --git a/tests/option.test b/tests/option.test index aad9197..d199769 100644 --- a/tests/option.test +++ b/tests/option.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) option.test 1.20 97/08/07 15:54:37 +# RCS: @(#) $Id: option.test,v 1.1.4.1 1998/09/30 02:18:50 stanton Exp $ if {[string compare test [info procs test]] == 1} then \ {source defs} diff --git a/tests/pack.test b/tests/pack.test index 3443d74..9aafd2c 100644 --- a/tests/pack.test +++ b/tests/pack.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) pack.test 1.27 97/07/01 18:06:56 +# RCS: @(#) $Id: pack.test,v 1.1.4.1 1998/09/30 02:18:51 stanton Exp $ if {[string compare test [info procs test]] == 1} then \ {source defs} diff --git a/tests/place.test b/tests/place.test index 06540e3..54752e9 100644 --- a/tests/place.test +++ b/tests/place.test @@ -6,7 +6,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) place.test 1.6 96/02/16 10:56:01 +# RCS: @(#) $Id: place.test,v 1.1.4.1 1998/09/30 02:18:51 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/raise.test b/tests/raise.test index af13746..811884a 100644 --- a/tests/raise.test +++ b/tests/raise.test @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) raise.test 1.8 96/02/16 10:55:18 +# RCS: @(#) $Id: raise.test,v 1.1.4.1 1998/09/30 02:18:52 stanton Exp $ if {[info commands testmakeexist] == {}} { puts "This application hasn't been compiled with the \"testmakeexist\"" diff --git a/tests/safe.test b/tests/safe.test index 51ee212..c302e0f 100644 --- a/tests/safe.test +++ b/tests/safe.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) safe.test 1.20 98/02/19 15:12:48 +# RCS: @(#) $Id: safe.test,v 1.1.4.2 1998/09/30 02:18:52 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/scale.test b/tests/scale.test index e265493..1a172dc 100644 --- a/tests/scale.test +++ b/tests/scale.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) scale.test 1.29 98/01/02 17:43:57 +# RCS: @(#) $Id: scale.test,v 1.1.4.2 1998/09/30 02:18:53 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/scrollbar.test b/tests/scrollbar.test index 9242acb..035d754 100644 --- a/tests/scrollbar.test +++ b/tests/scrollbar.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) scrollbar.test 1.33 97/08/13 17:37:19 +# RCS: @(#) $Id: scrollbar.test,v 1.1.4.1 1998/09/30 02:18:53 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/select.test b/tests/select.test index 82db030..f51d550 100644 --- a/tests/select.test +++ b/tests/select.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) select.test 1.17 96/12/09 17:25:48 +# RCS: @(#) $Id: select.test,v 1.1.4.1 1998/09/30 02:18:54 stanton Exp $ # # Note: Multiple display selection handling will only be tested if the diff --git a/tests/text.test b/tests/text.test index 3bd5a09..d5c1c6d 100644 --- a/tests/text.test +++ b/tests/text.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) text.test 1.46 97/10/13 15:18:31 +# RCS: @(#) $Id: text.test,v 1.1.4.1 1998/09/30 02:18:55 stanton Exp $ if {[string compare test [info procs test]] == 1} then \ {source defs} diff --git a/tests/textBTree.test b/tests/textBTree.test index 0ca5eb2..db30a96 100644 --- a/tests/textBTree.test +++ b/tests/textBTree.test @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) textBTree.test 1.8 96/03/21 15:51:12 +# RCS: @(#) $Id: textBTree.test,v 1.1.4.1 1998/09/30 02:18:56 stanton Exp $ if {[string compare test [info procs test]] == 1} then \ {source defs} diff --git a/tests/textDisp.test b/tests/textDisp.test index 1641b9b..8ce4172 100644 --- a/tests/textDisp.test +++ b/tests/textDisp.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) textDisp.test 1.56 97/08/14 13:41:51 +# RCS: @(#) $Id: textDisp.test,v 1.1.4.2 1998/09/30 02:18:56 stanton Exp $ if {[string compare test [info procs test]] == 1} { source defs diff --git a/tests/textImage.test b/tests/textImage.test index 80d083c..bee9e20 100644 --- a/tests/textImage.test +++ b/tests/textImage.test @@ -1,4 +1,4 @@ -# SCCS: @(#) textImage.test 1.8 97/07/01 18:11:54 +# RCS: @(#) $Id: textImage.test,v 1.1.4.1 1998/09/30 02:18:58 stanton Exp $ if {[string compare test [info procs test]] == 1} then \ {source ../tests/defs} diff --git a/tests/textIndex.test b/tests/textIndex.test index 6b08d69..fa0fa05 100644 --- a/tests/textIndex.test +++ b/tests/textIndex.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) textIndex.test 1.11 98/01/12 15:33:59 +# RCS: @(#) $Id: textIndex.test,v 1.1.4.2 1998/09/30 02:18:58 stanton Exp $ if {[string compare test [info procs test]] == 1} then \ {source defs} diff --git a/tests/textMark.test b/tests/textMark.test index 058665e..17a91fb 100644 --- a/tests/textMark.test +++ b/tests/textMark.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) textMark.test 1.9 98/01/12 12:45:56 +# RCS: @(#) $Id: textMark.test,v 1.1.4.2 1998/09/30 02:18:59 stanton Exp $ if {[string compare test [info procs test]] == 1} then \ {source defs} diff --git a/tests/textTag.test b/tests/textTag.test index 4cc6fd4..a02aa9c 100644 --- a/tests/textTag.test +++ b/tests/textTag.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) textTag.test 1.31 97/12/16 16:20:48 +# RCS: @(#) $Id: textTag.test,v 1.1.4.2 1998/09/30 02:18:59 stanton Exp $ if {[string compare test [info procs test]] == 1} then \ {source defs} diff --git a/tests/textWind.test b/tests/textWind.test index c639dab..6987d55 100644 --- a/tests/textWind.test +++ b/tests/textWind.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) textWind.test 1.25 97/07/01 18:16:38 +# RCS: @(#) $Id: textWind.test,v 1.1.4.1 1998/09/30 02:19:00 stanton Exp $ if {[string compare test [info procs test]] == 1} then \ {source defs} diff --git a/tests/tk.test b/tests/tk.test index 79d0c7a..e211234 100644 --- a/tests/tk.test +++ b/tests/tk.test @@ -6,7 +6,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) tk.test 1.4 97/12/23 08:58:39 +# RCS: @(#) $Id: tk.test,v 1.1.4.2 1998/09/30 02:19:00 stanton Exp $ if {[info commands test] == ""} { source defs diff --git a/tests/unixButton.test b/tests/unixButton.test index a4c67d5..5f30d3c 100644 --- a/tests/unixButton.test +++ b/tests/unixButton.test @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) unixButton.test 1.6 97/07/01 18:11:30 +# RCS: @(#) $Id: unixButton.test,v 1.1.4.1 1998/09/30 02:19:01 stanton Exp $ if {$tcl_platform(platform)!="unix"} { return diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test index ef8ecb9..9cf2c67 100644 --- a/tests/unixEmbed.test +++ b/tests/unixEmbed.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) unixEmbed.test 1.7 97/08/13 11:13:21 +# RCS: @(#) $Id: unixEmbed.test,v 1.1.4.1 1998/09/30 02:19:01 stanton Exp $ if {$tcl_platform(platform) != "unix"} { return @@ -96,6 +96,13 @@ test unixEmbed-1.4 {TkpUseWindow procedure, inheriting colormap} { destroy .t set result } {1} + +if {[string compare testembed [info commands testembed]] != 0} { + puts "This application hasn't been compiled with the testembed command," + puts "therefore I am skipping all of these tests." + return +} + test unixEmbed-1.5 {TkpUseWindow procedure, creating Container records} { eval destroy [winfo child .] frame .f1 -container 1 -width 200 -height 50 diff --git a/tests/unixFont.test b/tests/unixFont.test index 25255d3..e9d1568 100644 --- a/tests/unixFont.test +++ b/tests/unixFont.test @@ -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. # -# SCCS: @(#) unixFont.test 1.9 97/10/13 11:11:25 +# RCS: @(#) $Id: unixFont.test,v 1.1.4.2 1998/09/30 02:19:01 stanton Exp $ if {$tcl_platform(platform)!="unix"} { return diff --git a/tests/unixMenu.test b/tests/unixMenu.test index 679e9e0..5e28f0a 100644 --- a/tests/unixMenu.test +++ b/tests/unixMenu.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) unixMenu.test 1.10 97/10/13 13:10:04 +# RCS: @(#) $Id: unixMenu.test,v 1.1.4.2 1998/09/30 02:19:02 stanton Exp $ if {$tcl_platform(platform) != "unix"} { return diff --git a/tests/unixSend.test b/tests/unixSend.test index 5626f06..8528692 100644 --- a/tests/unixSend.test +++ b/tests/unixSend.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) unixSend.test 1.28 97/10/21 10:05:26 +# RCS: @(#) $Id: unixSend.test,v 1.1.2.2 1998/09/30 02:19:03 stanton Exp $ if {$tcl_platform(platform) == "macintosh"} { puts "send is not available on the Mac - skipping tests" diff --git a/tests/unixWm.test b/tests/unixWm.test index 1845390..05ca835 100644 --- a/tests/unixWm.test +++ b/tests/unixWm.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) unixWm.test 1.47 98/01/20 14:20:10 +# RCS: @(#) $Id: unixWm.test,v 1.1.4.2 1998/09/30 02:19:03 stanton Exp $ if {$tcl_platform(platform) != "unix"} { return @@ -352,6 +352,12 @@ test unixWm-8.9 {icon windows} {nonPortable} { lappend result [winfo ismapped .icon] [wm state .icon] } {icon 1 0 0 withdrawn 1 normal} +if {[string compare testwrapper [info commands testwrapper]] != 0} { + puts "This application hasn't been compiled with the testwrapper command," + puts "therefore I am skipping all of these tests." + return +} + test unixWm-9.1 {TkWmMapWindow procedure, client property} {unixOnly} { catch {destroy .t} toplevel .t -width 100 -height 50 diff --git a/tests/util.test b/tests/util.test index 3b41e49..af09f20 100644 --- a/tests/util.test +++ b/tests/util.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) util.test 1.4 96/02/16 10:55:50 +# RCS: @(#) $Id: util.test,v 1.1.4.1 1998/09/30 02:19:04 stanton Exp $ if {[string compare test [info procs test]] == 1} then \ {source defs} diff --git a/tests/visual.test b/tests/visual.test index 853554e..a114d0f 100644 --- a/tests/visual.test +++ b/tests/visual.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) visual.test 1.11 96/02/16 10:55:34 +# RCS: @(#) $Id: visual.test,v 1.1.4.1 1998/09/30 02:19:05 stanton Exp $ if {[info procs test] != "test"} { source defs diff --git a/tests/winButton.test b/tests/winButton.test index 7125aa5..621433e 100644 --- a/tests/winButton.test +++ b/tests/winButton.test @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) winButton.test 1.3 97/07/01 18:11:44 +# RCS: @(#) $Id: winButton.test,v 1.1.4.1 1998/09/30 02:19:05 stanton Exp $ if {$tcl_platform(platform)!="windows"} { return @@ -101,21 +101,21 @@ test winbutton-1.4 {TkpComputeButtonGeometry procedure} {nonPortable} { [winfo reqwidth .b2] [winfo reqheight .b2] \ [winfo reqwidth .b3] [winfo reqheight .b3] \ [winfo reqwidth .b4] [winfo reqheight .b4] -} {45 21 54 30 74 27 76 25} +} {58 24 67 33 88 30 90 28} test winbutton-1.5 {TkpComputeButtonGeometry procedure} {nonPortable} { eval destroy [winfo children .] label .l1 -text "This is a long string that will wrap around on several lines.\n\nIt also has a blank line (above)." -wraplength 1.5i -padx 0 -pady 0 pack .l1 update list [winfo reqwidth .l1] [winfo reqheight .l1] -} {142 69} +} {178 84} test winbutton-1.6 {TkpComputeButtonGeometry procedure} {nonPortable} { eval destroy [winfo children .] label .l1 -text "This is a long string without wrapping.\n\nIt also has a blank line (above)." -padx 0 -pady 0 pack .l1 update list [winfo reqwidth .l1] [winfo reqheight .l1] -} {180 43} +} {222 52} test winbutton-1.7 {TkpComputeButtonGeometry procedure} {nonPortable} { eval destroy [winfo children .] label .b1 -text Xagqpim -bd 2 -padx 0 -pady 2 -width 10 @@ -128,7 +128,7 @@ test winbutton-1.7 {TkpComputeButtonGeometry procedure} {nonPortable} { [winfo reqwidth .b2] [winfo reqheight .b2] \ [winfo reqwidth .b3] [winfo reqheight .b3] \ [winfo reqwidth .b4] [winfo reqheight .b4] -} {64 21 54 82 153 40 59 25} +} {74 24 67 97 174 46 64 28} test winbutton-1.8 {TkpComputeButtonGeometry procedure} {nonPortable} { eval destroy [winfo children .] label .b1 -text Xagqpim -bd 2 -padx 0 -pady 2 \ @@ -144,7 +144,7 @@ test winbutton-1.8 {TkpComputeButtonGeometry procedure} {nonPortable} { [winfo reqwidth .b2] [winfo reqheight .b2] \ [winfo reqwidth .b3] [winfo reqheight .b3] \ [winfo reqwidth .b4] [winfo reqheight .b4] -} {53 29 52 28 56 28 58 26} +} {66 32 65 31 69 31 71 29} test winbutton-1.9 {TkpComputeButtonGeometry procedure} { eval destroy [winfo children .] button .b2 -bitmap question -default normal diff --git a/tests/winClipboard.test b/tests/winClipboard.test index 222c23f..059232a 100644 --- a/tests/winClipboard.test +++ b/tests/winClipboard.test @@ -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. # -# SCCS: @(#) winClipboard.test 1.3 97/07/01 18:10:37 +# RCS: @(#) $Id: winClipboard.test,v 1.1.4.1 1998/09/30 02:19:05 stanton Exp $ if {$tcl_platform(platform)!="windows"} { return diff --git a/tests/winDialog.test b/tests/winDialog.test index 34a6dae..c10331e 100644 --- a/tests/winDialog.test +++ b/tests/winDialog.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) winDialog.test 1.4 97/08/06 18:19:56 +# RCS: @(#) $Id: winDialog.test,v 1.1.2.2 1998/09/30 02:19:06 stanton Exp $ if {$tcl_platform(os) != "Windows NT"} { return diff --git a/tests/winFont.test b/tests/winFont.test index a047108..1eb5672 100644 --- a/tests/winFont.test +++ b/tests/winFont.test @@ -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. # -# SCCS: @(#) winFont.test 1.7 97/04/25 16:55:00 +# RCS: @(#) $Id: winFont.test,v 1.1.4.1 1998/09/30 02:19:06 stanton Exp $ if {$tcl_platform(platform)!="windows"} { return @@ -149,7 +149,15 @@ test winfont-5.10 {Tk_MeasureChars procedure: make first part of word fit} { .b.l config -wrap [expr $ax*12] -text "0000000000000000" getsize } "[expr $ax*12] [expr $ay*2]" - +test winfont-5.10 {Tk_MeasureChars procedure: check for kerning} {nonPortable} { + set font [.b.l cget -font] + .b.l config -font {{MS Sans Serif} 8} -text "W" + set width [winfo reqwidth .b.l] + .b.l config -text "XaYoYaKaWx" + set x [lindex [getsize] 0] + .b.l config -font $font + expr $x < ($width*10) +} 1 test winfont-6.1 {Tk_DrawChars procedure: loop test} { .b.l config -text "a" update diff --git a/tests/winMenu.test b/tests/winMenu.test index 7a3a9a9..28c65c4 100644 --- a/tests/winMenu.test +++ b/tests/winMenu.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) winMenu.test 1.20 98/01/26 19:43:03 +# RCS: @(#) $Id: winMenu.test,v 1.1.4.2 1998/09/30 02:19:07 stanton Exp $ if {$tcl_platform(platform) != "windows"} { return diff --git a/tests/winSend.test b/tests/winSend.test index a4fab43..70ac07c 100644 --- a/tests/winSend.test +++ b/tests/winSend.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) winSend.test 1.3 98/02/11 18:05:48 +# RCS: @(#) $Id: winSend.test,v 1.1.2.2 1998/09/30 02:19:07 stanton Exp $ if {$tcl_platform(platform) != "windows"} { return diff --git a/tests/winWm.test b/tests/winWm.test index c83e380..06b0219 100644 --- a/tests/winWm.test +++ b/tests/winWm.test @@ -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. # -# SCCS: @(#) winWm.test 1.5 97/08/13 15:42:46 +# RCS: @(#) $Id: winWm.test,v 1.1.4.1 1998/09/30 02:19:08 stanton Exp $ if {$tcl_platform(platform) != "windows"} { return diff --git a/tests/window.test b/tests/window.test index aaa29c0..4573f5f 100644 --- a/tests/window.test +++ b/tests/window.test @@ -6,7 +6,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) window.test 1.8 97/01/22 14:17:54 +# RCS: @(#) $Id: window.test,v 1.1.4.1 1998/09/30 02:19:08 stanton Exp $ if {[info procs test] != "test"} { source defs @@ -80,6 +80,12 @@ test window-2.3 {Tk_DestroyWindow procedure, destroy handler deletes parent} { destroy .f } {} +if {[string compare testmenubar [info commands testmenubar]] != 0} { + puts "This application hasn't been compiled with the testmenubar command," + puts "therefore I am skipping all of these tests." + return +} + test window-3.1 {Tk_MakeWindowExist procedure, stacking order and menubars} unixOnly { catch {destroy .t} toplevel .t -width 300 -height 200 diff --git a/tests/winfo.test b/tests/winfo.test index 4b9b60f..5cd0098 100644 --- a/tests/winfo.test +++ b/tests/winfo.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) winfo.test 1.20 97/05/26 13:24:39 +# RCS: @(#) $Id: winfo.test,v 1.1.4.2 1998/09/30 02:19:09 stanton Exp $ if {[info procs test] != "test"} { source defs @@ -206,9 +206,15 @@ test winfo-7.6 {"winfo pathname" command} { test winfo-7.7 {"winfo pathname" command} { winfo pathname -displayof .b [winfo id .] } {.} -test winfo-7.8 {"winfo pathname" command} {unixOnly} { - winfo pathname [testwrapper .] -} {} + +if {[string compare testwrapper [info commands testwrapper]] == 0} { + puts "This application hasn't been compiled with the testwrapper command," + puts "therefore I am skipping all of these tests." + + test winfo-7.8 {"winfo pathname" command} {unixOnly} { + winfo pathname [testwrapper .] + } {} +} test winfo-8.1 {"winfo pointerx" command} { catch [winfo pointerx .b] diff --git a/tests/xmfbox.test b/tests/xmfbox.test index d6b54ee..6381c70 100644 --- a/tests/xmfbox.test +++ b/tests/xmfbox.test @@ -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. # -# SCCS: @(#) xmfbox.test 1.3 98/01/07 16:44:17 +# RCS: @(#) $Id: xmfbox.test,v 1.1.2.2 1998/09/30 02:19:09 stanton Exp $ if {[string compare test [info procs test]] == 1} { source defs diff --git a/unix/Makefile.in b/unix/Makefile.in index cff8c7d..038bd2c 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. # -# SCCS: @(#) Makefile.in 1.154 98/02/10 10:24:55 +# RCS: @(#) $Id: Makefile.in,v 1.1.4.2 1998/09/30 02:19:10 stanton Exp $ # Current Tk version; used in various names. @@ -82,6 +82,24 @@ TCL_UNIX_DIR = @TCL_SRC_DIR@/unix # for this version of Tk: TCL_BIN_DIR = @TCL_BIN_DIR@ +# Libraries built with optimization switches have this additional extension +TK_DBGX = @TK_DBGX@ +TCL_DBGX = @TCL_DBGX@ + +# warning flags +CFLAGS_WARNING = @CFLAGS_WARNING@ + +# The default switches for optimization or debugging +CFLAGS_DEBUG = @CFLAGS_DEBUG@ +CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ + +# To change the compiler switches, for example to change from optimization to +# debugging symbols, change the following line: +#CFLAGS = $(CFLAGS_DEBUG) +#CFLAGS = $(CFLAGS_OPTIMIZE) +#CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) +CFLAGS = $(@CFLAGS_DEFAULT@) + # A "-I" switch that can be used when compiling to make all of the # X11 include files accessible (the configure script will try to # set this value, and will cause it to be an empty string if the @@ -97,10 +115,6 @@ X11_LIB_SWITCHES = @XLIBSW@ # configure script. LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc -# To change the compiler switches, for example to change from -O -# to -g, change the following line: -CFLAGS = -O - # To turn off the security checks that disallow incoming sends when # the X server appears to be insecure, reverse the comments on the # following lines: @@ -156,6 +170,12 @@ TK_SHLIB_CFLAGS = @TK_SHLIB_CFLAGS@ TK_LIB_FILE = @TK_LIB_FILE@ #TK_LIB_FILE = libtk.a +TK_LIB_FLAG = @TK_LIB_FLAG@ +#TK_LIB_FLAG = -ltk + +TCL_LIB_FLAG = @TCL_LIB_FLAG@ +#TCL_LIB_FLAG = -ltcl + # The symbol below provides support for dynamic loading and shared # libraries. See configure.in for a description of what it means. # The values of the symbolis normally set by the configure script. @@ -191,7 +211,8 @@ TOOL_DIR = @TCL_SRC_DIR@/tools CC = @CC@ -CC_SWITCHES = ${CFLAGS} ${TK_SHLIB_CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \ +CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TK_SHLIB_CFLAGS} \ +-I${UNIX_DIR} -I${GENERIC_DIR} \ -I${BMAP_DIR} -I${TCL_GENERIC_DIR} ${X11_INCLUDES} ${AC_FLAGS} ${PROTO_FLAGS} \ ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} ${NO_DEPRECATED_FLAGS} @@ -296,10 +317,10 @@ all: wish # The following target is configured by autoconf to generate either # a shared library or non-shared library for Tk. -@TK_LIB_FILE@: ${OBJS} - rm -f @TK_LIB_FILE@ +${TK_LIB_FILE}: ${OBJS} + rm -f ${TK_LIB_FILE} @MAKE_LIB@ - $(RANLIB) @TK_LIB_FILE@ + $(RANLIB) ${TK_LIB_FILE} # Make target which outputs the list of the .o contained in the Tk lib # usefull to build a single big shared library containing Tcl/Tk and other @@ -479,7 +500,7 @@ clean: distclean: clean rm -f Makefile config.status config.cache config.log tkConfig.sh \ - SUNWtk.* prototype + $(PACKAGE).* prototype depend: makedepend -- $(DEPEND_SWITCHES) -- $(SRCS) @@ -789,9 +810,10 @@ checkexports: $(TK_LIB_FILE) # to put the distribution. DISTDIR must be an absolute path name. # +DISTROOT = /tmp/dist DISTNAME = tk@TK_VERSION@@TK_PATCH_LEVEL@ ZIPNAME = tk@TK_MAJOR_VERSION@@TK_MINOR_VERSION@@TK_PATCH_LEVEL@.zip -DISTDIR = /proj/tcl/dist/$(DISTNAME) +DISTDIR = $(DISTROOT)/$(DISTNAME) TCLDIR = @TCL_SRC_DIR@ $(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in autoconf $(UNIX_DIR)/configure.in > $(UNIX_DIR)/configure @@ -828,6 +850,7 @@ dist: $(UNIX_DIR)/configure rm -f $(DISTDIR)/generic/blt*.[ch] mkdir $(DISTDIR)/win cp -p $(TOP_DIR)/win/*.c $(TOP_DIR)/win/*.h $(DISTDIR)/win + cp -p $(TOP_DIR)/win/*.bat $(DISTDIR)/win cp -p $(TOP_DIR)/win/makefile.* $(DISTDIR)/win cp -p $(TOP_DIR)/win/README $(DISTDIR)/win cp -p $(TOP_DIR)/license.terms $(DISTDIR)/win @@ -836,10 +859,7 @@ dist: $(UNIX_DIR)/configure $(TOP_DIR)/win/rc/*.ico $(TOP_DIR)/win/rc/*.bmp \ $(DISTDIR)/win/rc mkdir $(DISTDIR)/mac - sccs edit -s $(TOP_DIR)/mac/tkMacProjects.sit.hqx - cp -p tkMacProjects.sit.hqx $(DISTDIR)/mac - sccs unedit $(TOP_DIR)/mac/tkMacProjects.sit.hqx - rm -f tkMacProjects.sit.hqx + cp -p $(TOP_DIR)/mac/tkMacProjects.sea.hqx $(DISTDIR)/mac cp -p $(TOP_DIR)/mac/*.c $(TOP_DIR)/mac/*.h $(TOP_DIR)/mac/*.r \ $(DISTDIR)/mac cp -p $(TOP_DIR)/mac/README $(DISTDIR)/mac @@ -889,7 +909,6 @@ dist: $(UNIX_DIR)/configure mkdir $(DISTDIR)/doc cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/doc/*.[13n] \ $(TCLDIR)/doc/man.macros $(DISTDIR)/doc - cp /home/ouster/papers/tk4.0/tk4.0.ps $(DISTDIR)/doc mkdir $(DISTDIR)/tests cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/tests/*.test \ $(TOP_DIR)/tests/visual $(TOP_DIR)/tests/*.tcl \ @@ -903,10 +922,10 @@ dist: $(UNIX_DIR)/configure # alldist: dist - rm -f $(DISTDIR)/../$(DISTNAME).tar.Z \ - $(DISTDIR)/../$(DISTNAME).tar.gz \ - $(DISTDIR)/../$(ZIPNAME) - cd $(DISTDIR)/..; tar cf $(DISTNAME).tar $(DISTNAME); \ + rm -f $(DISTROOT)/$(DISTNAME).tar.Z \ + $(DISTROOT)/$(DISTNAME).tar.gz \ + $(DISTROOT)/$(ZIPNAME) + cd $(DISTROOT); tar cf $(DISTNAME).tar $(DISTNAME); \ gzip -9 -c $(DISTNAME).tar > $(DISTNAME).tar.gz; \ compress $(DISTNAME).tar; zip -r8 $(ZIPNAME) $(DISTNAME) @@ -919,16 +938,16 @@ alldist: dist # allpatch: dist - rm -f /proj/tcl/dist/$(DISTNAME).tar.Z \ - /proj/tcl/dist/$(DISTNAME).tar.gz \ - /proj/tcl/dist/$(ZIPNAME) - mv /proj/tcl/dist/tk${VERSION} /proj/tcl/dist/old - mv /proj/tcl/dist/$(DISTNAME) /proj/tcl/dist/tk${VERSION} - cd /proj/tcl/dist; tar cf $(DISTNAME).tar tk${VERSION}; \ + rm -f $(DISTROOT)/$(DISTNAME).tar.Z \ + $(DISTROOT)/$(DISTNAME).tar.gz \ + $(DISTROOT)/$(ZIPNAME) + mv $(DISTROOT)/tk${VERSION} $(DISTROOT)/old + mv $(DISTROOT)/$(DISTNAME) $(DISTROOT)/tk${VERSION} + cd $(DISTROOT); tar cf $(DISTNAME).tar tk${VERSION}; \ gzip -9 -c $(DISTNAME).tar > $(DISTNAME).tar.gz; \ compress $(DISTNAME).tar; zip -r8 $(ZIPNAME) tk${VERSION} - mv /proj/tcl/dist/tk${VERSION} /proj/tcl/dist/$(DISTNAME) - mv /proj/tcl/dist/old /proj/tcl/dist/tk${VERSION} + mv $(DISTROOT)/tk${VERSION} $(DISTROOT)/$(DISTNAME) + mv $(DISTROOT)/old $(DISTROOT)/tk${VERSION} # # Target to create a Macintosh version of the distribution. This will @@ -938,7 +957,7 @@ allpatch: dist # macdist: dist - rm -f $(DISTDIR)/mac/tkMacProjects.sit.hqx + rm -f $(DISTDIR)/mac/tkMacProjects.sea.hqx tclsh $(TOOL_DIR)/man2html.tcl $(DISTDIR)/tmp ../.. tk$(VERSION) mv $(DISTDIR)/tmp/tk$(VERSION) $(DISTDIR)/html rm -rf $(DISTDIR)/doc @@ -959,13 +978,15 @@ macdist: dist # make DISTDIR=<distdir> package-quick # # <distdir> is the absolute path to a directory where the build should -# take place. These steps will generate the SUNWtk.sun4 and -# SUNWtk.i86pc stream packages. It is important that the packages be +# take place. These steps will generate the $(PACKAGE).sun4 and +# $(PACKAGE).i86pc stream packages. It is important that the packages be # built in this fashion in order to ensure that the architecture # independent files are exactly the same, including timestamps, in # both packages. # +PACKAGE=SCRPtk + package: dist package-config package-common package-binaries package-generate package-quick: package-config package-binaries package-generate @@ -1022,7 +1043,7 @@ package-generate: | tclsh $(TCLDIR)/unix/mkProto.tcl $(TCLVERSION) \ $(UNIX_DIR) > prototype pkgmk -o -d . -f prototype -a `arch` - pkgtrans -s . SUNWtk.`arch` SUNWtk - rm -rf SUNWtk + pkgtrans -s . $(PACKAGE).`arch` $(PACKAGE) + rm -rf $(PACKAGE) # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/unix/README b/unix/README index ae07ad5..446ac10 100644 --- a/unix/README +++ b/unix/README @@ -10,7 +10,7 @@ SGI, as well as PCs running Linux, BSDI, and SCO UNIX. To compile for a PC running Windows, see the README file in the directory ../win. To compile for a Macintosh, see the README file in the directory ../mac. -SCCS: @(#) README 1.26 98/02/18 18:04:01 +RCS: @(#) $Id: README,v 1.1.4.2 1998/09/30 02:19:10 stanton Exp $ How To Compile And Install Tk: ------------------------------ diff --git a/unix/configure.in b/unix/configure.in index 57c3e13..920a0f5 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -1,8 +1,9 @@ +#! /bin/bash -norc dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. AC_INIT(../generic/tk.h) -# SCCS: @(#) configure.in 1.97 98/02/19 14:17:04 +# RCS: @(#) $Id: configure.in,v 1.1.4.2 1998/09/30 02:19:11 stanton Exp $ TK_VERSION=8.1 TK_MAJOR_VERSION=8 @@ -34,13 +35,23 @@ fi AC_C_CROSS AC_HAVE_HEADERS(unistd.h limits.h) +# set the warning flags depending on whether or not we are using gcc +if test "${GCC}" = "yes" ; then + # leave -Wimplicit-int out, the X libs generate so many of these warnings + # that they obscure everything else. + + CFLAGS_WARNING="-Wall -Wconversion -Wno-implicit-int" +else + CFLAGS_WARNING="" +fi + #-------------------------------------------------------------------- # See if there was a command-line option for where Tcl is; if # not, assume that its top-level directory is a sibling of ours. #-------------------------------------------------------------------- AC_ARG_WITH(tcl, [ --with-tcl=DIR use Tcl 8.1 binaries from DIR], - TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd ../../tcl8.1a2/unix; pwd`) + TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd ../../tcl8.1$TK_PATCH_LEVEL/unix; pwd`) if test ! -d $TCL_BIN_DIR; then AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR doesn't exist) fi @@ -56,6 +67,19 @@ fi file=$TCL_BIN_DIR/tclConfig.sh . $file + +# Set the default compiler switches based on the --enable-symbols option + +AC_ARG_ENABLE(symbols, [ --enable-symbols build with debugging symbols], + [tcl_ok=$enableval], [tcl_ok=no]) +if test "$tcl_ok" = "yes"; then + CFLAGS_DEFAULT=CFLAGS_DEBUG + TK_DBGX=g +else + CFLAGS_DEFAULT=CFLAGS_OPTIMIZE + TK_DBGX="" +fi + SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS SHLIB_LD=$TCL_SHLIB_LD SHLIB_LD_LIBS=$TCL_SHLIB_LD_LIBS @@ -63,6 +87,8 @@ SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX SHLIB_VERSION=$TCL_SHLIB_VERSION DL_LIBS=$TCL_DL_LIBS LD_FLAGS=$TCL_LD_FLAGS +CFLAGS_DEBUG=$TCL_CFLAGS_DEBUG +CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' @@ -350,29 +376,37 @@ AC_ARG_ENABLE(shared, if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then TK_SHARED_BUILD=1 TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" - eval "TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}" - MAKE_LIB="\${SHLIB_LD} -o ${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}" + TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX} + MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}" RANLIB=":" else TK_SHARED_BUILD=0 TK_SHLIB_CFLAGS="" - eval "TK_LIB_FILE=libtk${TCL_UNSHARED_LIB_SUFFIX}" - MAKE_LIB="ar cr ${TK_LIB_FILE} \${OBJS}" + TK_LIB_FILE=libtk${TCL_UNSHARED_LIB_SUFFIX} + MAKE_LIB="ar cr \${TK_LIB_FILE} \${OBJS}" fi +DBGX='${TK_DBGX}' +eval "TK_LIB_FILE=${TK_LIB_FILE}" + # Note: in the following variable, it's important to use the absolute # path name of the Tcl directory rather than "..": this is because # AIX remembers this path and will attempt to use it at run-time to look # up the Tcl library. if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then - TK_BUILD_LIB_SPEC="-L`pwd` -ltk${VERSION}" - TK_LIB_SPEC="-L${exec_prefix}/lib -ltk${VERSION}" + TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" else - TK_BUILD_LIB_SPEC="-L`pwd` -ltk`echo ${VERSION} | tr -d .`" - TK_LIB_SPEC="-L${exec_prefix}/lib -ltk`echo ${VERSION} | tr -d .`" + TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" fi - +TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" +TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}" + +AC_SUBST(CFLAGS_DEBUG) +AC_SUBST(CFLAGS_DEFAULT) +AC_SUBST(CFLAGS_OPTIMIZE) +AC_SUBST(CFLAGS_WARNING) +AC_SUBST(TK_DBGX) AC_SUBST(DL_LIBS) AC_SUBST(LD_FLAGS) AC_SUBST(MATH_LIBS) @@ -384,12 +418,15 @@ AC_SUBST(SHLIB_SUFFIX) AC_SUBST(SHLIB_VERSION) AC_SUBST(TCL_BIN_DIR) AC_SUBST(TCL_BUILD_LIB_SPEC) +AC_SUBST(TCL_DBGX) +AC_SUBST(TCL_LIB_FLAG) AC_SUBST(TCL_SRC_DIR) AC_SUBST(TCL_VERSION) AC_SUBST(TK_BUILD_LIB_SPEC) AC_SUBST(TK_CC_SEARCH_FLAGS) AC_SUBST(TK_LD_SEARCH_FLAGS) AC_SUBST(TK_LIB_FILE) +AC_SUBST(TK_LIB_FLAG) AC_SUBST(TK_LIB_SPEC) AC_SUBST(TK_MAJOR_VERSION) AC_SUBST(TK_MINOR_VERSION) diff --git a/unix/porting.notes b/unix/porting.notes index ecb395d..2813bd5 100644 --- a/unix/porting.notes +++ b/unix/porting.notes @@ -26,7 +26,7 @@ and Tk to compile. You can also add new entries to that database when you install Tcl and Tk on a new platform. The Web database is likely to be more up-to-date than this file. -sccsid = SCCS: @(#) porting.notes 1.10 96/04/10 15:38:54 +RCS: @(#) $Id: porting.notes,v 1.1.4.1 1998/09/30 02:19:11 stanton Exp $ -------------------------------------------- Solaris, various versions diff --git a/unix/porting.old b/unix/porting.old index ea8aa5c..b85a6a7 100644 --- a/unix/porting.old +++ b/unix/porting.old @@ -14,7 +14,7 @@ questions about porting Tcl to a particular machine; in these cases the person's name and e-mail address are listed. I'd be happy to receive corrections or updates. -sccsid = SCCS: @(#) porting.old 1.2 96/02/16 10:27:30 +RCS: @(#) $Id: porting.old,v 1.1.4.1 1998/09/30 02:19:12 stanton Exp $ --------------------------------------------- DEC Alphas: diff --git a/unix/tkAppInit.c b/unix/tkAppInit.c index fdd9afd..0616268 100644 --- a/unix/tkAppInit.c +++ b/unix/tkAppInit.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. * - * SCCS: @(#) tkAppInit.c 1.24 98/01/13 17:21:40 + * RCS: @(#) $Id: tkAppInit.c,v 1.1.4.2 1998/09/30 02:19:12 stanton Exp $ */ #include "tk.h" diff --git a/unix/tkConfig.sh.in b/unix/tkConfig.sh.in index 544d658..cc5c33d 100644 --- a/unix/tkConfig.sh.in +++ b/unix/tkConfig.sh.in @@ -11,7 +11,7 @@ # # The information in this file is specific to a single platform. # -# SCCS: @(#) tkConfig.sh.in 1.11 97/10/30 13:29:13 +# RCS: @(#) $Id: tkConfig.sh.in,v 1.1.4.1 1998/09/30 02:19:13 stanton Exp $ # Tk's version number. TK_VERSION='@TK_VERSION@' @@ -25,8 +25,11 @@ TK_DEFS='@DEFS@' # Flag, 1: we built a shared lib, 0 we didn't TK_SHARED_BUILD=@TK_SHARED_BUILD@ +# This indicates if Tk was build with debugging symbols +TK_DBGX=@TK_DBGX@ + # The name of the Tk library (may be either a .a file or a shared library): -TK_LIB_FILE=@TK_LIB_FILE@ +TK_LIB_FILE='@TK_LIB_FILE@' # Additional libraries to use when linking Tk. TK_LIBS='@XLIBSW@ @DL_LIBS@ @LIBS@ @MATH_LIBS@' @@ -45,6 +48,9 @@ TK_XINCLUDES='@XINCLUDES@' # Linker switch(es) to use to link with the X11 library archive. TK_XLIBSW='@XLIBSW@' +# -l flag to pass to the linker to pick up the Tcl library +TK_LIB_FLAG='@TK_LIB_FLAG@' + # String to pass to linker to pick up the Tk library from its # build directory. TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@' diff --git a/unix/tkUnix.c b/unix/tkUnix.c index 25b1997..e1cd27d 100644 --- a/unix/tkUnix.c +++ b/unix/tkUnix.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. * - * SCCS: @(#) tkUnix.c 1.6 97/11/07 21:24:29 + * RCS: @(#) $Id: tkUnix.c,v 1.1.4.2 1998/09/30 02:19:13 stanton Exp $ */ #include <tkInt.h> diff --git a/unix/tkUnix3d.c b/unix/tkUnix3d.c index e7584ce..1b6285d 100644 --- a/unix/tkUnix3d.c +++ b/unix/tkUnix3d.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnix3d.c 1.3 96/11/20 14:24:38 + * RCS: @(#) $Id: tkUnix3d.c,v 1.1.4.1 1998/09/30 02:19:13 stanton Exp $ */ #include <tk3d.h> diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c index fcb3d38..25228d2 100644 --- a/unix/tkUnixButton.c +++ b/unix/tkUnixButton.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixButton.c 1.6 97/12/22 10:44:42 + * RCS: @(#) $Id: tkUnixButton.c,v 1.1.4.2 1998/09/30 02:19:14 stanton Exp $ */ #include "tkButton.h" diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c index d3a5a27..c517545 100644 --- a/unix/tkUnixColor.c +++ b/unix/tkUnixColor.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixColor.c 1.1 96/10/22 16:52:31 + * RCS: @(#) $Id: tkUnixColor.c,v 1.1.4.1 1998/09/30 02:19:14 stanton Exp $ */ #include <tkColor.h> diff --git a/unix/tkUnixConfig.c b/unix/tkUnixConfig.c index 4333cdf..4569adf 100644 --- a/unix/tkUnixConfig.c +++ b/unix/tkUnixConfig.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixConfig.c 1.3 97/10/09 10:57:51 + * RCS: @(#) $Id: tkUnixConfig.c,v 1.1.2.2 1998/09/30 02:19:15 stanton Exp $ */ #include "tk.h" diff --git a/unix/tkUnixCursor.c b/unix/tkUnixCursor.c index 46000df..9123aaf 100644 --- a/unix/tkUnixCursor.c +++ b/unix/tkUnixCursor.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixCursor.c 1.7 98/02/04 13:56:12 + * RCS: @(#) $Id: tkUnixCursor.c,v 1.1.4.2 1998/09/30 02:19:15 stanton Exp $ */ #include "tkPort.h" @@ -250,7 +250,7 @@ TkGetCursorByName(interp, tkwin, string) if ((argc != 2) && (argc != 4)) { goto badString; } - if (XReadBitmapFile(display, + if (TkReadBitmapFile(display, RootWindowOfScreen(Tk_Screen(tkwin)), &argv[0][1], (unsigned int *) &width, (unsigned int *) &height, &source, &xHot, &yHot) != BitmapSuccess) { @@ -273,7 +273,7 @@ TkGetCursorByName(interp, tkwin, string) cursor = XCreatePixmapCursor(display, source, source, &fg, &fg, (unsigned) xHot, (unsigned) yHot); } else { - if (XReadBitmapFile(display, + if (TkReadBitmapFile(display, RootWindowOfScreen(Tk_Screen(tkwin)), argv[1], (unsigned int *) &maskWidth, (unsigned int *) &maskHeight, &mask, &dummy1, &dummy2) != BitmapSuccess) { diff --git a/unix/tkUnixDefault.h b/unix/tkUnixDefault.h index b1b35f5..c3dae54 100644 --- a/unix/tkUnixDefault.h +++ b/unix/tkUnixDefault.h @@ -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. * - * SCCS: @(#) tkUnixDefault.h 1.106 97/12/13 15:47:22 + * RCS: @(#) $Id: tkUnixDefault.h,v 1.1.4.2 1998/09/30 02:19:15 stanton Exp $ */ #ifndef _TKUNIXDEFAULT diff --git a/unix/tkUnixDraw.c b/unix/tkUnixDraw.c index 65bf2e4..db2af5e 100644 --- a/unix/tkUnixDraw.c +++ b/unix/tkUnixDraw.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixDraw.c 1.9 97/03/21 11:16:18 + * RCS: @(#) $Id: tkUnixDraw.c,v 1.1.4.1 1998/09/30 02:19:16 stanton Exp $ */ #include "tkPort.h" diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c index 6136905..af90cfa 100644 --- a/unix/tkUnixEmbed.c +++ b/unix/tkUnixEmbed.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. * - * SCCS: @(#) tkUnixEmbed.c 1.23 97/11/07 21:24:52 + * RCS: @(#) $Id: tkUnixEmbed.c,v 1.1.4.2 1998/09/30 02:19:16 stanton Exp $ */ #include "tkInt.h" diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index 6fc30bb..cf2e523 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixEvent.c 1.18 97/10/28 18:47:15 + * RCS: @(#) $Id: tkUnixEvent.c,v 1.1.4.2 1998/09/30 02:19:17 stanton Exp $ */ #include "tkInt.h" diff --git a/unix/tkUnixFocus.c b/unix/tkUnixFocus.c index 5c1a4f6..8a61d39 100644 --- a/unix/tkUnixFocus.c +++ b/unix/tkUnixFocus.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixFocus.c 1.9 97/10/31 09:54:04 + * RCS: @(#) $Id: tkUnixFocus.c,v 1.1.4.1 1998/09/30 02:19:17 stanton Exp $ */ #include "tkInt.h" diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c index 2a76e4d..88f31a0 100644 --- a/unix/tkUnixFont.c +++ b/unix/tkUnixFont.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixFont.c 1.22 98/02/18 17:09:20 + * RCS: @(#) $Id: tkUnixFont.c,v 1.1.4.2 1998/09/30 02:19:18 stanton Exp $ */ #include "tkUnixInt.h" diff --git a/unix/tkUnixInit.c b/unix/tkUnixInit.c index c90eb16..5096fe4 100644 --- a/unix/tkUnixInit.c +++ b/unix/tkUnixInit.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixInit.c 1.26 98/01/02 17:45:36 + * RCS: @(#) $Id: tkUnixInit.c,v 1.1.4.2 1998/09/30 02:19:18 stanton Exp $ */ #include "tkInt.h" @@ -21,13 +21,6 @@ */ #include "tkInitScript.h" - -/* - * Default directory in which to look for libraries: - */ - -static char defaultLibraryDir[200] = TK_LIBRARY; - /* *---------------------------------------------------------------------- @@ -51,12 +44,6 @@ int TkpInit(interp) Tcl_Interp *interp; { - char *libDir; - - libDir = Tcl_GetVar(interp, "tk_library", TCL_GLOBAL_ONLY); - if (libDir == NULL) { - Tcl_SetVar(interp, "tk_library", defaultLibraryDir, TCL_GLOBAL_ONLY); - } TkCreateXEventSource(); return Tcl_Eval(interp, initScript); } diff --git a/unix/tkUnixInt.h b/unix/tkUnixInt.h index bef2f38..6fb896a 100644 --- a/unix/tkUnixInt.h +++ b/unix/tkUnixInt.h @@ -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. * - * SCCS: @(#) tkUnixInt.h 1.10 97/05/15 14:47:03 + * RCS: @(#) $Id: tkUnixInt.h,v 1.1.4.2 1998/09/30 02:19:19 stanton Exp $ */ #ifndef _TKUNIXINT diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c index 6df12fc..0fc2117 100644 --- a/unix/tkUnixKey.c +++ b/unix/tkUnixKey.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixKey.c 1.3 98/01/13 17:34:38 + * RCS: @(#) $Id: tkUnixKey.c,v 1.1.2.2 1998/09/30 02:19:19 stanton Exp $ */ #include "tkInt.h" diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c index 20d7196..3ecdee7 100644 --- a/unix/tkUnixMenu.c +++ b/unix/tkUnixMenu.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixMenu.c 1.80 98/01/20 16:39:28 + * RCS: @(#) $Id: tkUnixMenu.c,v 1.1.4.2 1998/09/30 02:19:19 stanton Exp $ */ #include "tkPort.h" diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c index b5f4fd5..9f203b9 100644 --- a/unix/tkUnixMenubu.c +++ b/unix/tkUnixMenubu.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixMenubu.c 1.9 97/05/23 16:25:01 + * RCS: @(#) $Id: tkUnixMenubu.c,v 1.1.4.1 1998/09/30 02:19:20 stanton Exp $ */ #include "tkMenubutton.h" diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h index 0bc3632..4d84c0f 100644 --- a/unix/tkUnixPort.h +++ b/unix/tkUnixPort.h @@ -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. * - * SCCS: @(#) tkUnixPort.h 1.40 98/02/10 10:33:38 + * RCS: @(#) $Id: tkUnixPort.h,v 1.1.4.2 1998/09/30 02:19:21 stanton Exp $ */ #ifndef _UNIXPORT diff --git a/unix/tkUnixScale.c b/unix/tkUnixScale.c index 05b2a19..86e0cf5 100644 --- a/unix/tkUnixScale.c +++ b/unix/tkUnixScale.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixScale.c 1.5 96/07/31 14:22:29 + * RCS: @(#) $Id: tkUnixScale.c,v 1.1.4.1 1998/09/30 02:19:21 stanton Exp $ */ #include "tkScale.h" diff --git a/unix/tkUnixScrlbr.c b/unix/tkUnixScrlbr.c index 74b46e8..f776ded 100644 --- a/unix/tkUnixScrlbr.c +++ b/unix/tkUnixScrlbr.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixScrlbr.c 1.8 96/12/10 20:05:07 + * RCS: @(#) $Id: tkUnixScrlbr.c,v 1.1.4.1 1998/09/30 02:19:21 stanton Exp $ */ #include "tkScrollbar.h" diff --git a/unix/tkUnixSelect.c b/unix/tkUnixSelect.c index ff355ea..dfeb0c3 100644 --- a/unix/tkUnixSelect.c +++ b/unix/tkUnixSelect.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixSelect.c 1.6 97/11/07 21:24:34 + * RCS: @(#) $Id: tkUnixSelect.c,v 1.1.4.2 1998/09/30 02:19:22 stanton Exp $ */ #include "tkInt.h" diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c index 932c4b4..5f028e1 100644 --- a/unix/tkUnixSend.c +++ b/unix/tkUnixSend.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. * - * SCCS: @(#) tkUnixSend.c 1.76 97/11/07 21:25:10 + * RCS: @(#) $Id: tkUnixSend.c,v 1.1.4.2 1998/09/30 02:19:22 stanton Exp $ */ #include "tkPort.h" diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index 33dcd78..aecdac5 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.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. * - * SCCS: @(#) tkUnixWm.c 1.158 98/01/20 14:19:48 + * RCS: @(#) $Id: tkUnixWm.c,v 1.1.4.2 1998/09/30 02:19:23 stanton Exp $ */ #include "tkPort.h" diff --git a/unix/tkUnixXId.c b/unix/tkUnixXId.c index 2bcab2b..1d0d94b 100644 --- a/unix/tkUnixXId.c +++ b/unix/tkUnixXId.c @@ -17,7 +17,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkUnixXId.c 1.24 98/01/12 15:30:26 + * RCS: @(#) $Id: tkUnixXId.c,v 1.1.4.2 1998/09/30 02:19:24 stanton Exp $ */ /* @@ -1,10 +1,10 @@ Tk 8.1a2 for Windows by Scott Stanton -Sun Microsystems Laboratories -scott.stanton@eng.sun.com +Scriptics Corporation +scott.stanton@scriptics.com -SCCS: @(#) README 1.22 98/02/18 18:03:07 +RCS: @(#) $Id: README,v 1.1.4.2 1998/09/30 02:19:25 stanton Exp $ 1. Introduction --------------- @@ -22,7 +22,7 @@ common source release. The binary distribution is a self-extracting archive with a built-in installation script. Look for the binary release in the same location as the source release -(ftp.smli.com:/pub/tcl or any of the mirror sites). For most users, +(ftp.scriptics.com:/pub/tcl/tcl8_1 or any of the mirror sites). For most users, the binary release will be much easier to install and use. You only need the source release if you plan to modify the core of Tcl, or if you need to compile with a different compiler. With the addition of @@ -42,7 +42,8 @@ In order to compile Tk for Windows, you need the following items: Borland C++ 4.5 or later (32-bit compiler) or Visual C++ 2.x or later - + +In practice, 8.1 was built with Visual C++ 5.0 In the "win" subdirectory of the source release, you will find two files called "makefile.bc" and "makefile.vc". These are the makefiles @@ -61,12 +62,7 @@ find them. Tk looks in one of two places for the library files: 2) In the lib\tk8.1 directory under the Tcl installation directory as specified in the registry: - For Windows NT & 95: - HKEY_LOCAL_MACHINE\SOFTWARE\Sun\Tcl\8.1 - Value Name is "Root" - - For Win32s: - HKEY_CLASSES_ROOT\SOFTWARE\Sun\Tcl\8.1\ + HKEY_LOCAL_MACHINE\SOFTWARE\Scriptics\Tcl\8.0\ 2) Relative to the directory containing the current .exe. Tk will look for a directory "..\lib\tk8.1" relative to the @@ -107,13 +103,14 @@ Windows beta version of Tk: - Tk_dialog appears in the upper left corner. This is a symptom of a larger problem with "wm geometry" when applied to unmapped or iconified windows. -- Grabs do not affect native menus or the title bar. - PPM images are using the wrong translation mode for writing to files, resulting in CR/LF terminated PPM files. - Tk crashes if the display depth changes while it is running. Tk also doesn't consistently track changes in the system colors. If you have comments or bug reports for the Windows version of Tk, -please direct them to the comp.lang.tcl newsgroup or the wintcl -mailing list (see http://sunscript.sun.com/win/wintcl-list.html for -more information). +please direct them to: + +<bugs@scriptics.com> + +or post them to the newsgroup comp.lang.tcl. diff --git a/win/makefile.bc b/win/makefile.bc index f2bd900..8c59bb1 100644 --- a/win/makefile.bc +++ b/win/makefile.bc @@ -5,7 +5,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# SCCS: @(#) makefile.bc 1.75 98/02/18 18:32:57 +# RCS: @(#) $Id: makefile.bc,v 1.1.4.2 1998/09/30 02:19:26 stanton Exp $ # @@ -80,11 +80,9 @@ LNLIBS_dll = $(TCLLIBDIR)\$(TCLLIB) import32 cw32mti .path.obj=$(TMPDIR) WISHOBJS = \ - $(TMPDIR)\tkConsole.obj \ $(TMPDIR)\winMain.obj TKTESTOBJS = \ - $(TMPDIR)\tkConsole.obj \ $(TMPDIR)\tkTest.obj \ $(TMPDIR)\tkSquare.obj \ $(TMPDIR)\testMain.obj @@ -97,6 +95,7 @@ XLIBOBJS = \ $(TMPDIR)\xutil.obj TKOBJS = \ + $(TMPDIR)\tkConsole.obj \ $(TMPDIR)\tkUnixMenubu.obj \ $(TMPDIR)\tkUnixScale.obj \ $(XLIBOBJS) \ diff --git a/win/makefile.vc b/win/makefile.vc index d1b2a34..4dc4594 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -4,7 +4,7 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # Copyright (c) 1995-1997 Sun Microsystems, Inc. -# SCCS: @(#) makefile.vc 1.67 98/02/18 18:32:52 +# RCS: @(#) $Id: makefile.vc,v 1.1.4.2 1998/09/30 02:19:26 stanton Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -25,16 +25,16 @@ # TCLDIR = location of top of Tcl source heirarchy # -ROOT = .. -TMPDIR = . -TOOLS32 = c:\msdev -TCLDIR = ..\..\tcl8.1a2 +ROOT = .. +TOOLS32 = c:\progra~1\devstudio\vc +TOOLS32_rc = c:\progra~1\devstudio\sharedide +TCLDIR = ..\..\tcl8.1a2 # Set this to the appropriate value of /MACHINE: for your platform MACHINE = IX86 -# Comment the following line to compile with symbols -NODEBUG=1 +# Set NODEBUG to 0 to compile with symbols +NODEBUG = 1 # uncomment the following two lines to compile with TCL_MEM_DEBUG #DEBUGDEFINES =-DTCL_MEM_DEBUG @@ -43,28 +43,41 @@ NODEBUG=1 # Do not modify below this line ###################################################################### -VERSION = 81 +TCLNAMEPREFIX = tcl +TKNAMEPREFIX = tk +WISHNAMEPREFIX = wish +VERSION = 80 -TCLDLL = tcl$(VERSION).dll -TCLLIB = tcl$(VERSION).lib -TCLPLUGINDLL = tcl$(VERSION)p.dll -TCLPLUGINLIB = tcl$(VERSION)p.lib -TKDLL = tk$(VERSION).dll -TKLIB = tk$(VERSION).lib -TKPLUGINDLL = tk$(VERSION)p.dll -TKPLUGINLIB = tk$(VERSION)p.lib - -WISH = wish$(VERSION).exe -WISHP = wishp$(VERSION).exe -TKTEST = tktest.exe -DUMPEXTS = $(TMPDIR)\dumpexts.exe +BINROOT = . +!IF "$(NODEBUG)" == "1" +TMPDIRNAME = Release +DBGX = +!ELSE +TMPDIRNAME = Debug +DBGX = d +!ENDIF +TMPDIR = $(BINROOT)\$(TMPDIRNAME) +OUTDIRNAME = $(TMPDIRNAME) +OUTDIR = $(TMPDIR) + +TCLLIB = $(TCLNAMEPREFIX)$(VERSION)$(DBGX).lib +TCLPLUGINLIB = $(TCLNAMEPREFIX)$(VERSION)p.lib +TKDLLNAME = $(TKNAMEPREFIX)$(VERSION)$(DBGX).dll +TKDLL = $(OUTDIR)\$(TKDLLNAME) +TKLIB = $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)$(DBGX).lib +TKPLUGINDLLNAME = $(TKNAMEPREFIX)$(VERSION)p$(DBG).dll +TKPLUGINDLL = $(OUTDIR)\$(TKPLUGINDLLNAME) +TKPLUGINLIB = $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)p$(DBGX).lib + +WISH = $(OUTDIR)\$(WISHNAMEPREFIX)$(VERSION)$(DBGX).exe +WISHP = $(OUTDIR)\$(WISHNAMEPREFIX)p$(VERSION)$(DBGX).exe +TKTEST = $(OUTDIR)\$(TKNAMEPREFIX)test.exe +DUMPEXTS = $(TMPDIR)\dumpexts.exe WISHOBJS = \ - $(TMPDIR)\tkConsole.obj \ $(TMPDIR)\winMain.obj TKTESTOBJS = \ - $(TMPDIR)\tkConsole.obj \ $(TMPDIR)\tkTest.obj \ $(TMPDIR)\tkSquare.obj \ $(TMPDIR)\testMain.obj @@ -77,6 +90,7 @@ XLIBOBJS = \ $(TMPDIR)\xutil.obj TKOBJS = \ + $(TMPDIR)\tkConsole.obj \ $(TMPDIR)\tkUnixMenubu.obj \ $(TMPDIR)\tkUnixScale.obj \ $(XLIBOBJS) \ @@ -176,14 +190,14 @@ TKOBJS = \ cc32 = $(TOOLS32)\bin\cl.exe link32 = $(TOOLS32)\bin\link.exe -rc32 = $(TOOLS32)\bin\rc.exe +rc32 = $(TOOLS32_rc)\bin\rc.exe include32 = -I$(TOOLS32)\include WINDIR = $(ROOT)\win GENERICDIR = $(ROOT)\generic XLIBDIR = $(ROOT)\xlib BITMAPDIR = $(ROOT)\bitmaps -TCLLIBDIR = $(TCLDIR)\win +TCLLIBDIR = $(TCLDIR)\win\$(OUTDIRNAME) RCDIR = $(WINDIR)\rc TK_INCLUDES = -I$(WINDIR) -I$(GENERICDIR) -I$(BITMAPDIR) -I$(XLIBDIR) \ @@ -197,7 +211,7 @@ TK_CFLAGS = $(cdebug) $(cflags) $(cvarsdll) $(include32) \ # Link flags ###################################################################### -!IFDEF NODEBUG +!IF "$(NODEBUG)" == "1" ldebug = /RELEASE !ELSE ldebug = -debug:full -debugtype:cv @@ -236,14 +250,19 @@ guilibsdll = $(libcdll) $(winlibs) # Compile flags ###################################################################### -!IFDEF NODEBUG +!IF "$(NODEBUG)" == "1" +!IF "$(MACHINE)" == "ALPHA" +# MSVC on Alpha doesn't understand -Ot +cdebug = -O2i -Gs -GD +!ELSE cdebug = -Oti -Gs -GD +!ENDIF !ELSE cdebug = -Z7 -Od -WX !ENDIF # declarations common to all compiler options -ccommon = -c -W3 -nologo -YX +ccommon = -c -W3 -nologo -Fp$(TMPDIR)\ -YX !IF "$(MACHINE)" == "IX86" cflags = $(ccommon) -D_X86_=1 @@ -265,21 +284,31 @@ cvars = -DWIN32 -D_WIN32 cvarsmt = $(cvars) -D_MT cvarsdll = $(cvarsmt) -D_DLL +!IF "$(NODEBUG)" == "1" +cvarsdll = $(cvars) -MD +!ELSE +cvarsdll = $(cvars) -MDd +!ENDIF + CON_CFLAGS = $(cdebug) $(cflags) $(cvars) $(include32) -DCONSOLE ###################################################################### # Project specific targets ###################################################################### -all: $(WISH) -test: $(TKTEST) -plugin: $(TKPLUGINDLL) $(WISHP) +all: setup $(WISH) +test: setup $(TKTEST) +plugin: setup $(TKPLUGINDLL) $(WISHP) + +setup: + @mkd $(TMPDIR) + @mkd $(OUTDIR) $(TKLIB): $(TKDLL) $(TKDLL): $(TKOBJS) $(TMPDIR)\tk.res $(TMPDIR)\tk.def set LIB=$(TOOLS32)\lib - $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tk.def \ + $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tk.def \ -out:$@ $(TMPDIR)\tk.res $(TCLLIBDIR)\$(TCLLIB) \ $(guilibsdll) @<< $(TKOBJS) @@ -312,12 +341,12 @@ $(TKTEST): $(TKTESTOBJS) $(TKLIB) $(TMPDIR)\wish.res $(guilibsdll) $(TCLLIBDIR)\$(TCLLIB) $(TKLIB) $(TKTESTOBJS) $(TMPDIR)\tk.def: $(DUMPEXTS) $(TKOBJS) - $(DUMPEXTS) -o $@ $(TKDLL) @<< + $(DUMPEXTS) -o $@ $(TKDLLNAME) @<< $(TKOBJS) << $(TMPDIR)\plugin.def: $(DUMPEXTS) $(TKOBJS) - $(DUMPEXTS) -o $@ $(TKPLUGINDLL) @<< + $(DUMPEXTS) -o $@ $(TKPLUGINDLLNAME) @<< $(TKOBJS) << @@ -332,35 +361,49 @@ $(DUMPEXTS): $(TCLDIR)\win\winDumpExts.c # $(TMPDIR)\testMain.obj: $(ROOT)\win\winMain.c - $(cc32) $(TK_CFLAGS) -DTK_TEST -Fo$@ $? + $(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -DTK_TEST -Fo$@ $? + +$(TMPDIR)\tkTest.obj: $(ROOT)\generic\tkTest.c + $(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -Fo$@ $? + +$(TMPDIR)\tkSquare.obj: $(ROOT)\generic\tkSquare.c + $(cc32) $(TK_CFLAGS) -Fo$@ $? + +$(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c + $(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -Fo$@ $? # # Implicit rules # {$(XLIBDIR)}.c{$(TMPDIR)}.obj: - $(cc32) $(TK_CFLAGS) -Fo$(TMPDIR)\ $< + $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $< {$(GENERICDIR)}.c{$(TMPDIR)}.obj: - $(cc32) $(TK_CFLAGS) -Fo$(TMPDIR)\ $< + $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $< {$(WINDIR)}.c{$(TMPDIR)}.obj: - $(cc32) $(TK_CFLAGS) -Fo$(TMPDIR)\ $< + $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $< {$(ROOT)\unix}.c{$(TMPDIR)}.obj: - $(cc32) $(TK_CFLAGS) -Fo$(TMPDIR)\ $< + $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $< {$(RCDIR)}.rc{$(TMPDIR)}.res: $(rc32) -fo $@ -r -i $(GENERICDIR) $< clean: - -@del *.exp - -@del *.lib - -@del *.dll - -@del *.exe - -@del $(TMPDIR)\*.obj + -@del $(OUTDIR)\*.exp + -@del $(OUTDIR)\*.lib + -@del $(OUTDIR)\*.dll + -@del $(OUTDIR)\*.exe + -@del $(OUTDIR)\*.pdb + -@del $(TMPDIR)\*.pch + -@del $(TMPDIR)\*.obj -@del $(TMPDIR)\*.res -@del $(TMPDIR)\*.def + -@del $(TMPDIR)\*.exe + -@rmd $(OUTDIR) + -@rmd $(TMPDIR) # dependencies diff --git a/win/mkd.bat b/win/mkd.bat new file mode 100644 index 0000000..1d1365c --- /dev/null +++ b/win/mkd.bat @@ -0,0 +1,20 @@ +@echo off
+rem RCS: @(#) $Id: mkd.bat,v 1.1.4.1 1998/09/30 02:19:26 stanton Exp $ +
+if exist %1 goto end
+
+if %OS% == Windows_NT goto winnt
+
+echo Add support for Win 95 please
+goto end
+
+goto success
+
+:winnt
+md %1
+if errorlevel 1 goto end
+
+:success
+echo created directory %1
+
+:end
diff --git a/win/rc/tk.rc b/win/rc/tk.rc index b357dd9..db90945 100644 --- a/win/rc/tk.rc +++ b/win/rc/tk.rc @@ -1,4 +1,4 @@ -// SCCS: @(#) tk.rc 1.23 97/07/24 13:55:02 +// RCS: @(#) $Id: tk.rc,v 1.1.4.2 1998/09/30 02:19:42 stanton Exp $ // // Version // diff --git a/win/rc/wish.rc b/win/rc/wish.rc index 76cf124..fbddde1 100644 --- a/win/rc/wish.rc +++ b/win/rc/wish.rc @@ -1,4 +1,4 @@ -// SCCS: @(#) wish.rc 1.15 96/09/17 13:24:11 +// RCS: @(#) $Id: wish.rc,v 1.1.4.1 1998/09/30 02:19:42 stanton Exp $ // // Version // diff --git a/win/rmd.bat b/win/rmd.bat new file mode 100644 index 0000000..6490f83 --- /dev/null +++ b/win/rmd.bat @@ -0,0 +1,20 @@ +@echo off
+rem RCS: @(#) $Id: rmd.bat,v 1.1.4.1 1998/09/30 02:19:27 stanton Exp $ +
+if not exist %1 goto end
+
+if %OS% == Windows_NT goto winnt
+
+echo Add support for Win 95 please
+goto end
+
+goto success
+
+:winnt
+rmdir %1 /s /q
+if errorlevel 1 goto end
+
+:success
+echo deleted directory %1
+
+:end
diff --git a/win/tkWin.h b/win/tkWin.h index 2b10c46..a746fe8 100644 --- a/win/tkWin.h +++ b/win/tkWin.h @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWin.h 1.10 97/08/29 15:21:40 + * RCS: @(#) $Id: tkWin.h,v 1.1.4.2 1998/09/30 02:19:27 stanton Exp $ */ #ifndef _TKWIN @@ -23,6 +23,11 @@ #include <windows.h> #undef WIN32_LEAN_AND_MEAN +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif + /* * The following messages are use to communicate between a Tk toplevel * and its container window. @@ -56,4 +61,7 @@ EXTERN int Tk_TranslateWinEvent _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result)); +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLIMPORT + #endif /* _TKWIN */ diff --git a/win/tkWin32Dll.c b/win/tkWin32Dll.c index 6f69a29..48e111e 100644 --- a/win/tkWin32Dll.c +++ b/win/tkWin32Dll.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWin32Dll.c 1.14 97/08/06 18:22:18 + * RCS: @(#) $Id: tkWin32Dll.c,v 1.1.4.2 1998/09/30 02:19:27 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWin3d.c b/win/tkWin3d.c index 16e7c0e..17a015c 100644 --- a/win/tkWin3d.c +++ b/win/tkWin3d.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWin3d.c 1.7 97/08/22 12:13:12 + * RCS: @(#) $Id: tkWin3d.c,v 1.1.4.2 1998/09/30 02:19:28 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWinButton.c b/win/tkWinButton.c index 1aaa029..78e998f 100644 --- a/win/tkWinButton.c +++ b/win/tkWinButton.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinButton.c 1.14 98/01/09 09:46:46 + * RCS: @(#) $Id: tkWinButton.c,v 1.1.4.2 1998/09/30 02:19:28 stanton Exp $ */ #define OEMRESOURCE diff --git a/win/tkWinClipboard.c b/win/tkWinClipboard.c index 5d630d9..87a4d34 100644 --- a/win/tkWinClipboard.c +++ b/win/tkWinClipboard.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinClipboard.c 1.9 97/11/07 21:25:49 + * RCS: @(#) $Id: tkWinClipboard.c,v 1.1.4.2 1998/09/30 02:19:29 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWinColor.c b/win/tkWinColor.c index db38a7d..096d585 100644 --- a/win/tkWinColor.c +++ b/win/tkWinColor.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinColor.c 1.21 97/10/29 10:37:34 + * RCS: @(#) $Id: tkWinColor.c,v 1.1.4.2 1998/09/30 02:19:29 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWinConfig.c b/win/tkWinConfig.c index feb77bd..3223d81 100644 --- a/win/tkWinConfig.c +++ b/win/tkWinConfig.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinConfig.c 1.4 98/01/21 00:23:32 + * RCS: @(#) $Id: tkWinConfig.c,v 1.1.2.2 1998/09/30 02:19:30 stanton Exp $ */ #include "tk.h" diff --git a/win/tkWinCursor.c b/win/tkWinCursor.c index 85010e6..bbc18e4 100644 --- a/win/tkWinCursor.c +++ b/win/tkWinCursor.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinCursor.c 1.11 97/11/12 17:50:45 + * RCS: @(#) $Id: tkWinCursor.c,v 1.1.4.2 1998/09/30 02:19:30 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h index ecd00d2..9a6264b 100644 --- a/win/tkWinDefault.h +++ b/win/tkWinDefault.h @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinDefault.h 1.35 98/01/09 09:46:28 + * RCS: @(#) $Id: tkWinDefault.h,v 1.1.4.2 1998/09/30 02:19:30 stanton Exp $ */ #ifndef _TKWINDEFAULT diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index 11f2056..8e7573a 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinDialog.c 1.11 97/10/29 10:41:59 + * RCS: @(#) $Id: tkWinDialog.c,v 1.1.4.2 1998/09/30 02:19:31 stanton Exp $ * */ diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c index e972365..72f258e 100644 --- a/win/tkWinDraw.c +++ b/win/tkWinDraw.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. * - * SCCS: @(#) tkWinDraw.c 1.30 97/03/21 11:20:05 + * RCS: @(#) $Id: tkWinDraw.c,v 1.1.4.1 1998/09/30 02:19:31 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWinEmbed.c b/win/tkWinEmbed.c index 1e66219..9594768 100644 --- a/win/tkWinEmbed.c +++ b/win/tkWinEmbed.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. * - * SCCS: @(#) tkWinEmbed.c 1.21 97/11/07 21:59:08; + * RCS: @(#) $Id: tkWinEmbed.c,v 1.1.4.2 1998/09/30 02:19:32 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWinFont.c b/win/tkWinFont.c index d8e1647..f53351e 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.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. * - * SCCS: @(#) tkWinFont.c 1.29 98/02/04 15:55:35 + * RCS: @(#) $Id: tkWinFont.c,v 1.1.4.2 1998/09/30 02:19:33 stanton Exp $ */ #include "tkWinInt.h" @@ -55,7 +55,7 @@ typedef struct FontFamily { /* The procedure to use to draw text after * it has been converted from UTF-8 to the * encoding of this font. */ - BOOL (WINAPI *getTextExtentPointProc)(HDC, TCHAR *, int, LPSIZE); + BOOL (WINAPI *getTextExtentPoint32Proc)(HDC, TCHAR *, int, LPSIZE); /* The procedure to use to measure text after * it has been converted from UTF-8 to the * encoding of this font. */ @@ -652,7 +652,7 @@ Tk_MeasureChars( familyPtr = lastSubFontPtr->familyPtr; Tcl_UtfToExternalDString(familyPtr->encoding, source, p - source, &runString); - (*familyPtr->getTextExtentPointProc)(hdc, + (*familyPtr->getTextExtentPoint32Proc)(hdc, Tcl_DStringValue(&runString), Tcl_DStringLength(&runString) >> familyPtr->isWideFont, &size); @@ -668,7 +668,8 @@ Tk_MeasureChars( familyPtr = lastSubFontPtr->familyPtr; Tcl_UtfToExternalDString(familyPtr->encoding, source, p - source, &runString); - (*familyPtr->getTextExtentPointProc)(hdc, Tcl_DStringValue(&runString), + (*familyPtr->getTextExtentPoint32Proc)(hdc, + Tcl_DStringValue(&runString), Tcl_DStringLength(&runString) >> familyPtr->isWideFont, &size); curX += size.cx; @@ -689,7 +690,10 @@ Tk_MeasureChars( * every character individually. There is a function call that * can measure multiple characters at once and return the * offset of each of them, but it only works on NT, even though - * the documentation claims it works for 95. + * the documentation claims it works for 95. + * TODO: verify that GetTextExtentExPoint is still broken in '95, and + * possibly use it for NT anyway since it should be much faster and + * more accurate. */ next = source + Tcl_UtfToUniChar(source, &ch); @@ -711,7 +715,7 @@ Tk_MeasureChars( familyPtr = lastSubFontPtr->familyPtr; Tcl_UtfToExternal(NULL, familyPtr->encoding, p, next - p, 0, NULL, buf, sizeof(buf), &srcRead, &dstWrote, NULL); - (*familyPtr->getTextExtentPointProc)(hdc, buf, + (*familyPtr->getTextExtentPoint32Proc)(hdc, buf, dstWrote >> familyPtr->isWideFont, &size); newX += size.cx; } @@ -953,7 +957,7 @@ MultiFontTextOut( (*familyPtr->textOutProc)(hdc, x, y, Tcl_DStringValue(&runString), Tcl_DStringLength(&runString) >> familyPtr->isWideFont); - (*familyPtr->getTextExtentPointProc)(hdc, + (*familyPtr->getTextExtentPoint32Proc)(hdc, Tcl_DStringValue(&runString), Tcl_DStringLength(&runString) >> familyPtr->isWideFont, &size); @@ -1283,14 +1287,14 @@ AllocFontFamily( encoding = Tcl_GetEncoding(NULL, "unicode"); familyPtr->textOutProc = (BOOL (WINAPI *)(HDC, int, int, TCHAR *, int)) TextOutW; - familyPtr->getTextExtentPointProc = - (BOOL (WINAPI *)(HDC, TCHAR *, int, LPSIZE)) GetTextExtentPointW; + familyPtr->getTextExtentPoint32Proc = + (BOOL (WINAPI *)(HDC, TCHAR *, int, LPSIZE)) GetTextExtentPoint32W; familyPtr->isWideFont = 1; } else { familyPtr->textOutProc = (BOOL (WINAPI *)(HDC, int, int, TCHAR *, int)) TextOutA; - familyPtr->getTextExtentPointProc = - (BOOL (WINAPI *)(HDC, TCHAR *, int, LPSIZE)) GetTextExtentPointA; + familyPtr->getTextExtentPoint32Proc = + (BOOL (WINAPI *)(HDC, TCHAR *, int, LPSIZE)) GetTextExtentPoint32A; familyPtr->isWideFont = 0; } diff --git a/win/tkWinImage.c b/win/tkWinImage.c index 388a58a..5b5db88 100644 --- a/win/tkWinImage.c +++ b/win/tkWinImage.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinImage.c 1.13 97/07/07 11:19:45 + * RCS: @(#) $Id: tkWinImage.c,v 1.1.4.1 1998/09/30 02:19:33 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWinInit.c b/win/tkWinInit.c index b311bae..c4879a9 100644 --- a/win/tkWinInit.c +++ b/win/tkWinInit.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinInit.c 1.30 97/11/07 21:25:45 + * RCS: @(#) $Id: tkWinInit.c,v 1.1.4.2 1998/09/30 02:19:34 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWinInt.h b/win/tkWinInt.h index 8198b6b..48e0828 100644 --- a/win/tkWinInt.h +++ b/win/tkWinInt.h @@ -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. * - * SCCS: @(#) tkWinInt.h 1.36 97/10/02 17:30:22 + * RCS: @(#) $Id: tkWinInt.h,v 1.1.4.2 1998/09/30 02:19:34 stanton Exp $ */ #ifndef _TKWININT diff --git a/win/tkWinKey.c b/win/tkWinKey.c index bc74c43..c864bcb 100644 --- a/win/tkWinKey.c +++ b/win/tkWinKey.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinKey.c 1.11 98/01/13 20:26:49 + * RCS: @(#) $Id: tkWinKey.c,v 1.1.4.2 1998/09/30 02:19:35 stanton Exp $ */ #include "tkWinInt.h" @@ -72,6 +72,16 @@ static Keys keymap[] = { VK_F24, XK_F24, VK_NUMLOCK, XK_Num_Lock, VK_SCROLL, XK_Scroll_Lock, + + /* + * The following support the new keys in the Microsoft keyboard. + * Win_L and Win_R have the windows logo. App has the menu. + */ + + VK_LWIN, XK_Win_L, + VK_RWIN, XK_Win_R, + VK_APPS, XK_App, + 0, NoSymbol }; diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 44f53fc..47915ae 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -1,14 +1,14 @@ /* * tkWinMenu.c -- * - * This module implements the Windows-platform specific features of menus. + * This module implements the Windows platform-specific features of menus. * * Copyright (c) 1996-1998 by Sun Microsystems, Inc. * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinMenu.c 1.110 98/01/26 19:43:53 + * RCS: @(#) $Id: tkWinMenu.c,v 1.1.4.2 1998/09/30 02:19:35 stanton Exp $ */ #define OEMRESOURCE @@ -323,35 +323,51 @@ TkpDestroyMenu(menuPtr) Tcl_CancelIdleCall(ReconfigureWindowsMenu, (ClientData) menuPtr); } - if (NULL != winMenuHdl) { - if (menuPtr->menuFlags & MENU_SYSTEM_MENU) { - TkMenuEntry *searchEntryPtr; - Tcl_HashTable *tablePtr = TkGetMenuHashTable(menuPtr->interp); - char *menuName = Tcl_GetHashKey(tablePtr, - menuPtr->menuRefPtr->hashEntryPtr); - - for (searchEntryPtr = menuPtr->menuRefPtr->parentEntryPtr; - searchEntryPtr != NULL; - searchEntryPtr = searchEntryPtr->nextCascadePtr) { - searchName = Tcl_GetStringFromObj(searchEntryPtr->namePtr, - NULL); - if (strcmp(searchName, - menuName) == 0) { - Tk_Window parentTopLevelPtr = searchEntryPtr - ->menuPtr->parentTopLevelPtr; - - if (parentTopLevelPtr != NULL) { - GetSystemMenu(TkWinGetWrapperWindow(parentTopLevelPtr), - TRUE); - } - break; + if (winMenuHdl == NULL) { + return; + } + + if (menuPtr->menuFlags & MENU_SYSTEM_MENU) { + TkMenuEntry *searchEntryPtr; + Tcl_HashTable *tablePtr = TkGetMenuHashTable(menuPtr->interp); + char *menuName = Tcl_GetHashKey(tablePtr, + menuPtr->menuRefPtr->hashEntryPtr); + + /* + * Search for the menu in the menubar, if it is present, get the + * wrapper window associated with the toplevel and reset its + * system menu to the default menu. + */ + + for (searchEntryPtr = menuPtr->menuRefPtr->parentEntryPtr; + searchEntryPtr != NULL; + searchEntryPtr = searchEntryPtr->nextCascadePtr) { + searchName = Tcl_GetStringFromObj(searchEntryPtr->namePtr, NULL); + if (strcmp(searchName, menuName) == 0) { + Tk_Window parentTopLevelPtr = searchEntryPtr + ->menuPtr->parentTopLevelPtr; + + if (parentTopLevelPtr != NULL) { + GetSystemMenu(TkWinGetWrapperWindow(parentTopLevelPtr), + TRUE); } + break; } - } else { - DestroyMenu(winMenuHdl); } - menuPtr->platformData = NULL; + } else { + Tcl_HashEntry *hashEntryPtr; + + /* + * Remove the menu from the menu hash table, then destroy the handle. + */ + + hashEntryPtr = Tcl_FindHashEntry(&winMenuTable, (char *) winMenuHdl); + if (hashEntryPtr != NULL) { + Tcl_DeleteHashEntry(hashEntryPtr); + } + DestroyMenu(winMenuHdl); } + menuPtr->platformData = NULL; } /* @@ -538,7 +554,7 @@ ReconfigureWindowsMenu( if ((menuPtr->menuType == MENUBAR) && (menuPtr->parentTopLevelPtr != NULL)) { width = Tk_Width(menuPtr->parentTopLevelPtr); - height = Tk_Width(menuPtr->parentTopLevelPtr); + height = Tk_Height(menuPtr->parentTopLevelPtr); } base = (menuPtr->menuFlags & MENU_SYSTEM_MENU) ? 7 : 0; @@ -599,58 +615,55 @@ ReconfigureWindowsMenu( } itemID = (int) mePtr->platformEntryData; - if (mePtr->type == CASCADE_ENTRY) { - if ((mePtr->childMenuRefPtr != NULL) - && (mePtr->childMenuRefPtr->menuPtr != NULL)) { - HMENU childMenuHdl = - (HMENU) mePtr->childMenuRefPtr->menuPtr - ->platformData; - if (childMenuHdl != NULL) { - itemID = (UINT) childMenuHdl; - flags |= MF_POPUP; - } - if ((menuPtr->menuType == MENUBAR) - && !(mePtr->childMenuRefPtr->menuPtr->menuFlags - & MENU_SYSTEM_MENU)) { - TkMenuReferences *menuRefPtr; - TkMenu *systemMenuPtr = mePtr->childMenuRefPtr - ->menuPtr; - char *systemMenuName = ckalloc(strlen( - Tk_PathName(menuPtr->masterMenuPtr->tkwin)) - + strlen(".system") + 1); - menuRefPtr = TkFindMenuReferences(menuPtr->interp, - systemMenuName); - if ((menuRefPtr != NULL) - && (menuRefPtr->menuPtr != NULL) - && (menuPtr->parentTopLevelPtr != NULL) - && (systemMenuPtr->masterMenuPtr - == menuRefPtr->menuPtr)) { - HMENU systemMenuHdl = - (HMENU) systemMenuPtr->platformData; - HWND wrapper = TkWinGetWrapperWindow(menuPtr - ->parentTopLevelPtr); - if (wrapper != NULL) { - DestroyMenu(systemMenuHdl); - systemMenuHdl = GetSystemMenu( - wrapper, FALSE); - systemMenuPtr->menuFlags |= MENU_SYSTEM_MENU; - systemMenuPtr->platformData = - (TkMenuPlatformData) systemMenuHdl; - if (!(systemMenuPtr->menuFlags - & MENU_RECONFIGURE_PENDING)) { - systemMenuPtr->menuFlags - |= MENU_RECONFIGURE_PENDING; - Tcl_DoWhenIdle(ReconfigureWindowsMenu, - (ClientData) systemMenuPtr); - } + if ((mePtr->type == CASCADE_ENTRY) + && (mePtr->childMenuRefPtr != NULL) + && (mePtr->childMenuRefPtr->menuPtr != NULL)) { + HMENU childMenuHdl = (HMENU) mePtr->childMenuRefPtr->menuPtr + ->platformData; + if (childMenuHdl != NULL) { + itemID = (UINT) childMenuHdl; + flags |= MF_POPUP; + } + if ((menuPtr->menuType == MENUBAR) + && !(mePtr->childMenuRefPtr->menuPtr->menuFlags + & MENU_SYSTEM_MENU)) { + TkMenuReferences *menuRefPtr; + TkMenu *systemMenuPtr = mePtr->childMenuRefPtr + ->menuPtr; + char *systemMenuName = ckalloc(strlen( + Tk_PathName(menuPtr->masterMenuPtr->tkwin)) + + strlen(".system") + 1); + menuRefPtr = TkFindMenuReferences(menuPtr->interp, + systemMenuName); + if ((menuRefPtr != NULL) + && (menuRefPtr->menuPtr != NULL) + && (menuPtr->parentTopLevelPtr != NULL) + && (systemMenuPtr->masterMenuPtr + == menuRefPtr->menuPtr)) { + HMENU systemMenuHdl = + (HMENU) systemMenuPtr->platformData; + HWND wrapper = TkWinGetWrapperWindow(menuPtr + ->parentTopLevelPtr); + if (wrapper != NULL) { + DestroyMenu(systemMenuHdl); + systemMenuHdl = GetSystemMenu(wrapper, FALSE); + systemMenuPtr->menuFlags |= MENU_SYSTEM_MENU; + systemMenuPtr->platformData = + (TkMenuPlatformData) systemMenuHdl; + if (!(systemMenuPtr->menuFlags + & MENU_RECONFIGURE_PENDING)) { + systemMenuPtr->menuFlags + |= MENU_RECONFIGURE_PENDING; + Tcl_DoWhenIdle(ReconfigureWindowsMenu, + (ClientData) systemMenuPtr); } } - ckfree(systemMenuName); - } - if (mePtr->childMenuRefPtr->menuPtr->menuFlags - & MENU_SYSTEM_MENU) { - systemMenu++; } + ckfree(systemMenuName); + } + if (mePtr->childMenuRefPtr->menuPtr->menuFlags + & MENU_SYSTEM_MENU) { + systemMenu++; } } } @@ -894,7 +907,18 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult) ReconfigureWindowsMenu((ClientData) menuPtr); } if (!inPostMenu) { - TkPreprocessMenu(menuPtr); + Tcl_Interp *interp; + int code; + + interp = menuPtr->interp; + Tcl_Preserve((ClientData)interp); + code = TkPreprocessMenu(menuPtr); + if ((code != TCL_OK) && (code != TCL_CONTINUE) + && (code != TCL_BREAK)) { + Tcl_AddErrorInfo(interp, "\n (menu preprocess)"); + Tcl_BackgroundError(interp); + } + Tcl_Release((ClientData)interp); } TkActivateMenuEntry(menuPtr, -1); *plResult = 0; @@ -907,64 +931,68 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult) case WM_SYSCOMMAND: case WM_COMMAND: { TkMenuInit(); - if (HIWORD(*pwParam) == 0) { - hashEntryPtr = Tcl_FindHashEntry(&commandTable, - (char *)LOWORD(*pwParam)); - if (hashEntryPtr != NULL) { - mePtr = (TkMenuEntry *) Tcl_GetHashValue(hashEntryPtr); - if (mePtr != NULL) { - TkMenuReferences *menuRefPtr; - TkMenuEntry *parentEntryPtr; - int code; - - /* - * We have to set the parent of this menu to be active - * if this is a submenu so that tearoffs will get the - * correct title. - */ - - menuPtr = mePtr->menuPtr; - menuRefPtr = TkFindMenuReferences(menuPtr->interp, - Tk_PathName(menuPtr->tkwin)); - if ((menuRefPtr != NULL) - && (menuRefPtr->parentEntryPtr != NULL)) { - char *name; - int state; - - for (parentEntryPtr = menuRefPtr->parentEntryPtr; - ; - parentEntryPtr = - parentEntryPtr->nextCascadePtr) { - name = Tcl_GetStringFromObj( - parentEntryPtr->namePtr, NULL); - if (strcmp(name, Tk_PathName(menuPtr->tkwin)) - == 0) { - break; - } - } - Tcl_GetIndexFromObj(NULL, parentEntryPtr->menuPtr - ->entries[parentEntryPtr->index] - ->statePtr, tkMenuStateStrings, NULL, - 0, &state); - if (state != ENTRY_DISABLED) { - TkActivateMenuEntry(parentEntryPtr->menuPtr, - parentEntryPtr->index); - } - } - - code = TkInvokeMenu(mePtr->menuPtr->interp, - menuPtr, mePtr->index); - if (code != TCL_OK && code != TCL_CONTINUE - && code != TCL_BREAK) { - Tcl_AddErrorInfo(mePtr->menuPtr->interp, - "\n (menu invoke)"); - Tcl_BackgroundError(mePtr->menuPtr->interp); - } + if (HIWORD(*pwParam) != 0) { + break; + } + hashEntryPtr = Tcl_FindHashEntry(&commandTable, + (char *)LOWORD(*pwParam)); + if (hashEntryPtr == NULL) { + break; + } + mePtr = (TkMenuEntry *) Tcl_GetHashValue(hashEntryPtr); + if (mePtr != NULL) { + TkMenuReferences *menuRefPtr; + TkMenuEntry *parentEntryPtr; + Tcl_Interp *interp; + int code; + + /* + * We have to set the parent of this menu to be active + * if this is a submenu so that tearoffs will get the + * correct title. + */ + + menuPtr = mePtr->menuPtr; + menuRefPtr = TkFindMenuReferences(menuPtr->interp, + Tk_PathName(menuPtr->tkwin)); + if ((menuRefPtr != NULL) + && (menuRefPtr->parentEntryPtr != NULL)) { + char *name; + int state; + + for (parentEntryPtr = menuRefPtr->parentEntryPtr; + ; + parentEntryPtr = + parentEntryPtr->nextCascadePtr) { + name = Tcl_GetStringFromObj( + parentEntryPtr->namePtr, NULL); + if (strcmp(name, Tk_PathName(menuPtr->tkwin)) + == 0) { + break; + } } - *plResult = 0; - returnResult = 1; + Tcl_GetIndexFromObj(NULL, parentEntryPtr->menuPtr + ->entries[parentEntryPtr->index] + ->statePtr, tkMenuStateStrings, NULL, + 0, &state); + if (state != ENTRY_DISABLED) { + TkActivateMenuEntry(parentEntryPtr->menuPtr, + parentEntryPtr->index); + } + } + + interp = menuPtr->interp; + Tcl_Preserve((ClientData)interp); + code = TkInvokeMenu(interp, menuPtr, mePtr->index); + if (code != TCL_OK && code != TCL_CONTINUE + && code != TCL_BREAK) { + Tcl_AddErrorInfo(interp, "\n (menu invoke)"); + Tcl_BackgroundError(interp); } + Tcl_Release((ClientData)interp); } + *plResult = 0; + returnResult = 1; break; } @@ -992,10 +1020,10 @@ TkWinHandleMenuEvent(phwnd, pMessage, pwParam, plParam, plResult) == CharUpper((LPTSTR) (unsigned char) label[underline]))) { *plResult = (2 << 16) | i; + returnResult = 1; break; } } - returnResult = 1; } break; } @@ -1764,6 +1792,7 @@ MenuKeyBindProc(clientData, interp, eventPtr, tkwin, keySym) UINT scanCode; UINT virtualKey; TkWindow *winPtr = (TkWindow *)tkwin; + int i; if (eventPtr->type == KeyPress) { switch (keySym) { @@ -1791,6 +1820,15 @@ MenuKeyBindProc(clientData, interp, eventPtr, tkwin, keySym) CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)), WM_SYSKEYDOWN, virtualKey, ((scanCode << 16) | (1 << 29))); + if (eventPtr->xkey.nchars > 0) { + for (i = 0; i < eventPtr->xkey.nchars; i++) { + CallWindowProc(DefWindowProc, + Tk_GetHWND(Tk_WindowId(tkwin)), + WM_SYSCHAR, + eventPtr->xkey.trans_chars[i], + ((scanCode << 16) | (1 << 29))); + } + } } } } else if (eventPtr->type == KeyRelease) { diff --git a/win/tkWinPixmap.c b/win/tkWinPixmap.c index 1ca2d7e..7ee6952 100644 --- a/win/tkWinPixmap.c +++ b/win/tkWinPixmap.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinPixmap.c 1.18 97/08/06 15:36:23 + * RCS: @(#) $Id: tkWinPixmap.c,v 1.1.4.1 1998/09/30 02:19:36 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWinPointer.c b/win/tkWinPointer.c index 96661ae..7820084 100644 --- a/win/tkWinPointer.c +++ b/win/tkWinPointer.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinPointer.c 1.28 97/10/31 08:40:07 + * RCS: @(#) $Id: tkWinPointer.c,v 1.1.4.1 1998/09/30 02:19:36 stanton Exp $ */ #include "tkWinInt.h" @@ -409,6 +409,15 @@ TkpChangeFocus(winPtr, force) if (winPtr->window == None) { panic("ChangeXFocus got null X window"); } + + /* + * Change the foreground window so the focus window is raised to the top of + * the system stacking order and gets the keyboard focus. + */ + + if (force) { + SetForegroundWindow(Tk_GetHWND(winPtr->window)); + } XSetInputFocus(dispPtr->display, winPtr->window, RevertToParent, CurrentTime); diff --git a/win/tkWinPort.h b/win/tkWinPort.h index c2e9658..333f7ed 100644 --- a/win/tkWinPort.h +++ b/win/tkWinPort.h @@ -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. * - * SCCS: @(#) tkWinPort.h 1.27 98/02/10 10:35:52 + * RCS: @(#) $Id: tkWinPort.h,v 1.1.4.2 1998/09/30 02:19:37 stanton Exp $ */ #ifndef _WINPORT diff --git a/win/tkWinRegion.c b/win/tkWinRegion.c index 3303022..2d10481 100644 --- a/win/tkWinRegion.c +++ b/win/tkWinRegion.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinRegion.c 1.7 96/05/03 11:05:54 + * RCS: @(#) $Id: tkWinRegion.c,v 1.1.4.1 1998/09/30 02:19:37 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWinScrlbr.c b/win/tkWinScrlbr.c index 613469f..28314c9 100644 --- a/win/tkWinScrlbr.c +++ b/win/tkWinScrlbr.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinScrlbr.c 1.20 97/11/07 21:25:53 + * RCS: @(#) $Id: tkWinScrlbr.c,v 1.1.4.2 1998/09/30 02:19:37 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWinSend.c b/win/tkWinSend.c index 120ccf9..1f82b93 100644 --- a/win/tkWinSend.c +++ b/win/tkWinSend.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. * - * SCCS: @(#) tkWinSend.c 1.15 98/02/19 17:04:54 + * RCS: @(#) $Id: tkWinSend.c,v 1.1.4.2 1998/09/30 02:19:38 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWinTest.c b/win/tkWinTest.c index 3ca00d4..4af98dc 100644 --- a/win/tkWinTest.c +++ b/win/tkWinTest.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinTest.c 1.4 97/11/07 21:26:18 + * RCS: @(#) $Id: tkWinTest.c,v 1.1.2.2 1998/09/30 02:19:38 stanton Exp $ */ #include "tkWinInt.h" diff --git a/win/tkWinWindow.c b/win/tkWinWindow.c index ab723c4..3ddc67b 100644 --- a/win/tkWinWindow.c +++ b/win/tkWinWindow.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinWindow.c 1.25 97/12/08 15:16:32 + * RCS: @(#) $Id: tkWinWindow.c,v 1.1.4.2 1998/09/30 02:19:39 stanton Exp $ */ #include "tkWinInt.h" @@ -261,9 +261,9 @@ TkpMakeWindow(winPtr, parent) * stacking order. */ - hwnd = CreateWindow(TK_WIN_CHILD_CLASS_NAME, NULL, style, - Tk_X(winPtr), Tk_Y(winPtr), Tk_Width(winPtr), Tk_Height(winPtr), - parentWin, NULL, Tk_GetHINSTANCE(), NULL); + hwnd = CreateWindowEx(WS_EX_NOPARENTNOTIFY, TK_WIN_CHILD_CLASS_NAME, NULL, + style, Tk_X(winPtr), Tk_Y(winPtr), Tk_Width(winPtr), + Tk_Height(winPtr), parentWin, NULL, Tk_GetHINSTANCE(), NULL); SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); return Tk_AttachHWND((Tk_Window)winPtr, hwnd); diff --git a/win/tkWinWm.c b/win/tkWinWm.c index c81e137..4d0d887 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -11,12 +11,23 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinWm.c 1.68 97/11/07 21:25:21 + * RCS: @(#) $Id: tkWinWm.c,v 1.1.4.2 1998/09/30 02:19:39 stanton Exp $ */ #include "tkWinInt.h" /* + * Event structure for synthetic activation events. These events are + * placed on the event queue whenever a toplevel gets a WM_MOUSEACTIVATE + * message. + */ + +typedef struct ActivateEvent { + Tcl_Event ev; + TkWindow *winPtr; +} ActivateEvent; + +/* * A data structure of the following type holds information for * each window manager protocol (such as WM_DELETE_WINDOW) for * which a handler (i.e. a Tcl command) has been defined for a @@ -211,7 +222,8 @@ typedef struct TkWmInfo { #define WM_TRANSIENT_STYLE \ (WS_POPUP|WS_CAPTION|WS_SYSMENU|WS_CLIPSIBLINGS|CS_DBLCLKS) -#define EX_TRANSIENT_STYLE (WS_EX_TOOLWINDOW | WS_EX_DLGMODALFRAME) +#define EX_TRANSIENT_STYLE \ + (WS_EX_TOOLWINDOW|WS_EX_DLGMODALFRAME) /* * This module keeps a list of all top-level windows. @@ -282,6 +294,8 @@ static int firstWindow = 1; * Forward declarations for procedures defined in this file: */ +static int ActivateWindow _ANSI_ARGS_((Tcl_Event *evPtr, + int flags)); static void ConfigureEvent _ANSI_ARGS_((TkWindow *winPtr, XConfigureEvent *eventPtr)); static void ConfigureTopLevel _ANSI_ARGS_((WINDOWPOS *pos)); @@ -731,6 +745,13 @@ UpdateWrapper(winPtr) if (oldWrapper && (oldWrapper != wmPtr->wrapper) && (oldWrapper != GetDesktopWindow())) { SetWindowLong(oldWrapper, GWL_USERDATA, (LONG) NULL); + + /* + * Remove the menubar before destroying the window so the menubar + * isn't destroyed. + */ + + SetMenu(oldWrapper, NULL); DestroyWindow(oldWrapper); } wmPtr->flags &= ~WM_NEVER_MAPPED; @@ -1361,6 +1382,9 @@ Tk_WmCmd(clientData, interp, argc, argv) argv[0], " frame window\"", (char *) NULL); return TCL_ERROR; } + if (Tk_WindowId((Tk_Window) winPtr) == None) { + Tk_MakeWindowExist((Tk_Window) winPtr); + } hwnd = wmPtr->wrapper; if (hwnd == NULL) { hwnd = Tk_GetHWND(Tk_WindowId((Tk_Window) winPtr)); @@ -3991,6 +4015,44 @@ WmProc(hwnd, message, wParam, lParam) result = 0; goto done; + case WM_NCHITTEST: { + winPtr = GetTopLevel(hwnd); + if (winPtr && (TkGrabState(winPtr) == TK_GRAB_EXCLUDED)) { + /* + * This window is outside the grab heirarchy, so don't let any + * of the normal non-client processing occur. Note that this + * implementation is not strictly correct because the grab + * might change between now and when the event would have been + * processed by Tk, but it's close enough. + */ + + result = HTCLIENT; + goto done; + } + break; + } + + case WM_MOUSEACTIVATE: { + ActivateEvent *eventPtr; + winPtr = GetTopLevel((HWND) wParam); + + /* + * Don't activate the window yet since there may be grabs + * that should take precedence. Instead we need to queue + * an event so we can check the grab state right before we + * handle the mouse event. + */ + + if (winPtr) { + eventPtr = (ActivateEvent *)ckalloc(sizeof(ActivateEvent)); + eventPtr->ev.proc = ActivateWindow; + eventPtr->winPtr = winPtr; + Tcl_QueueEvent((Tcl_Event*)eventPtr, TCL_QUEUE_TAIL); + } + result = MA_NOACTIVATE; + goto done; + } + default: break; } @@ -4145,3 +4207,43 @@ TkpGetWrapperWindow( } return winPtr; } + +/* + *---------------------------------------------------------------------- + * + * ActivateWindow -- + * + * This function is called when an ActivateEvent is processed. + * + * Results: + * Returns 1 to indicate that the event was handled, else 0. + * + * Side effects: + * May activate the toplevel window associated with the event. + * + *---------------------------------------------------------------------- + */ + +static int +ActivateWindow( + Tcl_Event *evPtr, /* Pointer to ActivateEvent. */ + int flags) /* Notifier event mask. */ +{ + TkWindow *winPtr; + + if (! (flags & TCL_WINDOW_EVENTS)) { + return 0; + } + + winPtr = ((ActivateEvent *) evPtr)->winPtr; + + /* + * Ensure that the window is not excluded by a grab. + */ + + if (winPtr && (TkGrabState(winPtr) != TK_GRAB_EXCLUDED)) { + SetFocus(Tk_GetHWND(winPtr->window)); + } + + return 1; +} diff --git a/win/tkWinX.c b/win/tkWinX.c index 579eaf7..3ef489b 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) tkWinX.c 1.55 98/01/21 00:23:17 + * RCS: @(#) $Id: tkWinX.c,v 1.1.4.2 1998/09/30 02:19:40 stanton Exp $ */ #include "tkWinInt.h" @@ -592,6 +592,11 @@ Tk_TranslateWinEvent(hwnd, message, wParam, lParam, resultPtr) case WM_KEYUP: GenerateXEvent(hwnd, message, wParam, lParam); return 1; + case WM_MENUCHAR: + GenerateXEvent(hwnd, message, wParam, lParam); + /* MNC_CLOSE is the only one that looks right. This is a hack. */ + *resultPtr = MAKELONG (0, MNC_CLOSE); + return 1; } return 0; } @@ -935,10 +940,20 @@ GetTranslatedKey(xkey) while ((xkey->nbytes < XMaxTransChars) && PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) { - if (msg.message == WM_CHAR) { + if ((msg.message == WM_CHAR) || (msg.message == WM_SYSCHAR)) { + xkey->trans_chars[xkey->nchars] = (char) msg.wParam; + xkey->nchars++; GetMessage(&msg, NULL, 0, 0); - if (msg.lParam & 0x20000000) { + /* + * If this is a normal character message, we may need to strip + * off the Alt modifier (e.g. Alt-digits). Note that we don't + * want to do this for system messages, because those were + * presumably generated as an Alt-char sequence (e.g. accelerator + * keys). + */ + + if ((msg.message == WM_CHAR) && (msg.lParam & 0x20000000)) { xkey->state = 0; } buf[xkey->nbytes] = (char) msg.wParam; diff --git a/win/winMain.c b/win/winMain.c index 691aa91..22b7bbc 100644 --- a/win/winMain.c +++ b/win/winMain.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) winMain.c 1.37 98/01/20 22:47:06 + * RCS: @(#) $Id: winMain.c,v 1.1.4.2 1998/09/30 02:19:41 stanton Exp $ */ #include <tk.h> @@ -200,9 +200,7 @@ WishPanic TCL_VARARGS_DEF(char *,arg1) MessageBox(NULL, buf, "Fatal Error in Wish", MB_ICONSTOP | MB_OK | MB_TASKMODAL | MB_SETFOREGROUND); #ifdef _MSC_VER - _asm { - int 3 - } + DebugBreak(); #endif ExitProcess(1); } diff --git a/xlib/X11/keysymdef.h b/xlib/X11/keysymdef.h index 2c6d4a7..b22d41b 100644 --- a/xlib/X11/keysymdef.h +++ b/xlib/X11/keysymdef.h @@ -84,6 +84,11 @@ SOFTWARE. #define XK_End 0xFF57 /* EOL */ #define XK_Begin 0xFF58 /* BOL */ +/* Special Windows keyboard keys */ + +#define XK_Win_L 0xFF5B /* Left-hand Windows */ +#define XK_Win_R 0xFF5C /* Right-hand Windows */ +#define XK_App 0xFF5D /* Menu key */ /* Misc Functions */ diff --git a/xlib/xbytes.h b/xlib/xbytes.h index 6cf3d56..d2430c4 100644 --- a/xlib/xbytes.h +++ b/xlib/xbytes.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) xbytes.h 1.1 95/05/09 17:32:51 + * RCS: @(#) $Id: xbytes.h,v 1.1.4.1 1998/09/30 02:19:43 stanton Exp $ */ #ifndef _XBYTES diff --git a/xlib/xcolors.c b/xlib/xcolors.c index 800d688..d5471e3 100644 --- a/xlib/xcolors.c +++ b/xlib/xcolors.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) xcolors.c 1.6 97/09/02 09:41:50 + * RCS: @(#) $Id: xcolors.c,v 1.1.4.1 1998/09/30 02:19:43 stanton Exp $ */ #include <tkInt.h> diff --git a/xlib/xdraw.c b/xlib/xdraw.c index 8e78011..6549d87 100644 --- a/xlib/xdraw.c +++ b/xlib/xdraw.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) xdraw.c 1.2 96/02/15 18:55:46 + * RCS: @(#) $Id: xdraw.c,v 1.1.4.1 1998/09/30 02:19:44 stanton Exp $ */ #include "tk.h" @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) xgc.c 1.8 96/10/11 14:59:39 + * RCS: @(#) $Id: xgc.c,v 1.1.4.1 1998/09/30 02:19:44 stanton Exp $ */ #include <tkInt.h> diff --git a/xlib/ximage.c b/xlib/ximage.c index 057e973..8446317 100644 --- a/xlib/ximage.c +++ b/xlib/ximage.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) ximage.c 1.6 96/07/23 16:59:10 + * RCS: @(#) $Id: ximage.c,v 1.1.4.1 1998/09/30 02:19:45 stanton Exp $ */ #include "tkInt.h" @@ -21,6 +21,11 @@ * * Construct a single plane pixmap from bitmap data. * + * NOTE: This procedure has the correct behavior on Windows and + * the Macintosh, but not on UNIX. This is probably because the + * emulation for XPutImage on those platforms compensates for whatever + * is wrong here :-) + * * Results: * Returns a new Pixmap. * @@ -64,52 +69,3 @@ XCreateBitmapFromData(display, d, data, width, height) XFreeGC(display, gc); return pix; } - -/* - *---------------------------------------------------------------------- - * - * XReadBitmapFile -- - * - * Loads a bitmap image in X bitmap format into the specified - * drawable. - * - * Results: - * Sets the size, hotspot, and bitmap on success. - * - * Side effects: - * Creates a new bitmap from the file data. - * - *---------------------------------------------------------------------- - */ - -int -XReadBitmapFile(display, d, filename, width_return, height_return, - bitmap_return, x_hot_return, y_hot_return) - Display* display; - Drawable d; - _Xconst char* filename; - unsigned int* width_return; - unsigned int* height_return; - Pixmap* bitmap_return; - int* x_hot_return; - int* y_hot_return; -{ - Tcl_Interp *dummy; - char *data; - - dummy = Tcl_CreateInterp(); - - data = TkGetBitmapData(dummy, NULL, (char *) filename, - (int *) width_return, (int *) height_return, x_hot_return, - y_hot_return); - if (data == NULL) { - return BitmapFileInvalid; - } - - *bitmap_return = XCreateBitmapFromData(display, d, data, *width_return, - *height_return); - - Tcl_DeleteInterp(dummy); - ckfree(data); - return BitmapSuccess; -} diff --git a/xlib/xutil.c b/xlib/xutil.c index 1080ff9..3bb4fb1 100644 --- a/xlib/xutil.c +++ b/xlib/xutil.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * SCCS: @(#) xutil.c 1.10 96/04/09 23:26:21 + * RCS: @(#) $Id: xutil.c,v 1.1.4.1 1998/09/30 02:19:45 stanton Exp $ */ #include <stdlib.h> |