summaryrefslogtreecommitdiffstats
path: root/mac
diff options
context:
space:
mode:
authorhobbs <hobbs>2001-04-04 21:39:48 (GMT)
committerhobbs <hobbs>2001-04-04 21:39:48 (GMT)
commit421970aa986ae4994096b07aa3cecf2151fcfd06 (patch)
tree60736802878db7c163d64f4df9ce4f39ff02be2b /mac
parent1c86bf4939222cf74637dcc9711233d08be2d7c5 (diff)
downloadtk-421970aa986ae4994096b07aa3cecf2151fcfd06.zip
tk-421970aa986ae4994096b07aa3cecf2151fcfd06.tar.gz
tk-421970aa986ae4994096b07aa3cecf2151fcfd06.tar.bz2
* generic/tkInt.decls: removed superfluous declarations.
* generic/tkIntDecls.h: * generic/tkIntPlatDecls.h: * generic/tkMain.c: include unistd.h for mac. * generic/tkPointer.c: include tkMacInt.h for mac. * generic/tkStubInit.c: * generic/tkStubLib.c: * mac/MW_TkHeader.pch: * mac/MW_TkOldImgHeader.h: * mac/MW_TkTestHeader.pch: * mac/tclets.r: * mac/tkMac.h: * mac/tkMacAppearanceStubs.c: * mac/tkMacApplication.r: * mac/tkMacButton.c: * mac/tkMacDialog.c: support for -filetypes * mac/tkMacFont.c: * mac/tkMacInt.h: * mac/tkMacLibrary.r: * mac/tkMacMDEF.r: * mac/tkMacMenu.c: * mac/tkMacMenus.c: * mac/tkMacPort.h: * mac/tkMacResource.r: * mac/tkMacScrlbr.c: improved scrollbar code * mac/tkMacWindowMgr.c: added control of floating windows * mac/tkMacWm.c: improved use of precompiled headers, better support for Appearance Manager, change copyrights, resource files, use DLLIMPORT/DLLEXPORT, comment corrections.
Diffstat (limited to 'mac')
-rw-r--r--mac/MW_TkHeader.pch29
-rwxr-xr-xmac/MW_TkOldImgHeader.h2
-rwxr-xr-xmac/MW_TkTestHeader.pch35
-rwxr-xr-xmac/tclets.r262
-rw-r--r--mac/tkMac.h30
-rwxr-xr-xmac/tkMacAppearanceStubs.c2
-rw-r--r--mac/tkMacApplication.r8
-rw-r--r--mac/tkMacButton.c3
-rw-r--r--mac/tkMacDialog.c26
-rw-r--r--mac/tkMacFont.c4
-rw-r--r--mac/tkMacInt.h28
-rw-r--r--mac/tkMacLibrary.r8
-rw-r--r--mac/tkMacMDEF.r32
-rw-r--r--mac/tkMacMenu.c26
-rw-r--r--mac/tkMacMenus.c10
-rw-r--r--mac/tkMacPort.h17
-rw-r--r--mac/tkMacResource.r36
-rw-r--r--mac/tkMacScrlbr.c29
-rw-r--r--mac/tkMacWindowMgr.c14
-rw-r--r--mac/tkMacWm.c7
20 files changed, 310 insertions, 298 deletions
diff --git a/mac/MW_TkHeader.pch b/mac/MW_TkHeader.pch
index f5dcc1d..e1ccdf3 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.
*
- * RCS: @(#) $Id: MW_TkHeader.pch,v 1.3 1998/11/11 17:28:50 jingham Exp $
+ * RCS: @(#) $Id: MW_TkHeader.pch,v 1.3.18.1 2001/04/04 21:39:48 hobbs Exp $
*/
/*
@@ -31,29 +31,4 @@
#pragma precompile_target "MW_TkHeader68K"
#endif
-#include "tclMacCommonPch.h"
-
-#ifdef TCL_DEBUG
- #define TK_TEST
-#endif
-
-/*
- * The following defines are for the Xlib.h file to force
- * it to generate prototypes in the way we need it. This is
- * defined here in case X.h & company are ever included before
- * tk.h.
- */
-
-#define NeedFunctionPrototypes 1
-#define NeedWidePrototypes 0
-
-/*
- * Place any includes below that will are needed by the majority of the
- * and is OK to be in any file in the system.
- */
-
-#include <tcl.h>
-#pragma export on
-#include "tk.h"
-#include "tkInt.h"
-#pragma export off
+#include "MW_TkHeaderCommon.h"
diff --git a/mac/MW_TkOldImgHeader.h b/mac/MW_TkOldImgHeader.h
index d0b3194..309ca20 100755
--- a/mac/MW_TkOldImgHeader.h
+++ b/mac/MW_TkOldImgHeader.h
@@ -1,3 +1,3 @@
#define USE_OLD_IMAGE
-#include "MW_TkHeader.pch"
+#include "MW_TkBuildLibHeader.pch"
diff --git a/mac/MW_TkTestHeader.pch b/mac/MW_TkTestHeader.pch
index 5d24749..5998b65 100755
--- a/mac/MW_TkTestHeader.pch
+++ b/mac/MW_TkTestHeader.pch
@@ -1,5 +1,5 @@
/*
- * MW_TkHeader.pch --
+ * MW_TkTestHeader.pch --
*
* This file is the source for a pre-compilied header that gets used
* for all files in the Tk projects. This make compilies go a bit
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: MW_TkTestHeader.pch,v 1.1 2000/02/10 08:45:30 jingham Exp $
+ * RCS: @(#) $Id: MW_TkTestHeader.pch,v 1.1.2.1 2001/04/04 21:39:48 hobbs Exp $
*/
/*
@@ -31,33 +31,12 @@
#pragma precompile_target "MW_TkTestHeader68K"
#endif
-#define TCL_DEBUG 1
-
-/*#define TCL_THREADS 1*/
-
-#include "tclMacCommonPch.h"
-
-#ifdef TCL_DEBUG
- #define TK_TEST
-#endif
+#define BUILD_tk 1
-/*
- * The following defines are for the Xlib.h file to force
- * it to generate prototypes in the way we need it. This is
- * defined here in case X.h & company are ever included before
- * tk.h.
- */
+#define STATIC_BUILD 1
-#define NeedFunctionPrototypes 1
-#define NeedWidePrototypes 0
+#define TCL_DEBUG 1
-/*
- * Place any includes below that will are needed by the majority of the
- * and is OK to be in any file in the system.
- */
+#define TCL_THREADS 1
-#include <tcl.h>
-#pragma export on
-#include "tk.h"
-#include "tkInt.h"
-#pragma export off
+#include "MW_TkHeaderCommon.h"
diff --git a/mac/tclets.r b/mac/tclets.r
index ce68db4..e4553ae 100755
--- a/mac/tclets.r
+++ b/mac/tclets.r
@@ -25,148 +25,148 @@ read 'TEXT' (TK_LIBRARY_RESOURCES+114, "tclshrc", purgeable)
"::mac:tclets.tcl";
data 'icns' (-16455) {
- $"6963 6E73 0000 08F8 6963 7323 0000 0048" /* icns...ics#...H */
- $"0100 02EE 05CE 09EE 13DE 23FF 47CE 86C6" /* .....#GΆ */
- $"4681 22C2 12C4 0888 0410 0220 0140 0080" /* F"..... .@. */
- $"0100 03EE 07CE 0FEE 1FFE 3FFF 7FFE FFFE" /* ......?. */
- $"7FFF 3FFE 1FFC 0FF8 07F0 03E0 01C0 0080" /* .?...... */
- $"6963 7334 0000 0088 0000 000F 0000 0000" /* ics4........... */
- $"0000 00FC F6D0 FFF0 0000 0FC5 DD00 F6F0" /* ....... */
- $"0000 FCCD 66F0 F6F0 000F CC6E 66CE F6F0" /* ..f..nf */
- $"00FC CC6E 67EF F6FF 0FCC CD66 66CC F6F0" /* .ng.ff */
- $"FCCC CDDC 66CC CFA0 0FCC CD6C EDCC CC0F" /* fϠ.l. */
- $"00FC CC6C E6CC CCF0 000F CC6C 66CC CF00" /* .l..lf. */
- $"0000 FCCC 6CCC F000 0000 0FCC DCCF 0000" /* ..l...... */
- $"0000 00FD DCF0 0000 0000 000F CF00 0000" /* ............ */
- $"0000 0000 F000 0000 6963 7338 0000 0108" /* .......ics8.... */
- $"0000 0000 0000 00FF 0000 0000 0000 0000" /* ............... */
- $"0000 0000 0000 FF2B FFEC 7F00 FFFF FF00" /* ......+... */
- $"0000 0000 00FF 2BB0 7F7F 0000 FFEC FF00" /* .....+..... */
- $"0000 0000 FF2B 2B7F ECEC FF00 FFEC FF00" /* ....++... */
- $"0000 00FF 2B2B ECFC ECEC 2BFB FFEC FF00" /* ...+++. */
- $"0000 FF2B 2B2B ECFC ECC0 FBFF FFEC FFFF" /* ..+++ */
- $"00FF 2B2B 2B7F ECEC ECEC 2B2B FFEC FF00" /* .+++.++. */
- $"FF2B 2B2B 2B7F 7FF6 ECEC 2B2B 2BFF FD00" /* ++++..+++. */
- $"00FF 2B2B 2B7F ECF6 FCF9 2B2B 2B2B 00FF" /* .+++.++++. */
- $"0000 FF2B 2B2B ECF6 FCEC 2B2B 2B2B FF00" /* ..+++++++. */
- $"0000 00FF 2B2B ECF6 ECEC 2B2B 2BFF 0000" /* ...+++++.. */
- $"0000 0000 FF2B 2BF6 EC2B 2B2B FF00 0000" /* ....+++++... */
- $"0000 0000 00FF 2BF6 F92B 2BFF 0000 0000" /* .....+++.... */
- $"0000 0000 0000 FFF9 F92B FF00 0000 0000" /* ......+..... */
- $"0000 0000 0000 00FF 2BFF 0000 0000 0000" /* .......+...... */
- $"0000 0000 0000 0000 FF00 0000 0000 0000" /* ............... */
- $"4943 4E23 0000 0108 0001 0000 0002 8000" /* ICN#........... */
- $"0004 78F8 0008 70F8 0010 F0F8 0021 E8F8" /* ..x..p...! */
- $"0043 C4F8 0081 FAF8 0107 F1F8 0207 F0F8" /* .C..... */
- $"0407 F7FF 0807 E3FE 1007 E1FC 200E E0F8" /* ...... . */
- $"4002 E074 800E E022 400E E001 200E C002" /* @.t."@.. .. */
- $"1006 E004 0806 C008 0406 E010 0202 C020" /* ........... */
- $"0102 C040 0080 8080 0040 0100 0020 0200" /* ..@..@... .. */
+ $"6963 6E73 0000 08F8 6963 7323 0000 0048" /* icns...ics#...H */
+ $"0100 02EE 05CE 09EE 13DE 23FF 47CE 86C6" /* .....#Gܐ */
+ $"4681 22C2 12C4 0888 0410 0220 0140 0080" /* F"..... .@. */
+ $"0100 03EE 07CE 0FEE 1FFE 3FFF 7FFE FFFE" /* ......?. */
+ $"7FFF 3FFE 1FFC 0FF8 07F0 03E0 01C0 0080" /* .?...... */
+ $"6963 7334 0000 0088 0000 000F 0000 0000" /* ics4........... */
+ $"0000 00FC F6D0 FFF0 0000 0FC5 DD00 F6F0" /* ....... */
+ $"0000 FCCD 66F0 F6F0 000F CC6E 66CE F6F0" /* ..f..nf */
+ $"00FC CC6E 67EF F6FF 0FCC CD66 66CC F6F0" /* .ngԖ.ffÖ */
+ $"FCCC CDDC 66CC CFA0 0FCC CD6C EDCC CC0F" /* fæ.l. */
+ $"00FC CC6C E6CC CCF0 000F CC6C 66CC CF00" /* .lÕ..lfæ. */
+ $"0000 FCCC 6CCC F000 0000 0FCC DCCF 0000" /* ..lÕ....Ц.. */
+ $"0000 00FD DCF0 0000 0000 000F CF00 0000" /* ...Е......... */
+ $"0000 0000 F000 0000 6963 7338 0000 0108" /* .......ics8.... */
+ $"0000 0000 0000 00FF 0000 0000 0000 0000" /* ............... */
+ $"0000 0000 0000 FF2B FFEC 7F00 FFFF FF00" /* ......+... */
+ $"0000 0000 00FF 2BB0 7F7F 0000 FFEC FF00" /* .....+....ϝ. */
+ $"0000 0000 FF2B 2B7F ECEC FF00 FFEC FF00" /* ....++.ϝ.ϝ. */
+ $"0000 00FF 2B2B ECFC ECEC 2BFB FFEC FF00" /* ...++ϸ+ϝ. */
+ $"0000 FF2B 2B2B ECFC ECC0 FBFF FFEC FFFF" /* ..+++ϸϿϝ */
+ $"00FF 2B2B 2B7F ECEC ECEC 2B2B FFEC FF00" /* .+++.++ϝ. */
+ $"FF2B 2B2B 2B7F 7FF6 ECEC 2B2B 2BFF FD00" /* ++++..+++. */
+ $"00FF 2B2B 2B7F ECF6 FCF9 2B2B 2B2B 00FF" /* .+++.ϖ++++. */
+ $"0000 FF2B 2B2B ECF6 FCEC 2B2B 2B2B FF00" /* ..+++ϖ++++. */
+ $"0000 00FF 2B2B ECF6 ECEC 2B2B 2BFF 0000" /* ...++ϖ+++.. */
+ $"0000 0000 FF2B 2BF6 EC2B 2B2B FF00 0000" /* ....+++++... */
+ $"0000 0000 00FF 2BF6 F92B 2BFF 0000 0000" /* .....+++.... */
+ $"0000 0000 0000 FFF9 F92B FF00 0000 0000" /* ......+..... */
+ $"0000 0000 0000 00FF 2BFF 0000 0000 0000" /* .......+...... */
+ $"0000 0000 0000 0000 FF00 0000 0000 0000" /* ............... */
+ $"4943 4E23 0000 0108 0001 0000 0002 8000" /* ICN#........... */
+ $"0004 78F8 0008 70F8 0010 F0F8 0021 E8F8" /* ..x..p...!˯ */
+ $"0043 C4F8 0081 FAF8 0107 F1F8 0207 F0F8" /* .C.ř..ү.. */
+ $"0407 F7FF 0807 E3FE 1007 E1FC 200E E0F8" /* ...... . */
+ $"4002 E074 800E E022 400E E001 200E C002" /* @.t."@.. .. */
+ $"1006 E004 0806 C008 0406 E010 0202 C020" /* ........... */
+ $"0102 C040 0080 8080 0040 0100 0020 0200" /* ..@..@... .. */
$"0010 0400 0008 0800 0004 1000 0002 2000" /* .............. . */
- $"0001 4000 0000 8000 0001 0000 0003 8000" /* ..@........... */
- $"0007 F8F8 000F F0F8 001F F0F8 003F F8F8" /* .......? */
- $"007F FCF8 00FF FEF8 01FF FFF8 03FF FFF8" /* ..... */
- $"07FF FFFF 0FFF FFFE 1FFF FFFC 3FFF FFF8" /* ...? */
- $"7FFF FFFC FFFF FFFE 7FFF FFFF 3FFF FFFE" /* ..? */
- $"1FFF FFFC 0FFF FFF8 07FF FFF0 03FF FFE0" /* .... */
- $"01FF FFC0 00FF FF80 007F FF00 003F FE00" /* ......?. */
- $"001F FC00 000F F800 0007 F000 0003 E000" /* ............ */
- $"0001 C000 0000 8000 6963 6C34 0000 0208" /* ......icl4.... */
+ $"0001 4000 0000 8000 0001 0000 0003 8000" /* ..@........... */
+ $"0007 F8F8 000F F0F8 001F F0F8 003F F8F8" /* .......? */
+ $"007F FCF8 00FF FEF8 01FF FFF8 03FF FFF8" /* ..... */
+ $"07FF FFFF 0FFF FFFE 1FFF FFFC 3FFF FFF8" /* ...? */
+ $"7FFF FFFC FFFF FFFE 7FFF FFFF 3FFF FFFE" /* ..? */
+ $"1FFF FFFC 0FFF FFF8 07FF FFF0 03FF FFE0" /* .... */
+ $"01FF FFC0 00FF FF80 007F FF00 003F FE00" /* ......?. */
+ $"001F FC00 000F F800 0007 F000 0003 E000" /* ............ */
+ $"0001 C000 0000 8000 6963 6C34 0000 0208" /* ......icl4.... */
$"0000 0000 0000 000F 0000 0000 0000 0000" /* ................ */
- $"0000 0000 0000 00FC F000 0000 0000 0000" /* .............. */
- $"0000 0000 0000 0FCC CFD6 D000 FFFF F000" /* ......... */
- $"0000 0000 0000 FCCC C556 0000 F767 F000" /* ......V..g. */
- $"0000 0000 000F CCCC 566F 0000 F676 F000" /* ......Vo..v. */
- $"0000 0000 00FC CCC5 6F5C F000 F767 F000" /* .....o\.g. */
- $"0000 0000 0FCC CC66 66CC 0F00 F676 F000" /* .....ff..v. */
- $"0000 0000 FCCC CCD5 5666 FCF0 F767 F000" /* ....Vfg. */
- $"0000 000F CCCC C656 5667 CCCF F676 F000" /* ....VVgv. */
- $"0000 00FC CCCC C6E5 5566 CCCC F767 F000" /* ...Ufg. */
- $"0000 0FCC CCCC C656 5657 CFFF F676 FFFF" /* ...VVWv */
- $"0000 FCCC CCCC C6E5 565C CCF7 6767 67F0" /* ..V\ggg */
- $"000F CCCC CCCC C655 565C CCCF 7676 7F00" /* ..UV\vv.. */
- $"00FC CCCC CCCC 7660 556C CCCC F767 F000" /* .v`Ulg. */
- $"0FCC CCCC CCCC CD5D 567C CCCC CF7F CF00" /* .]V|.. */
- $"FCCC CCCC CCCC 6660 556C CCCC CCFC CCF0" /* f`Ul */
- $"0FCC CCCC CCCC 665C 565C CCCC CCCC CCCF" /* .f\V\ */
- $"00FC CCCC CCCC 6660 E6DC CCCC CCCC CCF0" /* .f` */
- $"000F CCCC CCCC C650 656C CCCC CCCC CF00" /* ..Pel. */
- $"0000 FCCC CCCC C6EC 5ECC CCCC CCCC F000" /* ..^. */
- $"0000 0FCC CCCC C650 566C CCCC CCCF 0000" /* ...PVl.. */
- $"0000 00FC CCCC CC50 D5CC CCCC CCF0 0000" /* ...P.. */
- $"0000 000F CCCC CC50 56CC CCCC CF00 0000" /* ....PV... */
- $"0000 0000 FCCC CCD0 5CCC CCCC F000 0000" /* ....\... */
- $"0000 0000 0FCC CCD0 DCCC CCCF 0000 0000" /* ......... */
- $"0000 0000 00FC CCD0 DCCC CCF0 0000 0000" /* ......... */
- $"0000 0000 000F CCD0 DCCC CF00 0000 0000" /* ........... */
- $"0000 0000 0000 FCC0 CCCC F000 0000 0000" /* ........... */
- $"0000 0000 0000 0FCD CCCF 0000 0000 0000" /* ............. */
- $"0000 0000 0000 00FC CCF0 0000 0000 0000" /* ............. */
- $"0000 0000 0000 000F CF00 0000 0000 0000" /* ............... */
- $"0000 0000 0000 0000 F000 0000 0000 0000" /* ............... */
+ $"0000 0000 0000 00FC F000 0000 0000 0000" /* .............. */
+ $"0000 0000 0000 0FCC CFD6 D000 FFFF F000" /* .......æ.. */
+ $"0000 0000 0000 FCCC C556 0000 F767 F000" /* ......ÉV..g. */
+ $"0000 0000 000F CCCC 566F 0000 F676 F000" /* ......Vo..v. */
+ $"0000 0000 00FC CCC5 6F5C F000 F767 F000" /* .....Éo\.g. */
+ $"0000 0000 0FCC CC66 66CC 0F00 F676 F000" /* .....ff..v. */
+ $"0000 0000 FCCC CCD5 5666 FCF0 F767 F000" /* ....ùVfg. */
+ $"0000 000F CCCC C656 5667 CCCF F676 F000" /* ....ÐVVgæv. */
+ $"0000 00FC CCCC C6E5 5566 CCCC F767 F000" /* ...ÐUf×g. */
+ $"0000 0FCC CCCC C656 5657 CFFF F676 FFFF" /* ...ÐVVWv */
+ $"0000 FCCC CCCC C6E5 565C CCF7 6767 67F0" /* ..ÐV\×ggg */
+ $"000F CCCC CCCC C655 565C CCCF 7676 7F00" /* ..ÐUV\ævv.. */
+ $"00FC CCCC CCCC 7660 556C CCCC F767 F000" /* .v`Ul×g. */
+ $"0FCC CCCC CCCC CD5D 567C CCCC CF7F CF00" /* .]V|æ.. */
+ $"FCCC CCCC CCCC 6660 556C CCCC CCFC CCF0" /* f`UløÕ */
+ $"0FCC CCCC CCCC 665C 565C CCCC CCCC CCCF" /* .f\V\æ */
+ $"00FC CCCC CCCC 6660 E6DC CCCC CCCC CCF0" /* .f`Õ */
+ $"000F CCCC CCCC C650 656C CCCC CCCC CF00" /* ..ÐPelæ. */
+ $"0000 FCCC CCCC C6EC 5ECC CCCC CCCC F000" /* ..Ð^Õ. */
+ $"0000 0FCC CCCC C650 566C CCCC CCCF 0000" /* ...ÐPVlæ.. */
+ $"0000 00FC CCCC CC50 D5CC CCCC CCF0 0000" /* ...PÕ.. */
+ $"0000 000F CCCC CC50 56CC CCCC CF00 0000" /* ....PVæ... */
+ $"0000 0000 FCCC CCD0 5CCC CCCC F000 0000" /* ....í\Õ... */
+ $"0000 0000 0FCC CCD0 DCCC CCCF 0000 0000" /* .....íæ.... */
+ $"0000 0000 00FC CCD0 DCCC CCF0 0000 0000" /* .....íÕ.... */
+ $"0000 0000 000F CCD0 DCCC CF00 0000 0000" /* ......íæ..... */
+ $"0000 0000 0000 FCC0 CCCC F000 0000 0000" /* ......Õ..... */
+ $"0000 0000 0000 0FCD CCCF 0000 0000 0000" /* .......æ...... */
+ $"0000 0000 0000 00FC CCF0 0000 0000 0000" /* .......Õ...... */
+ $"0000 0000 0000 000F CF00 0000 0000 0000" /* ............... */
+ $"0000 0000 0000 0000 F000 0000 0000 0000" /* ............... */
$"6963 6C38 0000 0408 0000 0000 0000 0000" /* icl8............ */
- $"0000 0000 0000 00FF 0000 0000 0000 0000" /* ............... */
+ $"0000 0000 0000 00FF 0000 0000 0000 0000" /* ............... */
$"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */
- $"0000 0000 0000 FF2B FF00 0000 0000 0000" /* ......+....... */
+ $"0000 0000 0000 FF2B FF00 0000 0000 0000" /* ......+....... */
$"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */
- $"0000 0000 00FF 2B2B 2BFF 7FEC 7F00 0000" /* .....+++..... */
- $"FFFF FFFF FF00 0000 0000 0000 0000 0000" /* ........... */
- $"0000 0000 FF2B 2B2B 2BB0 B0EC 0000 0000" /* ....++++.... */
- $"FFC0 ECC0 FF00 0000 0000 0000 0000 0000" /* ........... */
- $"0000 00FF 2B2B 2B2B B0EC ECFF 0000 0000" /* ...++++.... */
- $"FFEC C0EC FF00 0000 0000 0000 0000 0000" /* ........... */
- $"0000 FF2B 2B2B 2BB0 ECFF B02B FF00 0000" /* ..+++++... */
- $"FFC0 ECC0 FF00 0000 0000 0000 0000 0000" /* ........... */
- $"00FF 2B2B 2B2B ECEC ECEC 2B2B 00FF 0000" /* .++++++... */
- $"FFEC C0EC FF00 0000 0000 0000 0000 0000" /* ........... */
- $"FF2B 2B2B 2B2B F9B0 B0EC ECEC FF2B FF00" /* ++++++. */
- $"FFC0 ECC0 FF00 0000 0000 0000 0000 00FF" /* .......... */
- $"2B2B 2B2B 2BEC B0EC B0EC ECC0 2B2B 2BFF" /* ++++++++ */
- $"FFEC C0EC FF00 0000 0000 0000 0000 FF2B" /* .........+ */
- $"2B2B 2B2B 2BEC FCB0 B0B0 ECEC 2B2B 2B2B" /* +++++++++ */
- $"FFC0 ECC0 FF00 0000 0000 0000 00FF 2B2B" /* ........++ */
- $"2B2B 2B2B 2BEC B0EC B0EC B0C0 2BFF FFFF" /* ++++++ */
- $"FFEC C0EC FFFF FFFF 0000 0000 FF2B 2B2B" /* ....+++ */
- $"2B2B 2B2B 2BEC FCB0 B0EC B02B 2B2B FFC0" /* ++++++++ */
- $"ECC0 ECC0 ECC0 FF00 0000 00FF 2B2B 2B2B" /* ....++++ */
- $"2B2B 2B2B 2BEC B0B0 B0EC B02B 2B2B 2BFF" /* +++++찰++++ */
- $"C0EC C0EC C0FF 0000 0000 FF2B 2B2B 2B2B" /* ....+++++ */
- $"2B2B 2B2B C0EC EC00 B0B0 EC2B 2B2B 2B2B" /* ++++.+++++ */
- $"FFC0 ECC0 FF00 0000 00FF 2B2B 2B2B 2B2B" /* ....++++++ */
- $"2B2B 2B2B 2BF9 B0F9 B0EC C02B 2B2B 2B2B" /* ++++++++++ */
- $"2BFF C0FF 2BFF 0000 FF2B 2B2B 2B2B 2B2B" /* ++..+++++++ */
- $"2B2B 2B2B ECEC EC00 B0B0 EC2B 2B2B 2B2B" /* ++++.+++++ */
- $"2B2B FF2B 2B2B FF00 00FF 2B2B 2B2B 2B2B" /* +++++..++++++ */
- $"2B2B 2B2B ECEC B02B B0EC B02B 2B2B 2B2B" /* ++++++++++ */
- $"2B2B 2B2B 2B2B 2BFF 0000 FF2B 2B2B 2B2B" /* +++++++..+++++ */
- $"2B2B 2B2B ECEC EC00 FCEC F92B 2B2B 2B2B" /* ++++.+++++ */
- $"2B2B 2B2B 2B2B FF00 0000 00FF 2B2B 2B2B" /* ++++++....++++ */
- $"2B2B 2B2B 2BEC B000 ECB0 EC2B 2B2B 2B2B" /* +++++.+++++ */
- $"2B2B 2B2B 2BFF 0000 0000 0000 FF2B 2B2B" /* +++++......+++ */
- $"2B2B 2B2B 2BEC FC2B B0FC 2B2B 2B2B 2B2B" /* ++++++++++++ */
- $"2B2B 2B2B FF00 0000 0000 0000 00FF 2B2B" /* ++++........++ */
- $"2B2B 2B2B 2BEC B000 B0EC EC2B 2B2B 2B2B" /* +++++.+++++ */
- $"2B2B 2BFF 0000 0000 0000 0000 0000 FF2B" /* +++..........+ */
- $"2B2B 2B2B 2B2B B000 7FB0 2B2B 2B2B 2B2B" /* ++++++..++++++ */
- $"2B2B FF00 0000 0000 0000 0000 0000 00FF" /* ++............ */
- $"2B2B 2B2B 2B2B B000 B0EC 2B2B 2B2B 2B2B" /* ++++++.++++++ */
- $"2BFF 0000 0000 0000 0000 0000 0000 0000" /* +.............. */
- $"FF2B 2B2B 2B2B F900 B02B 2B2B 2B2B 2B2B" /* +++++.+++++++ */
- $"FF00 0000 0000 0000 0000 0000 0000 0000" /* ............... */
- $"00FF 2B2B 2B2B F900 F92B 2B2B 2B2B 2BFF" /* .++++.++++++ */
+ $"0000 0000 00FF 2B2B 2BFF 7FEC 7F00 0000" /* .....+++..... */
+ $"FFFF FFFF FF00 0000 0000 0000 0000 0000" /* ........... */
+ $"0000 0000 FF2B 2B2B 2BB0 B0EC 0000 0000" /* ....++++.... */
+ $"FFC0 ECC0 FF00 0000 0000 0000 0000 0000" /* Ͽ........... */
+ $"0000 00FF 2B2B 2B2B B0EC ECFF 0000 0000" /* ...++++ϝ.... */
+ $"FFEC C0EC FF00 0000 0000 0000 0000 0000" /* Ͽϝ........... */
+ $"0000 FF2B 2B2B 2BB0 ECFF B02B FF00 0000" /* ..++++ϝ+... */
+ $"FFC0 ECC0 FF00 0000 0000 0000 0000 0000" /* Ͽ........... */
+ $"00FF 2B2B 2B2B ECEC ECEC 2B2B 00FF 0000" /* .++++++... */
+ $"FFEC C0EC FF00 0000 0000 0000 0000 0000" /* Ͽϝ........... */
+ $"FF2B 2B2B 2B2B F9B0 B0EC ECEC FF2B FF00" /* +++++ϝ+. */
+ $"FFC0 ECC0 FF00 0000 0000 0000 0000 00FF" /* Ͽ.......... */
+ $"2B2B 2B2B 2BEC B0EC B0EC ECC0 2B2B 2BFF" /* +++++σσϿ+++ */
+ $"FFEC C0EC FF00 0000 0000 0000 0000 FF2B" /* Ͽϝ.........+ */
+ $"2B2B 2B2B 2BEC FCB0 B0B0 ECEC 2B2B 2B2B" /* +++++ϸ++++ */
+ $"FFC0 ECC0 FF00 0000 0000 0000 00FF 2B2B" /* Ͽ........++ */
+ $"2B2B 2B2B 2BEC B0EC B0EC B0C0 2BFF FFFF" /* +++++σσσ+ */
+ $"FFEC C0EC FFFF FFFF 0000 0000 FF2B 2B2B" /* Ͽϝ....+++ */
+ $"2B2B 2B2B 2BEC FCB0 B0EC B02B 2B2B FFC0" /* +++++ϸσ+++ */
+ $"ECC0 ECC0 ECC0 FF00 0000 00FF 2B2B 2B2B" /* ϿϿϿ....++++ */
+ $"2B2B 2B2B 2BEC B0B0 B0EC B02B 2B2B 2BFF" /* +++++σσ++++ */
+ $"C0EC C0EC C0FF 0000 0000 FF2B 2B2B 2B2B" /* ϿϿ....+++++ */
+ $"2B2B 2B2B C0EC EC00 B0B0 EC2B 2B2B 2B2B" /* ++++.+++++ */
+ $"FFC0 ECC0 FF00 0000 00FF 2B2B 2B2B 2B2B" /* Ͽ....++++++ */
+ $"2B2B 2B2B 2BF9 B0F9 B0EC C02B 2B2B 2B2B" /* +++++Ͽ+++++ */
+ $"2BFF C0FF 2BFF 0000 FF2B 2B2B 2B2B 2B2B" /* ++..+++++++ */
+ $"2B2B 2B2B ECEC EC00 B0B0 EC2B 2B2B 2B2B" /* ++++.+++++ */
+ $"2B2B FF2B 2B2B FF00 00FF 2B2B 2B2B 2B2B" /* +++++..++++++ */
+ $"2B2B 2B2B ECEC B02B B0EC B02B 2B2B 2B2B" /* ++++σ+σ+++++ */
+ $"2B2B 2B2B 2B2B 2BFF 0000 FF2B 2B2B 2B2B" /* +++++++..+++++ */
+ $"2B2B 2B2B ECEC EC00 FCEC F92B 2B2B 2B2B" /* ++++.Ϙ+++++ */
+ $"2B2B 2B2B 2B2B FF00 0000 00FF 2B2B 2B2B" /* ++++++....++++ */
+ $"2B2B 2B2B 2BEC B000 ECB0 EC2B 2B2B 2B2B" /* +++++σ.σ+++++ */
+ $"2B2B 2B2B 2BFF 0000 0000 0000 FF2B 2B2B" /* +++++......+++ */
+ $"2B2B 2B2B 2BEC FC2B B0FC 2B2B 2B2B 2B2B" /* +++++ϸ+++++++ */
+ $"2B2B 2B2B FF00 0000 0000 0000 00FF 2B2B" /* ++++........++ */
+ $"2B2B 2B2B 2BEC B000 B0EC EC2B 2B2B 2B2B" /* +++++σ.+++++ */
+ $"2B2B 2BFF 0000 0000 0000 0000 0000 FF2B" /* +++..........+ */
+ $"2B2B 2B2B 2B2B B000 7FB0 2B2B 2B2B 2B2B" /* ++++++..++++++ */
+ $"2B2B FF00 0000 0000 0000 0000 0000 00FF" /* ++............ */
+ $"2B2B 2B2B 2B2B B000 B0EC 2B2B 2B2B 2B2B" /* ++++++.++++++ */
+ $"2BFF 0000 0000 0000 0000 0000 0000 0000" /* +.............. */
+ $"FF2B 2B2B 2B2B F900 B02B 2B2B 2B2B 2B2B" /* +++++.+++++++ */
+ $"FF00 0000 0000 0000 0000 0000 0000 0000" /* ............... */
+ $"00FF 2B2B 2B2B F900 F92B 2B2B 2B2B 2BFF" /* .++++.++++++ */
$"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */
- $"0000 FF2B 2B2B F900 F92B 2B2B 2B2B FF00" /* ..+++.+++++. */
+ $"0000 FF2B 2B2B F900 F92B 2B2B 2B2B FF00" /* ..+++.+++++. */
$"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */
- $"0000 00FF 2B2B F900 F92B 2B2B 2BFF 0000" /* ...++.++++.. */
+ $"0000 00FF 2B2B F900 F92B 2B2B 2BFF 0000" /* ...++.++++.. */
$"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */
- $"0000 0000 FF2B 2B00 2B2B 2B2B FF00 0000" /* ....++.++++... */
+ $"0000 0000 FF2B 2B00 2B2B 2B2B FF00 0000" /* ....++.++++... */
$"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */
- $"0000 0000 00FF 2BF9 2B2B 2BFF 0000 0000" /* .....++++.... */
+ $"0000 0000 00FF 2BF9 2B2B 2BFF 0000 0000" /* .....++++.... */
$"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */
- $"0000 0000 0000 FF2B 2B2B FF00 0000 0000" /* ......+++..... */
+ $"0000 0000 0000 FF2B 2B2B FF00 0000 0000" /* ......+++..... */
$"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */
- $"0000 0000 0000 00FF 2BFF 0000 0000 0000" /* .......+...... */
+ $"0000 0000 0000 00FF 2BFF 0000 0000 0000" /* .......+...... */
$"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */
- $"0000 0000 0000 0000 FF00 0000 0000 0000" /* ............... */
+ $"0000 0000 0000 0000 FF00 0000 0000 0000" /* ............... */
$"0000 0000 0000 0000" /* ........ */
};
diff --git a/mac/tkMac.h b/mac/tkMac.h
index e23e424..9623323 100644
--- a/mac/tkMac.h
+++ b/mac/tkMac.h
@@ -8,23 +8,27 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMac.h,v 1.7 1999/05/22 06:32:05 jingham Exp $
+ * RCS: @(#) $Id: tkMac.h,v 1.7.10.1 2001/04/04 21:39:48 hobbs Exp $
*/
#ifndef _TKMAC
#define _TKMAC
+#ifndef _TK
+#include <tk.h>
+#endif
+
+#ifndef _TKINT
+#include "tkInt.h"
+#endif
+
#include <Windows.h>
#include <QDOffscreen.h>
-#include "tkInt.h"
-/*
- * "export" is a MetroWerks specific pragma. It flags the linker that
- * any symbols that are defined when this pragma is on will be exported
- * to shared libraries that link with this library.
- */
-
-#pragma export on
+#ifdef BUILD_tk
+# undef TCL_STORAGE_CLASS
+# define TCL_STORAGE_CLASS DLLEXPORT
+#endif
/*
* This variable is exported and can be used by extensions. It is the
@@ -44,13 +48,9 @@ typedef int (Tk_MacEmbedMakeContainerExistProc) (Tk_Window window);
typedef void (Tk_MacEmbedGetClipProc) (Tk_Window window, RgnHandle rgn);
typedef void (Tk_MacEmbedGetOffsetInParentProc) (Tk_Window window, Point *ulCorner);
-/*
- * These functions are currently in tkMacInt.h. They are just copied over here
- * so they can be exported.
- */
-
#include "tkPlatDecls.h"
-#pragma export reset
+# undef TCL_STORAGE_CLASS
+# define TCL_STORAGE_CLASS DLLIMPORT
#endif /* _TKMAC */
diff --git a/mac/tkMacAppearanceStubs.c b/mac/tkMacAppearanceStubs.c
index 0c44864..0fd0fee 100755
--- a/mac/tkMacAppearanceStubs.c
+++ b/mac/tkMacAppearanceStubs.c
@@ -23,7 +23,6 @@
* them in shell calls.
*/
-#pragma export on
pascal OSStatus
MoveWindowStructure(
WindowPtr window,
@@ -103,4 +102,3 @@ IsValidWindowPtr(GrafPtr grafPort)
return true;
}
-#pragma export reset
diff --git a/mac/tkMacApplication.r b/mac/tkMacApplication.r
index f6bdf89..624fc58 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.
*
- * RCS: @(#) $Id: tkMacApplication.r,v 1.4 2000/02/10 08:48:00 jingham Exp $
+ * RCS: @(#) $Id: tkMacApplication.r,v 1.4.2.1 2001/04/04 21:39:48 hobbs Exp $
*/
#include <Types.r>
@@ -45,14 +45,14 @@ resource 'vers' (1) {
TK_MAJOR_VERSION, MINOR_VERSION,
RELEASE_LEVEL, 0x00, verUS,
TK_PATCH_LEVEL,
- TK_PATCH_LEVEL ", by Ray Johnson & Jim Ingham" "\n" " 1993-1997 Sun Microsystems" "\n" "1998-2000 Scriptics Inc."
+ TK_PATCH_LEVEL ", by Ray Johnson & Jim Ingham" "\n" " 2000 Ajuba Solutions"
};
resource 'vers' (2) {
TK_MAJOR_VERSION, MINOR_VERSION,
RELEASE_LEVEL, 0x00, verUS,
TK_PATCH_LEVEL,
- "Wish " TK_PATCH_LEVEL " 1993-1999"
+ "Wish " TK_PATCH_LEVEL " 1993-2000"
};
#define TK_APP_RESOURCES 128
@@ -94,7 +94,7 @@ resource 'FREF' (TK_APP_RESOURCES+1, purgeable)
type TK_APP_CREATOR as 'STR ';
resource TK_APP_CREATOR (0, purgeable) {
- "Wish " TK_PATCH_LEVEL " 1996"
+ "Wish " TK_PATCH_LEVEL " 1993-2000"
};
/*
diff --git a/mac/tkMacButton.c b/mac/tkMacButton.c
index ce298ed..46fbb0d 100644
--- a/mac/tkMacButton.c
+++ b/mac/tkMacButton.c
@@ -9,12 +9,13 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacButton.c,v 1.10 2000/04/17 02:16:36 jingham Exp $
+ * RCS: @(#) $Id: tkMacButton.c,v 1.10.2.1 2001/04/04 21:39:48 hobbs Exp $
*/
#include "tkButton.h"
#include "tkMacInt.h"
#include <Controls.h>
+#include <ControlDefinitions.h>
#include <LowMem.h>
#include <Appearance.h>
diff --git a/mac/tkMacDialog.c b/mac/tkMacDialog.c
index 629860c..a807483 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.
*
- * RCS: @(#) $Id: tkMacDialog.c,v 1.6 2000/04/23 03:47:24 jingham Exp $
+ * RCS: @(#) $Id: tkMacDialog.c,v 1.6.2.1 2001/04/04 21:39:48 hobbs Exp $
*/
#include <Gestalt.h>
@@ -228,7 +228,7 @@ Tk_ChooseColorObjCmd(
cpinfo.theColor.color.rgb.green = in.green;
cpinfo.theColor.color.rgb.blue = in.blue;
cpinfo.dstProfile = 0L;
- cpinfo.flags = CanModifyPalette | CanAnimatePalette;
+ cpinfo.flags = kColorPickerCanModifyPalette | kColorPickerCanAnimatePalette;
cpinfo.placeWhere = kDeepestColorScreen;
cpinfo.pickerType = 0L;
cpinfo.eventProc = NULL;
@@ -454,11 +454,11 @@ Tk_GetSaveFileObjCmd(
Str255 title, message;
OpenFileData ofd;
static char *saveOptionStrings[] = {
- "-defaultextension", "-initialdir", "-initialfile",
+ "-defaultextension", "-filetypes", "-initialdir", "-initialfile",
"-message", "-parent", "-title", NULL
};
enum saveOptions {
- SAVE_DEFAULT, SAVE_INITDIR, SAVE_INITFILE,
+ SAVE_DEFAULT, SAVE_TYPES, SAVE_INITDIR, SAVE_INITFILE,
SAVE_MESSAGE, SAVE_PARENT, SAVE_TITLE
};
@@ -493,6 +493,8 @@ Tk_GetSaveFileObjCmd(
switch (index) {
case SAVE_DEFAULT:
break;
+ case SAVE_TYPES:
+ break;
case SAVE_INITDIR:
choice = Tcl_GetStringFromObj(objv[i + 1], NULL);
if (HandleInitialDirectory(interp, choice, &dirSpec,
@@ -712,7 +714,7 @@ HandleInitialDirectory (
Tcl_AppendResult(interp, "bad directory \"", initialDir, "\"", NULL);
return TCL_ERROR;
}
- err = FSpGetDirectoryID(dirSpec, &dirID, &isDirectory);
+ err = FSpGetDirectoryIDTcl(dirSpec, &dirID, &isDirectory);
if ((err != noErr) || !isDirectory) {
Tcl_AppendResult(interp, "bad directory \"", initialDir, "\"", NULL);
return TCL_ERROR;
@@ -1055,10 +1057,18 @@ OpenEventProc(
if (callBackSelector == kNavCBPopupMenuSelect) {
chosenItem = (NavMenuItemSpec *) callBackParams->eventData.eventDataParms.param;
ofd->curType = chosenItem->menuType;
- } else if (callBackSelector == kNavCBAdjustRect || callBackSelector & otherEvent != 0) {
+ } else if ( callBackSelector & otherEvent != 0) {
while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_DONT_WAIT|TCL_WINDOW_EVENTS)) {
/* Empty Body */
}
+ } else if (callBackSelector == kNavCBEvent) {
+ if (callBackParams->eventData.eventDataParms.event->what == updateEvt) {
+ if (TkMacConvertEvent( callBackParams->eventData.eventDataParms.event)) {
+ while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_DONT_WAIT|TCL_WINDOW_EVENTS)) {
+ /* Empty Body */
+ }
+ }
+ }
}
}
@@ -1121,7 +1131,7 @@ StdGetFile(
if (isOpen == OPEN_FILE) {
if (ofd != NULL && ofd->usePopup) {
CustomGetFile(openFilter, (short) -1, NULL, &reply, OPEN_BOX,
- mypoint, openHook, NULL, NULL, NULL, (void*) &ofd);
+ mypoint, openHook, NULL, NULL, NULL, (void*) ofd);
} else {
StandardGetFile(NULL, -1, NULL, &reply);
}
@@ -1213,7 +1223,7 @@ OpenHookProc(
if (ofdPtr->usePopup) {
GetDialogItem(theDialog, ofdPtr->popupItem,
&ignore, &handle, &rect);
- newType = GetCtlValue((ControlRef) handle) - 1;
+ newType = GetControlValue((ControlRef) handle) - 1;
if (ofdPtr->curType != newType) {
if (newType<0 || newType>ofdPtr->fl.numFilters) {
/*
diff --git a/mac/tkMacFont.c b/mac/tkMacFont.c
index 200ed4f..65647be 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.
*
- * RCS: @(#) $Id: tkMacFont.c,v 1.5 1999/12/07 03:04:51 hobbs Exp $
+ * RCS: @(#) $Id: tkMacFont.c,v 1.5.2.1 2001/04/04 21:39:48 hobbs Exp $
*/
#include <Windows.h>
@@ -326,7 +326,7 @@ TkpFontPkgInit(mainPtr)
*/
fontMenu = NewMenu('FT', "\px");
- AddResMenu(fontMenu, 'FONT');
+ AppendResMenu(fontMenu, 'FONT');
numFonts = CountMItems(fontMenu);
tmpFontNameMap = (FontNameMap *) ckalloc(sizeof(FontNameMap) * numFonts);
diff --git a/mac/tkMacInt.h b/mac/tkMacInt.h
index 3a96f15..6e3cf01 100644
--- a/mac/tkMacInt.h
+++ b/mac/tkMacInt.h
@@ -8,15 +8,27 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacInt.h,v 1.9 2000/02/10 08:55:18 jingham Exp $
+ * RCS: @(#) $Id: tkMacInt.h,v 1.9.2.1 2001/04/04 21:39:49 hobbs Exp $
*/
#ifndef _TKMACINT
#define _TKMACINT
+#ifndef _TKINT
#include "tkInt.h"
+#endif
+
+/*
+ * Include platform specific public interfaces.
+ */
+#ifndef _TKMAC
#include "tkMac.h"
+#endif
+
+#ifndef _TKPORT
+#include "tkPort.h"
+#endif
#include <AppleEvents.h>
#include <Windows.h>
@@ -73,7 +85,7 @@ typedef struct TkMacWindowList {
* embedding where Tk does not control the top-level. It contains
* various functions that are needed by Mac specific routines, like
* TkMacGetDrawablePort. The definitions of the function types
- * are in tclMac.h.
+ * are in tkMac.h.
*/
typedef struct {
@@ -206,8 +218,16 @@ typedef TkMenuDefProcPtr TkMenuDefUPP;
#include "tkIntPlatDecls.h"
-/* FIXME - This has to go in the tkInt.decls!!! */
+#ifdef BUILD_tk
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLEXPORT
+#endif
+
+/*
+ * mac specific procedures exported from the DLL
+ */
-int TkpIsWindowFloating _ANSI_ARGS_((WindowRef window));
+#undef TCL_STORAGE_CLASS
+#define TCL_STORAGE_CLASS DLLIMPORT
#endif /* _TKMACINT */
diff --git a/mac/tkMacLibrary.r b/mac/tkMacLibrary.r
index 9b2153f..ef0704e 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.
*
- * RCS: @(#) $Id: tkMacLibrary.r,v 1.5 2000/02/10 08:48:09 jingham Exp $
+ * RCS: @(#) $Id: tkMacLibrary.r,v 1.5.2.1 2001/04/04 21:39:49 hobbs Exp $
*/
/*
@@ -54,14 +54,14 @@ resource 'vers' (1) {
TK_MAJOR_VERSION, MINOR_VERSION,
RELEASE_LEVEL, 0x00, verUS,
TK_PATCH_LEVEL,
- TK_PATCH_LEVEL ",by Ray Johnson & Jim Ingham" "\n" " 1993-1997 Sun Microsystems" "\n" "1998-2000 Scriptics Inc."
+ TK_PATCH_LEVEL ", by Ray Johnson & Jim Ingham" "\n" " 2000 Ajuba Solutions"
};
resource 'vers' (2) {
TK_MAJOR_VERSION, MINOR_VERSION,
RELEASE_LEVEL, 0x00, verUS,
TK_PATCH_LEVEL,
- "Tk Library " TK_PATCH_LEVEL " 1993-1999"
+ "Tk Library " TK_PATCH_LEVEL " 1993-2000"
};
#define TK_LIBRARY_RESOURCES 3000
@@ -139,7 +139,7 @@ resource 'DITL' (129, "About Box", purgeable) {
{ 14, 108, 117, 298}, StaticText {disabled,
"Wish - Windowing Shell" "\n" "based on Tcl "
TCL_PATCH_LEVEL " & Tk " TK_PATCH_LEVEL "\n\n" "Jim Ingham & Ray Johnson"
- "Scriptics Inc." "\n" "jingham@cygnus.com"},
+ " 2000 Ajuba Solutions." "\n" "jingham@cygnus.com"},
{ 11, 24, 111, 92}, Picture {enabled, 128}
}
};
diff --git a/mac/tkMacMDEF.r b/mac/tkMacMDEF.r
index d6cbf50..b84d3f6 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.
*
- * RCS: @(#) $Id: tkMacMDEF.r,v 1.2 1998/09/14 18:23:37 stanton Exp $
+ * RCS: @(#) $Id: tkMacMDEF.r,v 1.2.18.1 2001/04/04 21:39:49 hobbs Exp $
*/
#include <Types.r>
@@ -27,19 +27,19 @@
*/
data 'MDEF' (591, preload) {
- $"600A 0000 4D44 4546 024F 0000 4EFA 0004" /* `...MDEF.O..N.. */
- $"4E75 4E56 FFEE 48E7 1830 362E 0018 246E" /* NuNVH.06...$n */
- $"0008 267C 4D44 4546 594F 2EB8 0B54 201F" /* ..&|MDEFYO..T . */
- $"2D40 FFEE 554F 3EB8 0A0A 301F 3D40 FFF2" /* -@UO>..0.=@ */
- $"554F 3EB8 0A0C 301F 3D40 FFF4 0C78 FFFF" /* UO>..0.=@.x */
- $"0B5C 6612 2078 0B5C 2050 2D68 0006 FFF6" /* .\f. x.\ P-h.. */
- $"2D68 000A FFFA 0C43 0001 6602 3812 3F03" /* -h...C..f.8.?. */
- $"2F2E 0014 2F2E 0010 2F2E 000C 2F0A 486E" /* /.../.../.../.Hn */
- $"FFEE 4E93 2F2E FFEE 21DF 0B54 3F2E FFF2" /* N/.!.T?. */
- $"31DF 0A0A 3F2E FFF4 31DF 0A0C 0C43 0001" /* 1..?.1...C.. */
- $"662A B852 6726 0C78 FFFF 0B5C 671E 2078" /* f*Rg&.x.\g. x */
- $"0B5C 2050 216E FFF6 0006 216E FFFA 000A" /* .\ P!n..!n.. */
- $"21EE FFF6 09FA 21EE FFFA 09FE 4CDF 0C18" /* !!L.. */
- $"4E5E 205F 4FEF 0012 4ED0 846D 6169 6E00" /* N^ _O..NЄmain. */
- $"0000" /* .. */
+ $"600A 0000 4D44 4546 024F 0000 4EFA 0004" /* `...MDEF.O..N.. */
+ $"4E75 48E7 1030 4FEF FFEE 266F 0022 247C" /* NuH.0Oԝ&o."$| */
+ $"4D44 4546 594F 2EB8 0B54 2E9F 554F 3EB8" /* MDEFYO..T.UO> */
+ $"0A0A 3F5F 0004 554F 3EB8 0A0C 3F5F 0006" /* ..?_..UO>..?_.. */
+ $"3038 0B5C 48C0 0C80 FFFF FFFF 6612 2078" /* 08.\H.ĝf. x */
+ $"0B5C 2050 2F68 0006 0008 2F68 000A 000C" /* .\ P/h..../h.... */
+ $"302F 0032 48C0 0C80 0000 0001 6602 3613" /* 0/.2H.....f.6. */
+ $"3F2F 0032 2F2F 0030 2F2F 0030 2F2F 0030" /* ?/.2//.0//.0//.0 */
+ $"2F0B 486F 0012 4E92 2F17 21DF 0B54 3F2F" /* /.Ho..N/.!.T?/ */
+ $"0004 31DF 0A0A 3F2F 0006 31DF 0A0C 302F" /* ..1..?/..1..0/ */
+ $"0032 48C0 0C80 0000 0001 6638 3013 48C0" /* .2H.....f80.H */
+ $"3203 48C1 B280 672C 3038 0B5C 48C0 0C80" /* 2.Hg,08.\H. */
+ $"FFFF FFFF 671E 2078 0B5C 2050 216F 0008" /* g. x.\ P!o.. */
+ $"0006 216F 000C 000A 21EF 0008 09FA 21EF" /* ..!o....!..! */
+ $"000C 09FE 4FEF 0012 4CDF 0C08 4E74 0012" /* ..O..L..Nt.. */
};
diff --git a/mac/tkMacMenu.c b/mac/tkMacMenu.c
index c0db274..5f090e4 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.
*
- * RCS: @(#) $Id: tkMacMenu.c,v 1.18 2000/02/10 08:55:47 jingham Exp $
+ * RCS: @(#) $Id: tkMacMenu.c,v 1.18.2.1 2001/04/04 21:39:49 hobbs Exp $
*/
#include "tkMacInt.h"
@@ -178,7 +178,7 @@ static char *currentMenuBarName;
static Tk_Window currentMenuBarOwner;
/* Which window owns the current menu bar. */
static char elipsisString[TCL_UTF_MAX + 1];
- /* The UTF representation of the elipsis ()
+ /* The UTF representation of the elipsis ()
* character. */
static int helpItemCount; /* The number of items in the help menu.
* -1 means that the help menu is
@@ -529,7 +529,7 @@ TkpNewMenu(
(length > 230) ? 230 : length);
itemText[0] = (length > 230) ? 230 : length;
macMenuHdl = NewMenu(menuID, itemText);
-#ifdef GENERATINGCFM
+#if GENERATINGCFM
{
Handle mdefProc = FixMDEF();
if ((mdefProc != NULL)) {
@@ -687,7 +687,7 @@ TkpDestroyMenuEntry(
* Given a menu entry, gives back the text that should go in it.
* Separators should be done by the caller, as they have to be
* handled specially. This is primarily used to do a substitution
- * between "..." and "".
+ * between "..." and "".
*
* Results:
* itemText points to the new text for the item.
@@ -752,10 +752,10 @@ GetEntryText(
* We try the following special mac characters. If none of them
* are present, just use the check mark.
* '' - Check mark character (\022)
- * '' - Mac Bullet character (\245)
+ * '' - Mac Bullet character (\245)
* '' - Filled diamond (\023)
* '' - Hollow diamond (\327)
- * '' = Mac Long dash ("em dash") (\321)
+ * '' = Mac Long dash ("em dash") (\321)
* '-' = short dash (minus, "en dash");
*
* Results:
@@ -1223,7 +1223,7 @@ ReconfigureMacintoshMenu(
ReconfigureIndividualMenu(menuPtr, macMenuHdl, 0);
if (menuPtr->menuFlags & MENU_APPLE_MENU) {
- AddResMenu(macMenuHdl, 'DRVR');
+ AppendResMenu(macMenuHdl, 'DRVR');
}
if ((*macMenuHdl)->menuID == currentHelpMenuID) {
@@ -4336,10 +4336,16 @@ TkpMenuNotifyToplevelCreate(
*----------------------------------------------------------------------
*/
+#if __MWERKS__ < 0x2400
+#define MDEF_PROC_OFFSET 0x24
+#else
+#define MDEF_PROC_OFFSET 0x20
+#endif
+
static Handle
FixMDEF(void)
{
-#ifdef GENERATINGCFM
+#if GENERATINGCFM
Handle MDEFHandle = GetResource('MDEF', 591);
Handle SICNHandle = GetResource('SICN', SICN_RESOURCE_NUMBER);
if ((MDEFHandle != NULL) && (SICNHandle != NULL)) {
@@ -4348,7 +4354,7 @@ FixMDEF(void)
if (menuDefProc == NULL) {
menuDefProc = TkNewMenuDefProc(MenuDefProc);
}
- memmove((void *) (((long) (*MDEFHandle)) + 0x24), &menuDefProc, 4);
+ memmove((void *) (((long) (*MDEFHandle)) + MDEF_PROC_OFFSET), &menuDefProc, 4);
return MDEFHandle;
} else {
return NULL;
@@ -4405,7 +4411,7 @@ TkpMenuInit(void)
}
FixMDEF();
- Tcl_ExternalToUtf(NULL, NULL, "\311", /* */
+ Tcl_ExternalToUtf(NULL, NULL, "\311", /* */
-1, 0, NULL, elipsisString,
TCL_UTF_MAX + 1, NULL, NULL, NULL);
}
diff --git a/mac/tkMacMenus.c b/mac/tkMacMenus.c
index f83e49d..a4a00ac 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.
*
- * RCS: @(#) $Id: tkMacMenus.c,v 1.6 2000/04/23 03:47:32 jingham Exp $
+ * RCS: @(#) $Id: tkMacMenus.c,v 1.6.2.1 2001/04/04 21:39:49 hobbs Exp $
*/
#include "tcl.h"
@@ -106,7 +106,7 @@ TkMacHandleMenuSelect(
break;
}
default:
- GetItem(tkAppleMenu, theItem, name);
+ GetMenuItemText(tkAppleMenu, theItem, name);
HiliteMenu(0);
OpenDeskAcc(name);
return;
@@ -193,9 +193,9 @@ TkMacInitMenus(
panic("memory - menus");
}
InsertMenu(tkAppleMenu, 0);
- AppendMenu(tkAppleMenu, "\pAbout Tcl & Tk");
+ AppendMenu(tkAppleMenu, "\pAbout Tcl & Tk");
AppendMenu(tkAppleMenu, "\p(-");
- AddResMenu(tkAppleMenu, 'DRVR');
+ AppendResMenu(tkAppleMenu, 'DRVR');
if (TkMacUseMenuID(kFileMenu) != TCL_OK) {
panic("Menu ID %d is already in use!", kFileMenu);
@@ -205,7 +205,7 @@ TkMacInitMenus(
panic("memory - menus");
}
InsertMenu(tkFileMenu, 0);
- AppendMenu(tkFileMenu, "\pSource");
+ AppendMenu(tkFileMenu, "\pSource");
AppendMenu(tkFileMenu, "\pClose/W");
AppendMenu(tkFileMenu, "\p(-");
AppendMenu(tkFileMenu, "\pQuit/Q");
diff --git a/mac/tkMacPort.h b/mac/tkMacPort.h
index 98f0f74..c10c7e8 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.
*
- * RCS: @(#) $Id: tkMacPort.h,v 1.9 2000/04/17 02:17:05 jingham Exp $
+ * RCS: @(#) $Id: tkMacPort.h,v 1.9.2.1 2001/04/04 21:39:49 hobbs Exp $
*/
#ifndef _TKMACPORT
@@ -71,14 +71,14 @@ extern int errno;
*/
#ifndef panic /* In a stubs-aware setting, this could confuse the #define */
-extern void panic _ANSI_ARGS_(TCL_VARARGS(char *, string));
+EXTERN void panic _ANSI_ARGS_(TCL_VARARGS(char *, string));
#endif
#ifndef strcasecmp
-extern int strcasecmp _ANSI_ARGS_((CONST char *s1,
+EXTERN int strcasecmp _ANSI_ARGS_((CONST char *s1,
CONST char *s2));
#endif
#ifndef strncasecmp
-extern int strncasecmp _ANSI_ARGS_((CONST char *s1,
+EXTERN int strncasecmp _ANSI_ARGS_((CONST char *s1,
CONST char *s2, size_t n));
#endif
/*
@@ -149,4 +149,13 @@ extern int strncasecmp _ANSI_ARGS_((CONST char *s1,
#define MENU_TEXT_PIXEL 51
#define APPEARANCE_PIXEL 52
+/*
+ * The following declaration is used to get access to a private Tcl interface
+ * that is needed for portability reasons.
+ */
+
+#ifndef _TCLINT
+#include <tclInt.h>
+#endif
+
#endif /* _TKMACPORT */
diff --git a/mac/tkMacResource.r b/mac/tkMacResource.r
index 02d054e..7f0d343 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.
*
- * RCS: @(#) $Id: tkMacResource.r,v 1.6 1999/08/16 08:51:46 jingham Exp $
+ * RCS: @(#) $Id: tkMacResource.r,v 1.6.2.1 2001/04/04 21:39:49 hobbs Exp $
*/
/*
@@ -46,20 +46,6 @@
# define MINOR_VERSION TK_MINOR_VERSION * 16
#endif
-resource 'vers' (1) {
- TK_MAJOR_VERSION, MINOR_VERSION,
- RELEASE_LEVEL, 0x00, verUS,
- TK_PATCH_LEVEL,
- TK_PATCH_LEVEL ", by Ray Johnson & Jim Ingham " "\n" " 1993-1997 Sun Microsystems" "\n" " 1998-1999 Scriptics Inc."
-};
-
-resource 'vers' (2) {
- TK_MAJOR_VERSION, MINOR_VERSION,
- RELEASE_LEVEL, 0x00, verUS,
- TK_PATCH_LEVEL,
- "Wish " TK_PATCH_LEVEL " 1993-1999"
-};
-
/*
* The mechanisim below loads Tcl source into the resource fork of the
@@ -108,11 +94,29 @@ read 'TEXT' (26, "comdlg", purgeable, preload) "::library:comdlg.tcl";
*/
resource 'STR#' (128, "Tcl Environment Variables") {
- { "SCHEDULE_NAME=Agent Controller Schedule",
+ {
+ /*
+ "SCHEDULE_NAME=Agent Controller Schedule",
"SCHEDULE_PATH=Lozoya:System Folder:Tcl Lib:Tcl-Scheduler"
+ */
};
};
+data 'alis' (1000, "Library Folder") {
+ $"0000 0000 00BA 0002 0001 012F 0000 0000" /* ........../.... */
+ $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */
+ $"0000 0000 0000 985C FB00 4244 0000 0000" /* ......\.BD.... */
+ $"0002 1328 5375 7070 6F72 7420 4C69 6272" /* ...(Support Libr */
+ $"6172 6965 7329 0000 0000 0000 0000 0000" /* aries).......... */
+ $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */
+ $"0000 0000 0000 0000 0000 0000 0000 0000" /* ................ */
+ $"0000 0076 8504 B617 A796 003D 0027 025B" /* ...v...=.'.[ */
+ $"01E4 0001 0001 0000 0000 0000 0000 0000" /* ............... */
+ $"0000 0000 0000 0000 0001 2F00 0002 0015" /* ........../..... */
+ $"2F3A 2853 7570 706F 7274 204C 6962 7261" /* /:(Support Libra */
+ $"7269 6573 2900 FFFF 0000" /* ries)... */
+};
+
/*
* The following two resources define the default "About Box" for Mac Tk.
* This dialog appears if the "About Tk..." menu item is selected from
diff --git a/mac/tkMacScrlbr.c b/mac/tkMacScrlbr.c
index df030e0..b460c5d 100644
--- a/mac/tkMacScrlbr.c
+++ b/mac/tkMacScrlbr.c
@@ -10,12 +10,13 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacScrlbr.c,v 1.4 2000/02/10 08:56:12 jingham Exp $
+ * RCS: @(#) $Id: tkMacScrlbr.c,v 1.4.2.1 2001/04/04 21:39:49 hobbs Exp $
*/
#include "tkScrollbar.h"
#include "tkMacInt.h"
#include <Controls.h>
+#include <ControlDefinitions.h>
/*
* The following definitions should really be in MacOS
@@ -516,15 +517,15 @@ TkpScrollbarPosition(
(**macScrollPtr->sbHandle).contrlHilite = 255;
}
switch (part) {
- case inUpButton:
+ case kControlUpButtonPart:
return TOP_ARROW;
- case inPageUp:
+ case kControlPageUpPart:
return TOP_GAP;
- case inThumb:
+ case kControlIndicatorPart:
return SLIDER;
- case inPageDown:
+ case kControlPageDownPart:
return BOTTOM_GAP;
- case inDownButton:
+ case kControlDownButtonPart:
return BOTTOM_ARROW;
default:
return OUTSIDE;
@@ -687,22 +688,22 @@ ScrollbarActionProc(
ControlRef theControl, /* Handle to scrollbat control */
ControlPartCode partCode) /* Part of scrollbar that was "hit" */
{
- register TkScrollbar *scrollPtr = (TkScrollbar *) GetCRefCon(theControl);
+ register TkScrollbar *scrollPtr = (TkScrollbar *) GetControlReference(theControl);
Tcl_DString cmdString;
Tcl_DStringInit(&cmdString);
Tcl_DStringAppend(&cmdString, scrollPtr->command,
scrollPtr->commandSize);
- if (partCode == inUpButton || partCode == inDownButton) {
+ if (partCode == kControlUpButtonPart || partCode == kControlDownButtonPart) {
Tcl_DStringAppendElement(&cmdString, "scroll");
Tcl_DStringAppendElement(&cmdString,
- (partCode == inUpButton ) ? "-1" : "1");
+ (partCode == kControlUpButtonPart ) ? "-1" : "1");
Tcl_DStringAppendElement(&cmdString, "unit");
- } else if (partCode == inPageUp || partCode == inPageDown) {
+ } else if (partCode == kControlPageUpPart || partCode == kControlPageDownPart) {
Tcl_DStringAppendElement(&cmdString, "scroll");
Tcl_DStringAppendElement(&cmdString,
- (partCode == inPageUp ) ? "-1" : "1");
+ (partCode == kControlPageUpPart ) ? "-1" : "1");
Tcl_DStringAppendElement(&cmdString, "page");
}
Tcl_Preserve((ClientData) scrollPtr->interp);
@@ -770,7 +771,7 @@ ScrollbarBindProc(
where.h = eventPtr->xbutton.x + bounds.left;
where.v = eventPtr->xbutton.y + bounds.top;
part = TestControl(macScrollPtr->sbHandle, where);
- if (part == inThumb && scrollPtr->jump == false) {
+ if (part == kControlIndicatorPart && scrollPtr->jump == false) {
/*
* Case 1: In thumb, no jump scrolling. Call track control
* with the thumb action proc which will do most of the work.
@@ -781,14 +782,14 @@ ScrollbarBindProc(
part = TrackControl(macScrollPtr->sbHandle, where,
(ControlActionUPP) thumbActionProc);
activeScrollPtr = NULL;
- } else if (part == inThumb) {
+ } else if (part == kControlIndicatorPart) {
/*
* Case 2: in thumb with jump scrolling. Call TrackControl
* with a NULL action proc. Use the new value of the control
* to set update the control.
*/
part = TrackControl(macScrollPtr->sbHandle, where, NULL);
- if (part == inThumb) {
+ if (part == kControlIndicatorPart) {
double newFirstFraction, thumbWidth;
Tcl_DString cmdString;
char vauleString[TCL_DOUBLE_SPACE];
diff --git a/mac/tkMacWindowMgr.c b/mac/tkMacWindowMgr.c
index 5e34c49..21b2f3a 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.
*
- * RCS: @(#) $Id: tkMacWindowMgr.c,v 1.8 2000/04/17 02:17:24 jingham Exp $
+ * RCS: @(#) $Id: tkMacWindowMgr.c,v 1.8.2.1 2001/04/04 21:39:49 hobbs Exp $
*/
#include <Events.h>
@@ -273,13 +273,13 @@ TkAboutDlg()
while (itemHit != 1) {
ModalDialog( NULL, &itemHit);
}
- DisposDialog(aboutDlog);
+ DisposeDialog(aboutDlog);
aboutDlog = NULL;
if (TkMacHaveAppearance() >= 0x110) {
- SelectWindow(FrontWindow());
- } else {
SelectWindow(FrontNonFloatingWindow());
+ } else {
+ SelectWindow(FrontWindow());
}
return;
@@ -1234,7 +1234,11 @@ TkMacConvertEvent(
/* fall through */
case keyUp:
+ if (TkMacHaveAppearance() >= 0x110) {
whichWindow = FrontNonFloatingWindow();
+ } else {
+ whichWindow = FrontWindow();
+ }
if (whichWindow == NULL) {
/*
* This happens if we get a key event before Tk has had a
@@ -1715,7 +1719,7 @@ BringWindowForward(
WindowRef wRef)
{
if (!TkpIsWindowFloating(wRef)) {
- if (IsValidWindowPtr(wRef))
+ if ((TkMacHaveAppearance() < 0x110) || IsValidWindowPtr(wRef))
SelectWindow(wRef);
}
}
diff --git a/mac/tkMacWm.c b/mac/tkMacWm.c
index 8ee7e6c..f69a04e 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.
*
- * RCS: @(#) $Id: tkMacWm.c,v 1.10 2000/04/25 01:02:13 hobbs Exp $
+ * RCS: @(#) $Id: tkMacWm.c,v 1.10.2.1 2001/04/04 21:39:49 hobbs Exp $
*/
#include <Gestalt.h>
@@ -4534,7 +4534,12 @@ TkMacHaveAppearance()
if (err == noErr) {
TkMacHaveAppearance = 1;
}
+/* even if AppearanceManager 1.1 routines are present,
+we can't call them from 68K code, so we pretend
+to be running Apperarance Mgr 1.0 */
+#if !(GENERATING68K && !GENERATINGCFM)
err = Gestalt(gestaltAppearanceVersion, &response);
+#endif
if (err == noErr) {
TkMacHaveAppearance = (int) response;
}