From da1bf4fb459b1e4f5e1be8a76e14029d4a9d331b Mon Sep 17 00:00:00 2001 From: das Date: Tue, 13 May 2003 02:42:57 +0000 Subject: backport of Mac OS X specific changes on trunk since 8.4.2: * macosx/tkMacOSXClipboard.c (TkSelGetSelection): Convert '\r' to '\n' on the way into Tcl. (ingham) * macosx/tkMacOSXMenu.c (EventuallyInvokeMenu): New function, used to invoke menu commands at idle time. (TkMacOSXDispatchMenuEvent): Don't immediately dispatch menu commands, wait till the idle loop to do so. This is more like what is done on Windows, and avoids the crash from destroying a menu in it's command. (ingham) * macosx/tkMacOSXHLEvents.c (ReallyKillMe): Don't force the shell to exit. According to the OS X HI guidelines, it should be possible to cancel an attempt to quit, and if we force the kill, here, it would not be possible to implement this. (ingham) * macosx/tkMacOSXApplication.r (removed): * macosx/tkMacOSXLibrary.r (removed): * macosx/tkMacOSXResource.r (removed): * macosx/Wish.pbproj/project.pbxproj: * macosx/tkAboutDlg.r: updated copyrights, cleaned up about box, removed obsolete unused resource files. (steffen) --- ChangeLog | 26 ++ macosx/Wish.pbproj/project.pbxproj | 31 +-- macosx/tkAboutDlg.r | 58 ++--- macosx/tkMacOSXApplication.r | 276 -------------------- macosx/tkMacOSXClipboard.c | 15 +- macosx/tkMacOSXHLEvents.c | 11 +- macosx/tkMacOSXLibrary.r | 510 ------------------------------------- macosx/tkMacOSXMenu.c | 84 ++++-- macosx/tkMacOSXMenus.c | 3 +- macosx/tkMacOSXResource.r | 502 ------------------------------------ 10 files changed, 129 insertions(+), 1387 deletions(-) delete mode 100644 macosx/tkMacOSXApplication.r delete mode 100644 macosx/tkMacOSXLibrary.r delete mode 100644 macosx/tkMacOSXResource.r diff --git a/ChangeLog b/ChangeLog index 3f23e28..5214350 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2003-05-13 Daniel Steffen + + backport of Mac OS X specific changes on trunk since 8.4.2: + + * macosx/tkMacOSXClipboard.c (TkSelGetSelection): Convert + '\r' to '\n' on the way into Tcl. (ingham) + + * macosx/tkMacOSXMenu.c (EventuallyInvokeMenu): New function, + used to invoke menu commands at idle time. + (TkMacOSXDispatchMenuEvent): Don't immediately dispatch menu + commands, wait till the idle loop to do so. This is more like + what is done on Windows, and avoids the crash from destroying + a menu in it's command. (ingham) + + * macosx/tkMacOSXHLEvents.c (ReallyKillMe): Don't force the shell + to exit. According to the OS X HI guidelines, it should be + possible to cancel an attempt to quit, and if we force the kill, + here, it would not be possible to implement this. (ingham) + + * macosx/tkMacOSXApplication.r (removed): + * macosx/tkMacOSXLibrary.r (removed): + * macosx/tkMacOSXResource.r (removed): + * macosx/Wish.pbproj/project.pbxproj: + * macosx/tkAboutDlg.r: updated copyrights, cleaned up about box, + removed obsolete unused resource files. (steffen) + 2003-05-10 Jeff Hobbs * generic/tkCanvPoly.c (PolygonToPostscript): diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj index eaec7aa..e91ace9 100644 --- a/macosx/Wish.pbproj/project.pbxproj +++ b/macosx/Wish.pbproj/project.pbxproj @@ -328,11 +328,8 @@ children = ( F5375533016C376E01DC9062, 4C3B4CF6040B18B200C916F0, - F5375534016C376E01DC9062, F5375535016C376E01DC9062, - F5375536016C376E01DC9062, F5375538016C376E01DC9062, - F5375539016C376E01DC9062, F537553A016C376E01DC9062, ); isa = PBXGroup; @@ -345,36 +342,18 @@ path = tkAboutDlg.r; refType = 4; }; - F5375534016C376E01DC9062 = { - fileEncoding = 5; - isa = PBXFileReference; - path = tkMacOSXApplication.r; - refType = 4; - }; F5375535016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; path = tkMacOSXCursors.r; refType = 4; }; - F5375536016C376E01DC9062 = { - fileEncoding = 5; - isa = PBXFileReference; - path = tkMacOSXLibrary.r; - refType = 4; - }; F5375538016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; path = tkMacOSXMenu.r; refType = 4; }; - F5375539016C376E01DC9062 = { - fileEncoding = 5; - isa = PBXFileReference; - path = tkMacOSXResource.r; - refType = 4; - }; F537553A016C376E01DC9062 = { fileEncoding = 5; isa = PBXFileReference; @@ -1530,7 +1509,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 8.4; - DYLIB_CURRENT_VERSION = 8.4; + DYLIB_CURRENT_VERSION = "$(FRAMEWORK_VERSION)"; DYLIB_INSTALL_PATH = /Library/Frameworks; FRAMEWORK_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)\""; FRAMEWORK_VERSION = 8.4; @@ -1549,10 +1528,6 @@ SECTORDER_FLAGS = ""; TCLSH_DIR = "$(TCL_FRAMEWORK_DIR)"; TCL_FRAMEWORK_DIR = "$(SYMROOT)"; - TK_MAJOR_VERSION = 8; - TK_MINOR_VERSION = 4; - TK_PATCH_LEVEL = .1; - TK_VERSION = 8.4; USE_GCC3_PFE_SUPPORT = YES; WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; WRAPPER_EXTENSION = framework; @@ -1574,7 +1549,7 @@ CFBundleExecutable Tk CFBundleGetInfoString - Tk Library 8.4, Copyright © 2002 Tcl Core Team. + Tk Library 8.4, Copyright © 2003 Tcl Core Team. MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright © 2001-2002, Apple Computer, Inc. CFBundleIconFile @@ -2953,7 +2928,7 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright CFBundleExecutable Wish Shell CFBundleGetInfoString - Wish Shell 8.4, Copyright © 2002 Tcl Core Team. + Wish Shell 8.4, Copyright © 2003 Tcl Core Team. MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright © 2001-2002, Apple Computer, Inc. CFBundleIconFile Wish.icns diff --git a/macosx/tkAboutDlg.r b/macosx/tkAboutDlg.r index b60f09a..aebdac7 100644 --- a/macosx/tkAboutDlg.r +++ b/macosx/tkAboutDlg.r @@ -10,19 +10,9 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkAboutDlg.r,v 1.3 2002/09/12 17:34:16 das Exp $ + * RCS: @(#) $Id: tkAboutDlg.r,v 1.3.2.1 2003/05/13 02:42:57 das Exp $ */ - - -/* - * New style DLOG templates have an extra field for the positioning - * options for the Dialog Box. We will not use this, for now, so we - * turn it off here. - */ - -#define DLOG_RezTemplateVersion 0 - /* * The folowing include and defines help construct * the version string for Tcl. @@ -33,22 +23,6 @@ #include #include "tk.h" -#if (TK_RELEASE_LEVEL == 0) -# define RELEASE_LEVEL alpha -#elif (TK_RELEASE_LEVEL == 1) -# define RELEASE_LEVEL beta -#elif (TK_RELEASE_LEVEL == 2) -# define RELEASE_LEVEL final -#endif - -#if (TK_RELEASE_LEVEL == 2) -# define MINOR_VERSION (TK_MINOR_VERSION * 16) + TK_RELEASE_SERIAL -#else -# define MINOR_VERSION TK_MINOR_VERSION * 16 -#endif - -#define RELEASE_CODE 0x00 - /* * The following two resources define the default "About Box" for Mac Tk. * This dialog appears if the "About Tk..." menu item is selected from @@ -58,19 +32,29 @@ * create and manage an About Dialog box. */ -data 'DLOG' (128, "Default About Box", purgeable) { - $"0055 006B 00F3 0196 0001 0100 0100 0000" - $"0000 0081 0000 280A" +resource 'DLOG' (128, "About Box", purgeable) { + {60, 40, 300, 404}, + movableDBoxProc, + visible, + noGoAway, + 0x0, + 128, + "About Tcl & Tk", + centerMainScreen }; -resource 'DITL' (129, "About Box", purgeable) { +resource 'DITL' (128, "About Box", purgeable) { { - {128, 128, 148, 186}, Button {enabled, "Ok"}, - { 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"}, - { 11, 24, 111, 92}, Picture {enabled, 128} + {200, 147, 220, 217}, Button {enabled, "Ok"}, + { 20, 108, 180, 344}, StaticText {disabled, + "Tcl " TCL_PATCH_LEVEL " & Tk " TK_PATCH_LEVEL "\n\n" + "© 2003 Tcl Core Team." "\n\n" + "Jim Ingham & Ian Reid" "\n" + "© 2001-2002 Apple Computer, Inc." "\n\n" + "Jim Ingham & Ray Johnson" "\n" + "© 1998-2000 Scriptics Inc." "\n" + "© 1996-1997 Sun Microsystems Inc."}, + { 20, 24, 120, 92}, Picture {enabled, 128} } }; diff --git a/macosx/tkMacOSXApplication.r b/macosx/tkMacOSXApplication.r deleted file mode 100644 index ece3891..0000000 --- a/macosx/tkMacOSXApplication.r +++ /dev/null @@ -1,276 +0,0 @@ -/* - * tkMacOSXApplication.r -- - * - * This file creates resources for use in the Wish application. - * - * 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. - * - * RCS: @(#) $Id: tkMacOSXApplication.r,v 1.3 2002/09/12 17:34:16 das Exp $ - */ - -#include - -/* - * The folowing include and defines help construct - * the version string for Tcl. - */ - -#define RC_INVOKED -#include "tk.h" - -#if (TK_RELEASE_LEVEL == 0) -# define RELEASE_LEVEL alpha -#elif (TK_RELEASE_LEVEL == 1) -# define RELEASE_LEVEL beta -#elif (TK_RELEASE_LEVEL == 2) -# define RELEASE_LEVEL final -#endif - -#if (TK_RELEASE_LEVEL == 2) -# define MINOR_VERSION (TK_MINOR_VERSION * 16) + TK_RELEASE_SERIAL -#else -# define MINOR_VERSION TK_MINOR_VERSION * 16 -#endif - -#define RELEASE_CODE 0x00 - -resource 'vers' (1) { - TK_MAJOR_VERSION, MINOR_VERSION, - RELEASE_LEVEL, 0x00, verUS, - TK_PATCH_LEVEL, - TK_PATCH_LEVEL ", by Jim Ingham & Ian Reid" "\n" "© 2001 Apple Computer, Inc" "\n" "1998-2000 Scriptics Inc." "\n" "1996-1997 Sun Microsystems Inc." -}; - -resource 'vers' (2) { - TK_MAJOR_VERSION, MINOR_VERSION, - RELEASE_LEVEL, 0x00, verUS, - TK_PATCH_LEVEL, - "Wish " TK_PATCH_LEVEL " © 1993-1999" -}; - -#define TK_APP_RESOURCES 128 -#define TK_APP_CREATOR 'WIsH' - -/* - * The 'BNDL' resource is the primary link between a file's - * creator/type and its icon. This resource acts for all Tcl shared - * libraries; other libraries will not need one and ought to use - * custom icons rather than new file types for a different appearance. - */ - -resource 'BNDL' (TK_APP_RESOURCES, "Tk app bundle", purgeable) -{ - TK_APP_CREATOR, - 0, - { - 'FREF', - { - 0, TK_APP_RESOURCES, - 1, TK_APP_RESOURCES+1 - }, - 'ICN#', - { - 0, TK_APP_RESOURCES, - 1, TK_APP_RESOURCES+1 - } - } -}; - -resource 'FREF' (TK_APP_RESOURCES, purgeable) -{ - 'APPL', 0, "" -}; -resource 'FREF' (TK_APP_RESOURCES+1, purgeable) -{ - 'TEXT', 1, "" -}; - -type TK_APP_CREATOR as 'STR '; -resource TK_APP_CREATOR (0, purgeable) { - "Wish " TK_PATCH_LEVEL " © 1996" -}; - -/* - * The 'kind' resource works with a 'BNDL' in Macintosh Easy Open - * to affect the text the Finder displays in the "kind" column and - * file info dialog. This information will be applied to all files - * with the listed creator and type. - */ -resource 'kind' (TK_APP_RESOURCES, "Tcl kind", purgeable) { - TK_APP_CREATOR, - 0, /* region = USA */ - { - 'APPL', "Wish", - 'TEXT', "Tcl/Tk Script" - } -}; - -#define kIconHelpString 256 - -resource 'hfdr' (-5696, purgeable) { - HelpMgrVersion, hmDefaultOptions, 0, 0, - {HMSTRResItem {kIconHelpString}} -}; -resource 'STR ' (kIconHelpString, purgeable) { - "This is the interpreter for Tcl & Tk scripts" - " running on Macintosh computers." -}; - -/* - * The following resource define the icon used by Tcl scripts. Any - * TEXT file with the creator of WIsH will get this icon. - */ - -data 'icl4' (TK_APP_RESOURCES + 1, "Tk Doc", purgeable) { - $"000F FFFF FFFF FFFF FFFF FFF0 0000 0000" - $"000F 3333 3333 3333 3333 33FF 0000 0000" - $"000F 3333 3333 3333 3433 33F2 F000 0000" - $"000F 3333 3333 3333 7D43 33F2 2F00 0000" - $"000F 3333 3333 3335 5623 33F2 22F0 0000" - $"000F 3333 3333 3356 6343 33FF FFFF 0000" - $"000F 3333 3333 256F 5223 3333 333F 0000" - $"000F 3333 3333 D666 2433 3333 333F 0000" - $"000F 3333 3333 D5F6 6633 3333 333F 0000" - $"000F 3333 3332 5666 6733 3333 333F 0000" - $"000F 3333 3336 E56F 6633 3333 333F 0000" - $"000F 3333 3336 5656 5733 3333 333F 0000" - $"000F 3333 3336 E5B6 5233 3333 333F 0000" - $"000F 3333 3336 5ED6 3333 3333 333F 0000" - $"000F 3333 3376 6475 6233 3333 333F 0000" - $"000F 3333 333D 5D56 7333 3333 333F 0000" - $"000F 3333 3336 6C55 6333 3333 333F 0000" - $"000F 3333 3336 5C56 7333 3333 333F 0000" - $"000F 3333 3362 6CE6 D333 3333 333F 0000" - $"000F 3333 3336 5C65 6333 3333 333F 0000" - $"000F 3333 3336 EC5E 3333 3333 333F 0000" - $"000F 3333 3336 5C56 6333 3333 333F 0000" - $"000F 3333 3333 5C75 3333 3333 333F 0000" - $"000F 3333 3333 5DD6 3333 3333 333F 0000" - $"000F 3333 3333 3CDD 3333 3333 333F 0000" - $"000F 3333 3333 3303 3333 3333 333F 0000" - $"000F 3333 3333 3C33 3333 3333 333F 0000" - $"000F 3333 3333 3C33 3333 3333 333F 0000" - $"000F 3333 3333 3C33 3333 3333 333F 0000" - $"000F 3333 3333 3333 3333 3333 333F 0000" - $"000F 3333 3333 3333 3333 3333 333F 0000" - $"000F FFFF FFFF FFFF FFFF FFFF FFFF 0000" -}; - -data 'ICN#' (TK_APP_RESOURCES + 1, "Tk Doc", purgeable) { - $"1FFF FE00 1000 0300 1000 F280 1003 F240" - $"1003 E220 1007 E3F0 100F C010 100F C010" - $"100F C010 101F F010 101F F010 101F F010" - $"101F F010 101F F010 101D E010 101D E010" - $"101D E010 101D C010 101D C010 101D C010" - $"101D C010 100D 8010 100D 8010 100D 8010" - $"1005 8010 1002 0010 1002 0010 1002 0010" - $"1002 0010 1002 0010 1000 0010 1FFF FFF0" - $"1FFF FE00 1FFF FF00 1FFF FF80 1FFF FFC0" - $"1FFF FFE0 1FFF FFF0 1FFF FFF0 1FFF FFF0" - $"1FFF FFF0 1FFF FFF0 1FFF FFF0 1FFF FFF0" - $"1FFF FFF0 1FFF FFF0 1FFF FFF0 1FFF FFF0" - $"1FFF FFF0 1FFF FFF0 1FFF FFF0 1FFF FFF0" - $"1FFF FFF0 1FFF FFF0 1FFF FFF0 1FFF FFF0" - $"1FFF FFF0 1FFF FFF0 1FFF FFF0 1FFF FFF0" - $"1FFF FFF0 1FFF FFF0 1FFF FFF0 1FFF FFF0" -}; - -data 'ics#' (TK_APP_RESOURCES + 1, "Tk Doc", purgeable) { - $"7FF0 41D8 419C 4384 43C4 47C4 47C4 4784" - $"4684 4684 4284 4284 4104 4104 4104 7FFC" - $"7FE0 7FF0 7FF8 7FFC 7FFC 7FFC 7FFC 7FFC" - $"7FFC 7FFC 7FFC 7FFC 7FFC 7FFC 7FFC 7FFC" -}; - -data 'ics4' (TK_APP_RESOURCES + 1, "Tk Doc", purgeable) { - $"0FFF FFFF FFFF 0000 0F33 3333 53F2 F000" - $"0F33 3335 52FF FF00 0F33 33E6 3333 3F00" - $"0F33 3256 6333 3F00 0F33 3556 6333 3F00" - $"0F33 3A5E 3333 3F00 0F33 65D6 D333 3F00" - $"0F33 3655 5333 3F00 0F33 65C6 3333 3F00" - $"0F33 3EC5 E333 3F00 0F33 36C6 3333 3F00" - $"0F33 33CD 3333 3F00 0F33 33C3 3333 3F00" - $"0F33 33C3 3333 3F00 0FFF FFFF FFFF FF00" -}; - -/* - * The following resources define the icons for the Wish - * application. - */ - -data 'icl4' (TK_APP_RESOURCES, "Tk App", purgeable) { - $"0000 0000 0000 000F 0000 0000 0000 0000" - $"0000 0000 0000 00FC F000 0000 0000 0000" - $"0000 0000 0000 0FCC CF66 0000 0000 0000" - $"0000 0000 0000 FCCC C556 0000 0000 0000" - $"0000 0000 000F CCCC 566F 0000 0000 0000" - $"0000 0000 00FC CCC5 6F5C F000 0000 0000" - $"0000 0000 0FCC CC66 66CC CF00 0000 0000" - $"0000 0000 FCCC CCD5 5666 CCF0 0000 0000" - $"0000 000F CCCC C656 5667 CCCF 0000 0000" - $"0000 00FC CCCC C6E5 5566 CCCC F000 0000" - $"0000 0FCC CCCC C656 5657 CCCC CF00 0000" - $"0000 FCCC CCCC C6E5 565C CCCC CCF0 0000" - $"000F CCCC CCCC C655 565C CCCC CCCF 0000" - $"00FC CCCC CCCC 7660 556C CCCC CCCC F000" - $"0FCC CCCC CCCC CD5D 567C CCCC CCCC CF00" - $"FCCC CCCC CCCC 6660 556C CCCC CCCC CCF0" - $"0FCC CCCC CCCC 665C 565C CCCC CCCC C0CF" - $"00FC CCCC CCCC 6660 E6DC CCCC CCCC CCF0" - $"000F CCCC CCCC C650 656C CCCC CCCC CF00" - $"0000 FCCC CCCC C6EC 5ECC CCCC CCCC F000" - $"0000 0FCC CCCC C650 566C CCCC CCCF 0000" - $"0000 00FC CCCC CC50 75CC CCCC CCF0 0000" - $"0000 000F CCCC CC50 56CC CCCC CF00 0000" - $"0000 0000 FCCC CCC0 5CCC CCCC F000 0000" - $"0000 0000 0FCC CCC0 CCCC CCCF 0000 0000" - $"0000 0000 00FC CCC0 CCCC CCF0 0000 0000" - $"0000 0000 000F CCC0 CCCC CF00 0000 0000" - $"0000 0000 0000 FCCC CCCC F000 0000 0000" - $"0000 0000 0000 0FCC 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" -}; - -data 'ICN#' (TK_APP_RESOURCES, "Tk App", purgeable) { - $"0001 0000 0002 8000 0004 7000 0008 7000" - $"0010 F000 0021 E800 0043 C400 0081 F200" - $"0107 F100 0207 F080 0407 F040 0807 E020" - $"1007 E010 200E E008 4002 E004 800E E002" - $"400E E001 200E C002 1006 E004 0806 C008" - $"0406 E010 0202 C020 0102 C040 0080 8080" - $"0041 0100 0021 0200 0011 0400 0009 0800" - $"0004 1000 0002 2000 0001 4000 0000 8000" - $"0001 0000 0003 8000 0007 F000 000F F000" - $"001F F000 003F F800 007F FC00 00FF FE00" - $"01FF FF00 03FF FF80 07FF FFC0 0FFF FFE0" - $"1FFF FFF0 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" -}; - -data 'ics#' (TK_APP_RESOURCES, "Tk App", purgeable) { - $"01C0 0260 04E0 09D0 1388 23C4 43C2 8281" - $"8282 4284 2188 1190 0920 0540 0280 0100" - $"01C0 03E0 07E0 0FF0 1FF8 3FFC 7FFE FFFF" - $"FFFE 7FFC 3FF8 1FF0 0FE0 07C0 0380 0100" -}; - -data 'ics4' (TK_APP_RESOURCES, "Tk App", purgeable) { - $"0000 000F C000 0000 0000 00FC 6600 0000" - $"0000 0FCC 6600 0000 0000 FCC6 66F0 0000" - $"000F CCD5 56CF 0000 00FC CC66 57CC F000" - $"0FCC CC65 56CC CF00 FCCC CC56 57CC CCF0" - $"0FCC CCC6 6CCC CCCF 00FC CCC6 5CCC CCF0" - $"000F CCC6 6CCC CF00 0000 FCCC 5CCC F000" - $"0000 0FCC CCCF 0000 0000 00FC CCF0 0000" - $"0000 000F CF00 0000 0000 0000 F000 0000" -}; - - diff --git a/macosx/tkMacOSXClipboard.c b/macosx/tkMacOSXClipboard.c index 7bfa7ce..b327b90 100644 --- a/macosx/tkMacOSXClipboard.c +++ b/macosx/tkMacOSXClipboard.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: tkMacOSXClipboard.c,v 1.2 2002/08/31 06:12:29 das Exp $ + * RCS: @(#) $Id: tkMacOSXClipboard.c,v 1.2.2.1 2003/05/13 02:42:57 das Exp $ */ #include "tkInt.h" @@ -81,8 +81,9 @@ TkSelGetSelection( } if (length > 0) { Tcl_DString encodedText; + char *data; - buf = (char *)ckalloc(length+1); + buf = (char *) ckalloc(length + 1); buf[length] = 0; err = GetScrapFlavorData(scrapRef, 'TEXT', &length, buf); if (err != noErr) { @@ -90,7 +91,17 @@ TkSelGetSelection( " GetScrapFlavorData failed.", (char *) NULL); return TCL_ERROR; } + + /* + * Tcl expects '\n' not '\r' as the line break character. + */ + for (data = buf; *data != '\0'; data++) { + if (*data == '\r') { + *data = '\n'; + } + } + Tcl_ExternalToUtfDString(TkMacOSXCarbonEncoding, buf, length, &encodedText); result = (*proc)(clientData, interp, diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c index 65b0b6c..ac167f2 100644 --- a/macosx/tkMacOSXHLEvents.c +++ b/macosx/tkMacOSXHLEvents.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: tkMacOSXHLEvents.c,v 1.5 2003/02/25 16:11:22 das Exp $ + * RCS: @(#) $Id: tkMacOSXHLEvents.c,v 1.5.2.1 2003/05/13 02:42:57 das Exp $ */ #include "tkMacOSXPort.h" @@ -404,13 +404,11 @@ ScriptHandler (const AppleEvent * event, AppleEvent * reply, long handlerRefcon) * * ReallyKillMe -- * - * This proc tries to kill the shell by running exit, and if that - * has not succeeded (e.g. because someone has renamed the exit - * command), calls Tcl_Exit to really kill the shell. Called from - * an event scheduled by the "Quit" AppleEvent handler. + * This proc tries to kill the shell by running exit, + * called from an event scheduled by the "Quit" AppleEvent handler. * * Results: - * Kills the shell. + * Runs the "exit" command which might kill the shell. * * Side effects: * None. @@ -425,7 +423,6 @@ ReallyKillMe(Tcl_Event *eventPtr, int flags) if (interp != NULL) { Tcl_GlobalEval(interp, "exit"); } - Tcl_Exit(0); return 1; } diff --git a/macosx/tkMacOSXLibrary.r b/macosx/tkMacOSXLibrary.r deleted file mode 100644 index 61f3b86..0000000 --- a/macosx/tkMacOSXLibrary.r +++ /dev/null @@ -1,510 +0,0 @@ -/* - * tkMacOSXLibrary.r -- - * - * This file creates resources for use in most Tk applications. - * This is designed to be an example of using the Tcl/Tk - * libraries in a Macintosh Application. - * - * 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. - * - * RCS: @(#) $Id: tkMacOSXLibrary.r,v 1.3 2002/09/12 17:34:16 das Exp $ - */ - -/* - * New style DLOG templates have an extra field for the positioning - * options for the Dialog Box. We will not use this, for now, so we - * turn it off here. - */ - -#define DLOG_RezTemplateVersion 0 - -/* -#include -#include -#include -*/ - -/* - * The folowing include and defines help construct - * the version string for Tcl. - */ - -#define RC_INVOKED -#include -#include "tk.h" - -#if (TK_RELEASE_LEVEL == 0) -# define RELEASE_LEVEL alpha -#elif (TK_RELEASE_LEVEL == 1) -# define RELEASE_LEVEL beta -#elif (TK_RELEASE_LEVEL == 2) -# define RELEASE_LEVEL final -#endif - -#if (TK_RELEASE_LEVEL == 2) -# define MINOR_VERSION (TK_MINOR_VERSION * 16) + TK_RELEASE_SERIAL -#else -# define MINOR_VERSION TK_MINOR_VERSION * 16 -#endif - -#define RELEASE_CODE 0x00 - -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." -}; - -resource 'vers' (2) { - TK_MAJOR_VERSION, MINOR_VERSION, - RELEASE_LEVEL, 0x00, verUS, - TK_PATCH_LEVEL, - "Tk Library " TK_PATCH_LEVEL " © 1993-1999" -}; - -#define TK_LIBRARY_RESOURCES 3000 -/* - * The -16397 string will be displayed by Finder when a user - * tries to open the shared library. The string should - * give the user a little detail about the library's capabilities - * and enough information to install the library in the correct location. - * A similar string should be placed in all shared libraries. - */ -resource 'STR ' (-16397, purgeable) { - "Tk Library\n\n" - "This is the library needed to run Tcl/Tk programs. " - "To work properly, it should be placed in the Tool Command Language folder " - "within the Extensions folder." -}; - - -/* - * We now load the Tk library into the resource fork of the library. - */ - -read 'TEXT' (TK_LIBRARY_RESOURCES+1, "tk", purgeable) - "::library:tk.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+2, "button", purgeable) - "::library:button.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+3, "dialog", purgeable) - "::library:dialog.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+4, "entry", purgeable) - "::library:entry.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+5, "focus", purgeable) - "::library:focus.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+6, "listbox", purgeable) - "::library:listbox.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+7, "menu", purgeable) - "::library:menu.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+8, "optionMenu", purgeable) - "::library:optMenu.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+9, "palette", purgeable) - "::library:palette.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+10, "scale", purgeable) - "::library:scale.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+11, "scrollbar", purgeable) - "::library:scrlbar.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+12, "tearoff", purgeable) - "::library:tearoff.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+13, "text", purgeable) - "::library:text.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+14, "tkerror", purgeable) - "::library:bgerror.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+15, "Console", purgeable) - "::library:console.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+16, "msgbox", purgeable, preload) - "::library:msgbox.tcl"; -read 'TEXT' (TK_LIBRARY_RESOURCES+17, "comdlg", purgeable, preload) - "::library:comdlg.tcl"; - -/* - * The following two resources define the default "About Box" for Mac Tk. - * This dialog appears if the "About Tk..." menu item is selected from - * the Apple menu. This dialog may be overridden by defining a Tcl procedure - * with the name of "tkAboutDialog". If this procedure is defined the - * default dialog will not be shown and the Tcl procedure is expected to - * create and manage an About Dialog box. - */ - -data 'DLOG' (128, "Default About Box", purgeable) { - $"0055 006B 00F3 0196 0001 0100 0100 0000" - $"0000 0081 0000 280A" -}; - -resource 'DITL' (129, "About Box", purgeable) { - { - {128, 128, 148, 186}, Button {enabled, "Ok"}, - { 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"}, - { 11, 24, 111, 92}, Picture {enabled, 128} - } -}; - -data 'PICT' (128, purgeable) { - $"13A4 0000 0000 0064 0044 0011 02FF 0C00" - $"FFFE 0000 0048 0000 0048 0000 0000 0000" - $"0064 0044 0000 0000 0001 000A 0000 0000" - $"0064 0044 0099 8044 0000 0000 0064 0044" - $"0000 0000 0000 0000 0048 0000 0048 0000" - $"0000 0008 0001 0008 0000 0000 0108 00D8" - $"0000 0000 0001 5A5A 8000 00FF 3736 FF00" - $"FF00 FF00 3535 FF00 FF00 CC00 3434 FF00" - $"FF00 9900 3333 FF00 FF00 6600 3736 FF00" - $"FF00 3300 3535 FF00 FF00 0000 3434 FF00" - $"CC00 FF00 3333 FF00 CC00 CC00 3736 FF00" - $"CC00 9900 3535 FF00 CC00 6600 FAFA FF00" - $"CC00 3300 3333 FF00 CC00 0000 3130 FF00" - $"9900 FF00 2F2F FF00 9900 CC00 FAFA FF00" - $"9900 9900 F9F9 FF00 9900 6600 3130 FF00" - $"9900 3300 2F2F FF00 9900 0000 2E2E FF00" - $"6600 FF00 F9F9 FF00 6600 CC00 3130 FF00" - $"6600 9900 2F2F FF00 6600 6600 2E2E FF00" - $"6600 3300 2D2D FF00 6600 0000 3130 FF00" - $"3300 FF00 2F2F FF00 3300 CC00 2E2E FF00" - $"3300 9900 2D2D FF00 3300 6600 3130 FF00" - $"3300 3300 2F2F FF00 3300 0000 2E2E FF00" - $"0000 FF00 2D2D FF00 0000 CC00 3130 FF00" - $"0000 9900 2F2F FF00 0000 6600 2E2E FF00" - $"0000 3300 2DF8 FF00 0000 0000 2B2A CC00" - $"FF00 FF00 2929 CC00 FF00 CC00 2828 CC00" - $"FF00 9900 27F8 CC00 FF00 6600 2B2A CC00" - $"FF00 3300 2929 CC00 FF00 0000 2828 CC00" - $"CC00 FF00 2727 CC00 CC00 CC00 2B2A CC00" - $"CC00 9900 2929 CC00 CC00 6600 2828 CC00" - $"CC00 3300 2727 CC00 CC00 0000 2B2A CC00" - $"9900 FF00 2929 CC00 9900 CC00 2828 CC00" - $"9900 9900 2727 CC00 9900 6600 DBDB CC00" - $"9900 3300 4747 CC00 9900 0000 4646 CC00" - $"6600 FF00 4545 CC00 6600 CC00 DBDB CC00" - $"6600 9900 4747 CC00 6600 6600 4646 CC00" - $"6600 3300 4545 CC00 6600 0000 DBDB CC00" - $"3300 FF00 4747 CC00 3300 CC00 4646 CC00" - $"3300 9900 4545 CC00 3300 6600 DBDB CC00" - $"3300 3300 4141 CC00 3300 0000 4040 CC00" - $"0000 FF00 3F3F CC00 0000 CC00 4342 CC00" - $"0000 9900 4141 CC00 0000 6600 4040 CC00" - $"0000 3300 3F3F CC00 0000 0000 4342 9900" - $"FF00 FF00 4141 9900 FF00 CC00 4040 9900" - $"FF00 9900 3F3F 9900 FF00 6600 4342 9900" - $"FF00 3300 4141 9900 FF00 0000 4040 9900" - $"CC00 FF00 3F3F 9900 CC00 CC00 4342 9900" - $"CC00 9900 4141 9900 CC00 6600 4040 9900" - $"CC00 3300 3F3F 9900 CC00 0000 4342 9900" - $"9900 FF00 4141 9900 9900 CC00 4040 9900" - $"9900 9900 3F3F 9900 9900 6600 3D3C 9900" - $"9900 3300 3B3B 9900 9900 0000 3A3A 9900" - $"6600 FF00 3939 9900 6600 CC00 3D3C 9900" - $"6600 9900 3B3B 9900 6600 6600 3A3A 9900" - $"6600 3300 3939 9900 6600 0000 3D3C 9900" - $"3300 FF00 3B3B 9900 3300 CC00 3A3A 9900" - $"3300 9900 3939 9900 3300 6600 3D3C 9900" - $"3300 3300 3B3B 9900 3300 0000 3A3A 9900" - $"0000 FF00 3939 9900 0000 CC00 3D3C 9900" - $"0000 9900 3B3B 9900 0000 6600 3A3A 9900" - $"0000 3300 3939 9900 0000 0000 3D3C 6600" - $"FF00 FF00 3B3B 6600 FF00 CC00 3A3A 6600" - $"FF00 9900 3939 6600 FF00 6600 3D3C 6600" - $"FF00 3300 3B3B 6600 FF00 0000 3A3A 6600" - $"CC00 FF00 3939 6600 CC00 CC00 3736 6600" - $"CC00 9900 3535 6600 CC00 6600 3434 6600" - $"CC00 3300 3333 6600 CC00 0000 3736 6600" - $"9900 FF00 3535 6600 9900 CC00 3434 6600" - $"9900 9900 3333 6600 9900 6600 3736 6600" - $"9900 3300 3535 6600 9900 0000 3434 6600" - $"6600 FF00 3333 6600 6600 CC00 3736 6600" - $"6600 9900 3535 6600 6600 6600 3434 6600" - $"6600 3300 3333 6600 6600 0000 3736 6600" - $"3300 FF00 3535 6600 3300 CC00 3434 6600" - $"3300 9900 3333 6600 3300 6600 3736 6600" - $"3300 3300 3535 6600 3300 0000 3434 6600" - $"0000 FF00 3333 6600 0000 CC00 3130 6600" - $"0000 9900 2F2F 6600 0000 6600 2E2E 6600" - $"0000 3300 F9F9 6600 0000 0000 3130 3300" - $"FF00 FF00 2F2F 3300 FF00 CC00 2E2E 3300" - $"FF00 9900 F9F9 3300 FF00 6600 3130 3300" - $"FF00 3300 2F2F 3300 FF00 0000 2E2E 3300" - $"CC00 FF00 2D2D 3300 CC00 CC00 3130 3300" - $"CC00 9900 2F2F 3300 CC00 6600 2E2E 3300" - $"CC00 3300 2D2D 3300 CC00 0000 3130 3300" - $"9900 FF00 2F2F 3300 9900 CC00 2E2E 3300" - $"9900 9900 2D2D 3300 9900 6600 3130 3300" - $"9900 3300 2F2F 3300 9900 0000 2E2E 3300" - $"6600 FF00 2DF8 3300 6600 CC00 2B2A 3300" - $"6600 9900 2929 3300 6600 6600 2828 3300" - $"6600 3300 27F8 3300 6600 0000 2B2A 3300" - $"3300 FF00 2929 3300 3300 CC00 2828 3300" - $"3300 9900 2727 3300 3300 6600 2B2A 3300" - $"3300 3300 2929 3300 3300 0000 2828 3300" - $"0000 FF00 2727 3300 0000 CC00 2B2A 3300" - $"0000 9900 2929 3300 0000 6600 2828 3300" - $"0000 3300 2727 3300 0000 0000 4948 0000" - $"FF00 FF00 4747 0000 FF00 CC00 4646 0000" - $"FF00 9900 4545 0000 FF00 6600 4948 0000" - $"FF00 3300 4747 0000 FF00 0000 4646 0000" - $"CC00 FF00 4545 0000 CC00 CC00 4948 0000" - $"CC00 9900 4747 0000 CC00 6600 4646 0000" - $"CC00 3300 4545 0000 CC00 0000 4342 0000" - $"9900 FF00 4141 0000 9900 CC00 4040 0000" - $"9900 9900 3F3F 0000 9900 6600 4342 0000" - $"9900 3300 4141 0000 9900 0000 4040 0000" - $"6600 FF00 3F3F 0000 6600 CC00 4342 0000" - $"6600 9900 4141 0000 6600 6600 4040 0000" - $"6600 3300 3F3F 0000 6600 0000 4342 0000" - $"3300 FF00 4141 0000 3300 CC00 4040 0000" - $"3300 9900 3F3F 0000 3300 6600 4342 0000" - $"3300 3300 4141 0000 3300 0000 4040 0000" - $"0000 FF00 3F3F 0000 0000 CC00 4342 0000" - $"0000 9900 4141 0000 0000 6600 4040 0000" - $"0000 3300 3F3F EE00 0000 0000 3D3C DD00" - $"0000 0000 3B3B BB00 0000 0000 3A3A AA00" - $"0000 0000 3939 8800 0000 0000 3D3C 7700" - $"0000 0000 3B3B 5500 0000 0000 3A3A 4400" - $"0000 0000 3939 2200 0000 0000 3D3C 1100" - $"0000 0000 3B3B 0000 EE00 0000 3A3A 0000" - $"DD00 0000 3939 0000 BB00 0000 3D3C 0000" - $"AA00 0000 3B3B 0000 8800 0000 3A3A 0000" - $"7700 0000 3939 0000 5500 0000 3D3C 0000" - $"4400 0000 3B3B 0000 2200 0000 3A3A 0000" - $"1100 0000 3939 0000 0000 EE00 3D3C 0000" - $"0000 DD00 3B3B 0000 0000 BB00 3A3A 0000" - $"0000 AA00 3939 0000 0000 8800 3D3C 0000" - $"0000 7700 3B3B 0000 0000 5500 3A3A 0000" - $"0000 4400 3939 0000 0000 2200 3736 0000" - $"0000 1100 3535 EE00 EE00 EE00 3434 DD00" - $"DD00 DD00 3333 BB00 BB00 BB00 3736 AA00" - $"AA00 AA00 3535 8800 8800 8800 3434 7700" - $"7700 7700 3333 5500 5500 5500 3736 4400" - $"4400 4400 3535 2200 2200 2200 3434 1100" - $"1100 1100 3333 0000 0000 0000 0000 0000" - $"0064 0044 0000 0000 0064 0044 0000 000A" - $"0000 0000 0064 0044 02BD 0013 E800 01F5" - $"F6FE 07FE 0E02 3232 33FD 3900 0EE6 001D" - $"FC00 01F5 F5FE 0700 08FE 0E02 3232 33FE" - $"3900 3AFC 40F2 4102 4033 07E9 0017 0100" - $"0EFC 40DC 4102 390E F5F5 0002 F5F5 F6FE" - $"0702 0E07 0016 0100 32D5 4104 4039 0E32" - $"33FD 3900 3AFC 40FC 4101 3200 0801 000E" - $"C141 010E 0008 0100 0EC1 4101 0800 0801" - $"000E C141 0107 0008 0100 0EC1 4101 0700" - $"0901 0007 C241 0240 F500 0E01 0007 E841" - $"0147 47DD 4102 4000 0012 0100 07F0 4100" - $"47FA 4101 3B3B DD41 0240 0000 1901 0007" - $"F141 0C47 3B0B 3B47 4141 4711 0505 3B47" - $"DF41 023A 0000 1701 00F6 F041 010B 0BFE" - $"4105 473B 0505 113B DE41 0239 0000 1A02" - $"00F5 40F3 410C 473B 053B 4741 4741 0B0B" - $"3B47 47DE 4102 3900 0018 0200 F540 F341" - $"0247 110B FE41 0447 1105 4147 DC41 0233" - $"0000 1B02 0000 40F3 4103 4711 1147 FE41" - $"0205 3547 F741 FD47 E941 0232 0000 1E02" - $"0000 40F2 4106 113B 4741 4735 0BF7 4106" - $"4741 390E 0E40 47EA 4102 0E00 0021 0200" - $"0040 F241 0711 3B47 4141 0B35 47F9 4102" - $"4740 07FE 0002 F640 47EB 4102 0E00 0023" - $"0200 0040 F341 0847 3541 4147 3B05 4147" - $"FA41 0947 3AF6 00F5 4F55 F50E 47EB 4102" - $"0700 0022 0200 003A F341 0147 3BFE 4101" - $"0B0B F941 0547 3AF5 0055 C8FE CE01 5640" - $"EB41 0207 0000 1F02 0000 39F0 4104 4741" - $"053B 47FB 4104 4740 F5F5 A4FC CE01 C85D" - $"EB41 02F6 0000 1F02 0000 39F0 4104 473B" - $"0541 47FC 4104 4740 07F6 C8FA CE00 64EC" - $"4103 40F5 0000 1C02 0000 39F0 4102 4711" - $"0BFA 4103 4708 2AC8 FACE 0164 D8EC 4100" - $"40FE 0025 0200 0039 EF41 020B 3B47 FC41" - $"0347 0FF5 A4FB CE02 C887 D8FC 41FE 47FC" - $"4100 47F9 4100 3AFE 0028 0200 0039 EF41" - $"020B 3B47 FD41 0347 3900 A4FA CE00 ABFA" - $"4109 3B11 3B41 4147 3B0B 3B47 FA41 0039" - $"FE00 2402 0000 33F1 4102 4741 0BFA 4101" - $"0779 F9CE 0064 FA41 0235 050B FD41 010B" - $"0BF9 4100 39FE 0028 0200 0032 F141 0247" - $"3B0B FC41 0247 39F6 F9CE 0187 D8FB 4103" - $"4741 050B FE41 0247 110B F941 0039 FE00" - $"2C02 0000 32F1 4102 473B 11FB 4101 0879" - $"FACE 05AA 4041 4147 47FE 410A 4741 0511" - $"4741 4147 3511 47FA 4100 32FE 002F 0200" - $"000E F141 0347 3B11 47FE 4103 4740 F6C8" - $"FACE 0564 D841 4039 39FE 4104 473B 053B" - $"47FE 4102 3541 47FA 4100 0EFE 0027 0200" - $"000E F141 0347 3B3B 47FE 4102 470F 79FA" - $"CE0C 8741 4032 F500 003A 4741 473B 05F2" - $"4100 0EFE 0027 0200 000E F141 0347 3B3B" - $"47FD 4101 0EA4 FACE 01AB AAFE C808 7900" - $"3947 4147 110B 47F3 4100 07FE 001C 0200" - $"000E EA41 0240 2BC8 F5CE 0881 0033 4741" - $"410B 3B47 F341 0007 FE00 1A02 0000 08EB" - $"4102 473A 55F4 CE06 5D00 3947 4741 0BF1" - $"4100 F6FE 001C 0200 0007 EB41 0247 3979" - $"F4CE 0739 0039 4747 3511 47F3 4101 40F5" - $"FE00 1C02 0000 07EB 4102 4739 A4F5 CE08" - $"AB0E 0040 4741 1141 47F3 4100 40FD 001B" - $"0200 0007 EB41 0247 39A4 F5CE 0787 0707" - $"4147 4111 47F2 4100 40FD 001B 0200 0007" - $"EB41 0247 39C8 F5CE 0763 F532 4747 3B3B" - $"47F2 4100 3AFD 001A 0300 00F6 40EC 4102" - $"4739 C8F5 CE05 39F5 4047 413B F041 0039" - $"FD00 1C03 0000 F540 EB41 0140 C8FD CE01" - $"C8A4 FCCE 03AB 080E 47ED 4100 39FD 001A" - $"FE00 0040 EB41 0040 FCCE 01A4 C8FC CE03" - $"FA07 4047 ED41 0032 FD00 1AFE 0000 40EA" - $"4100 AAFE CE02 87F9 C8FC CE02 560F 47EC" - $"4100 32FD 0019 FE00 0040 EA41 00AB FECE" - $"0264 56C8 FDCE 01C8 32EA 4100 0EFD 001B" - $"FE00 0040 ED41 030E 4047 87FE CE01 4055" - $"FCCE 01FA 40EA 4100 08FD 001A FE00 003A" - $"ED41 0807 0740 FBCE CEAB 3979 FDCE 00AB" - $"E841 0007 FD00 1CFE 0000 3AED 4108 0700" - $"F6A4 CECE 8733 79FD CE02 4147 47EA 4100" - $"07FD 001E FE00 0039 ED41 0807 2AA4 C8CE" - $"CE88 0E9D FECE 0364 1C39 39EB 4101 40F5" - $"FD00 1CFE 0000 39ED 4101 074F FDCE 0264" - $"F7A4 FECE 03AB 80F6 07EB 4100 40FC 001C" - $"FE00 0039 ED41 0108 79FE CE03 AB40 2BA4" - $"FCCE 02F7 0E47 EC41 0040 FC00 1CFE 0000" - $"39ED 4101 0879 FECE 03AB 40F6 C8FC CE02" - $"F615 47EC 4100 40FC 001E FE00 003A EE41" - $"0247 0E79 FECE 03AB 40F5 C8FD CE03 A4F5" - $"3A47 EC41 0040 FC00 1EFE 0000 3AEE 4102" - $"470E 56FE CE03 FB3A F6C8 FDCE 0280 F540" - $"EB41 0140 F5FD 001E FE00 0040 EE41 0947" - $"0F56 CECE C888 39F6 C8FD CE02 5601 40EB" - $"4101 40F5 FD00 1CFE 0000 40EE 4109 4739" - $"32CE CEC8 8839 2AC8 FDCE 0156 07E9 4100" - $"F6FD 001B FE00 0040 EE41 0847 3A32 CECE" - $"C864 152A FCCE 0132 07E9 4100 07FD 001A" - $"FE00 0040 ED41 0740 32AB CEC8 6439 4EFC" - $"CE01 3A07 E941 0007 FD00 1D03 0000 F540" - $"ED41 0740 0EAB CECE 640F 4EFD CE03 AB40" - $"0840 EA41 0007 FD00 1B03 0000 F540 EC41" - $"060F 81CE CE64 334E FDCE 02AB 400E E941" - $"000E FD00 1C02 0000 F6EC 4107 4715 FACE" - $"CE64 334E FDCE 0387 0F0E 47EA 4100 0EFD" - $"001C 0200 0007 EC41 0747 16F9 CEC8 6433" - $"4EFD CE03 6308 4047 EA41 000E FD00 1A02" - $"0000 07EB 4106 40F9 CEC8 6439 4EFD CE02" - $"3940 47E9 4100 32FD 001B 0200 0007 EA41" - $"0539 CECE 8839 F6FE CE04 AB41 4139 40EA" - $"4100 32FD 001C 0200 0007 EB41 0E47 3AC8" - $"CE88 39F6 C8CE CE64 15F6 F540 EA41 0033" - $"FD00 1A02 0000 07EA 410C 40A4 CE87 392A" - $"C8CE AB41 40F8 F6E9 4100 39FD 001B 0200" - $"000E EB41 0D47 41AB C887 39F5 C8CE ABAB" - $"CEA4 07E9 4100 39FD 001C 0200 000E ED41" - $"0947 3939 4787 C8AB 40F5 C8FD CE01 A40E" - $"E941 0039 FD00 1D02 0000 0EED 4109 473A" - $"0007 80CE AB40 F5C8 FDCE 0255 0E47 EA41" - $"0039 FD00 1B02 0000 0EEB 4107 0779 C8CE" - $"CE40 F6A4 FDCE 022B 3947 EA41 003A FD00" - $"1C02 0000 0EEC 4102 4739 79FE CE02 6407" - $"A4FE CE02 A407 40E9 4100 40FD 001A 0200" - $"0032 EA41 0632 A4CE CE88 0879 FECE 02F9" - $"0F47 E941 0040 FD00 1A02 0000 32EB 4107" - $"4740 F7C8 CE87 0E79 FECE 0132 40E8 4100" - $"40FD 0019 0200 0033 EA41 0B47 40F8 C8AB" - $"0E55 CECE 8015 47E8 4100 40FD 0017 0200" - $"0033 E941 0847 40F9 A439 4FCE CE5D E641" - $"0140 F5FE 0014 0200 0039 E841 0647 64FB" - $"392B C8AB E441 00F6 FE00 1102 0000 39E5" - $"4103 40F6 8764 E441 0007 FE00 1E02 0000" - $"39EB 4102 3A0E 0EFD 4102 0740 47F6 4104" - $"400F 0839 47F4 4100 07FE 0027 0200 0039" - $"FB41 0147 47F2 4102 0800 40FE 4102 0839" - $"47FC 4101 4747 FC41 0339 0039 47F4 4100" - $"07FE 0029 0200 0039 FB41 0140 39F3 4109" - $"470E F540 4141 470E 3347 FC41 0139 3AFD" - $"4104 4739 0039 47F4 4100 08FE 0036 0200" - $"003A FC41 0347 0E00 40FC 4102 4741 40FC" - $"4109 470E F540 4141 4733 0E47 FE41 0447" - $"4000 0E47 FE41 0447 3900 3941 FE40 F741" - $"000E FE00 3A02 0000 3AFD 410E 4740 0700" - $"0E40 4741 4147 390E 390E 40FE 4108 470E" - $"F540 4141 4739 0EFC 4103 0F00 0739 FE41" - $"0747 3900 3940 080F 39F7 4100 0EFE 0035" - $"0200 0040 FB41 020E 0040 FE41 0D47 4000" - $"3941 0032 4741 4147 0EF5 40FE 4101 4008" - $"FC41 023A 000E FD41 0547 3900 3939 33F5" - $"4100 0EFE 0039 0200 0040 FC41 0347 0E00" - $"40FE 4106 4732 0040 4139 40FE 4103 470E" - $"F540 FD41 0108 40FE 4104 4740 000E 47FE" - $"4106 4739 0007 F540 47F6 4100 32FE 003A" - $"0200 0040 FC41 0C47 0E00 4047 4141 470E" - $"0040 4747 FD41 0347 0EF5 40FE 410A 470E" - $"3947 4141 4740 000E 47FE 4107 4739 000E" - $"0007 4147 F741 0032 FE00 3802 0000 40FC" - $"4102 470E 00FD 4106 4739 003A 4740 39FE" - $"4102 470E F5FD 410A 4733 3347 4141 4740" - $"000E 47FE 4106 4739 0039 3900 0EF6 4100" - $"33FE 003A 0200 F540 FC41 0447 3200 0E39" - $"FD41 0B0E 0E40 333A 4741 413A 07F5 39FE" - $"4102 473A 0EFD 410F 40F5 0733 4041 4140" - $"0E00 0E40 0700 0E40 F841 0039 FE00 2902" - $"00F5 40FA 4101 3939 FB41 023A 3A40 FD41" - $"FD40 FD41 0240 0E40 FD41 0240 3940 FD41" - $"FA40 F741 0039 FE00 2A01 00F6 F941 0147" - $"47FB 4101 4747 FB41 0147 47FB 4101 3940" - $"FD41 0147 47FB 4100 47FE 4100 47F6 4100" - $"39FE 000D 0100 07E1 4100 40E4 4100 3AFE" - $"0009 0100 07C3 4100 3AFE 0009 0100 07C3" - $"4100 40FE 0009 0100 07C3 4100 40FE 0009" - $"0100 07C3 4100 40FE 000A 0100 0EC3 4103" - $"40F5 0000 0901 000E C241 02F6 0000 0901" - $"000E C241 0207 0000 0901 000E C241 0207" - $"0000 1101 000E ED41 FE40 003A F940 E241" - $"0207 0000 2B01 0032 F941 FE40 FE39 0632" - $"0E0E 0707 F6F5 F800 02F5 F5F6 FB07 FB0E" - $"0332 3233 33FB 3901 3A3A FB40 0207 0000" - $"0E0A 000E 3939 320E 0E07 07F6 F5C8 0002" - $"BD00 00FF" -}; - -/* - * Here is the custom file open dialog. This dialog is used instead of - * the default file dialog if the -filetypes flag is specified. - */ - -#define DLOG_RezTemplateVersion 0 - -resource 'DLOG' (130, purgeable) { - {0, 0, 195, 344}, dBoxProc, invisible, noGoAway, 0, - 130, "" -}; - -resource 'DITL' (130, "File Open Box", purgeable) { - { - {135, 252, 155, 332}, Button {enabled, "Open"}, - {104, 252, 124, 332}, Button {enabled, "Cancel"}, - { 0, 0, 0, 0}, HelpItem {disabled, HMScanhdlg {130}}, - { 8, 235, 24, 337}, UserItem {enabled}, - { 32, 252, 52, 332}, Button {enabled, "Eject"}, - { 60, 252, 80, 332}, Button {enabled, "Desktop"}, - { 29, 12, 159, 230}, UserItem {enabled}, - { 6, 12, 25, 230}, UserItem {enabled}, - { 91, 251, 92, 333}, Picture {disabled, 11}, - {168, 20, 187, 300}, Control {enabled, 131} - } -}; - -resource 'CNTL' (131, "File Types menu", purgeable) { - {168, 20, 187, 300}, - popupTitleLeftJust, - visible, - 80, - 132, - popupMenuCDEFProc, - 0, - "File Type:" -}; - - -resource 'MENU' (132, preload) { - 132, - textMenuProc, - 0xFFFF, enabled, "", {} -}; diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index d92a8fb..6bf92f2 100644 --- a/macosx/tkMacOSXMenu.c +++ b/macosx/tkMacOSXMenu.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: tkMacOSXMenu.c,v 1.6 2003/02/19 19:27:48 wolfsuit Exp $ + * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.6.2.1 2003/05/13 02:42:57 das Exp $ */ #include "tkMacOSXInt.h" #include "tkMenuButton.h" @@ -180,10 +180,6 @@ static Tk_Window currentMenuBarOwner; static char elipsisString[TCL_UTF_MAX + 1]; /* 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 - * unavailable. This does not include - * the automatically generated separator. */ static int inPostMenu; /* We cannot be re-entrant like X * windows. */ static short lastMenuID; /* To pass to NewMenu; need to figure out @@ -204,6 +200,11 @@ static struct TearoffSelect { * when we are in this menu */ } tearoffStruct; +struct MenuCommandHandlerData { /* This is the ClientData we pass to */ + TkMenu *menuPtr; /* Tcl_DoWhenIdle to move handling */ + int index; /* menu commands to the event loop. */ +}; + static RgnHandle totalMenuRgn = NULL; /* Used to update windows which have been * obscured by menus. */ @@ -261,6 +262,7 @@ static void DrawTearoffEntry _ANSI_ARGS_((TkMenu *menuPtr, TkMenuEntry *mePtr, Drawable d, GC gc, Tk_Font tkfont, CONST Tk_FontMetrics *fmPtr, int x, int y, int width, int height)); +static void EventuallyInvokeMenu (ClientData data); static void GetEntryText _ANSI_ARGS_((TkMenuEntry *mePtr, Tcl_DString *dStringPtr)); static void GetMenuAccelGeometry _ANSI_ARGS_((TkMenu *menuPtr, @@ -640,8 +642,8 @@ TkpDestroyMenu( && (helpMenuHdl != NULL)) { int i, count = CountMenuItems(helpMenuHdl); - for (i = helpItemCount; i <= count; i++) { - DeleteMenuItem(helpMenuHdl, helpItemCount); + for (i = helpIndex; i <= count; i++) { + DeleteMenuItem(helpMenuHdl, helpIndex); } } currentHelpMenuID = 0; @@ -1036,7 +1038,8 @@ ReconfigureIndividualMenu( * be the help menu. */ int base) /* The last index that we do not want * touched. 0 for normal menus; - * helpMenuItemCount for help menus. */ + * # of system help menu items + * for help menus. */ { int count; int index; @@ -1290,7 +1293,8 @@ ReconfigureMacintoshMenu( MenuItemIndex helpIndex; HMGetHelpMenu(&helpMenuHdl,&helpIndex); if (helpMenuHdl != NULL) { - ReconfigureIndividualMenu(menuPtr, helpMenuHdl, helpItemCount); + ReconfigureIndividualMenu(menuPtr, helpMenuHdl, + helpIndex - 1); } } @@ -2074,6 +2078,35 @@ TkpSetWindowMenuBar( } } +static void +/* + *---------------------------------------------------------------------- + * + * EventuallyInvokeMenu -- + * + * This IdleTime callback actually invokes the menu command + * scheduled in TkMacOSXDispatchMenuEvent. + * + * Results: + * None. + * + * Side effects: + * Commands get executed. + * + *---------------------------------------------------------------------- + */ + +EventuallyInvokeMenu (ClientData data) +{ + struct MenuCommandHandlerData *realData + = (struct MenuCommandHandlerData *) data; + + Tcl_Release(realData->menuPtr->interp); + Tcl_Release(realData->menuPtr); + TkInvokeMenu(realData->menuPtr->interp, realData->menuPtr, + realData->index); +} + /* *---------------------------------------------------------------------- * @@ -2086,7 +2119,7 @@ TkpSetWindowMenuBar( * None. * * Side effects: - * Commands get executed. + * Commands for the event are scheduled for execution at idle time. * *---------------------------------------------------------------------- */ @@ -2109,7 +2142,10 @@ TkMacOSXDispatchMenuEvent( helpMenuName); ckfree(helpMenuName); if ((helpMenuRef != NULL) && (helpMenuRef->menuPtr != NULL)) { - int newIndex = index - helpItemCount - 1; + MenuRef outHelpMenu; + MenuItemIndex itemIndex; + HMGetHelpMenu(&outHelpMenu, &itemIndex); + int newIndex = index - itemIndex; result = TkInvokeMenu(currentMenuBarInterp, helpMenuRef->menuPtr, newIndex); } @@ -2126,7 +2162,16 @@ TkMacOSXDispatchMenuEvent( GetMenuItemText(GetMenuHandle(menuID), index, itemText); result = TCL_OK; } else { - result = TkInvokeMenu(menuPtr->interp, menuPtr, index - 1); + struct MenuCommandHandlerData *data + = (struct MenuCommandHandlerData *) + ckalloc(sizeof(struct MenuCommandHandlerData)); + Tcl_Preserve(menuPtr->interp); + Tcl_Preserve(menuPtr); + data->menuPtr = menuPtr; + data->index = index - 1; + Tcl_DoWhenIdle (EventuallyInvokeMenu, + (ClientData) data); + /* result = TkInvokeMenu(menuPtr->interp, menuPtr, index - 1); */ } } else { return TCL_ERROR; @@ -2881,12 +2926,15 @@ DrawTearoffEntry( * Has to be called after the first call to InsertMenu. Sets * up the global variable for the number of items in the * unmodified help menu. + * NB. Nobody uses this any more, since you can get the number + * of system help items from HMGetHelpMenu trivially. + * But it is in the stubs table... * * Results: * None. * * Side effects: - * Sets the global helpItemCount. + * Nothing. * *---------------------------------------------------------------------- */ @@ -2894,16 +2942,6 @@ DrawTearoffEntry( void TkMacOSXSetHelpMenuItemCount() { - MenuRef helpMenuHandle; - MenuItemIndex itemIndex; - - if ((HMGetHelpMenu(&helpMenuHandle,&itemIndex) != noErr) - || (helpMenuHandle == NULL)) { - helpItemCount = -1; - } else { - helpItemCount = CountMenuItems(helpMenuHandle); - DeleteMenuItem(helpMenuHandle, helpItemCount); - } } /* diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c index f3aa259..6eed023 100644 --- a/macosx/tkMacOSXMenus.c +++ b/macosx/tkMacOSXMenus.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: tkMacOSXMenus.c,v 1.2 2002/08/31 06:12:30 das Exp $ + * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.2.2.1 2003/05/13 02:42:57 das Exp $ */ #include "tk.h" @@ -209,7 +209,6 @@ TkMacOSXInitMenus( } DrawMenuBar(); - TkMacOSXSetHelpMenuItemCount(); return; } diff --git a/macosx/tkMacOSXResource.r b/macosx/tkMacOSXResource.r deleted file mode 100644 index ace7df1..0000000 --- a/macosx/tkMacOSXResource.r +++ /dev/null @@ -1,502 +0,0 @@ -/* - * tkMacOSXResources.r -- - * - * This file creates resources for use in a simple shell. - * This is designed to be an example of using the Tcl/Tk - * libraries in a Macintosh Application. - * - * Copyright (c) 1993-1994 Lockheed Missle & Space Company, AI Center - * Copyright (c) 1995-1997 Sun Microsystems, Inc. - * - * See the file "license.terms" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. - * - * RCS: @(#) $Id: tkMacOSXResource.r,v 1.3 2002/09/12 17:34:16 das Exp $ - */ - -/* - * We define SystemSevenOrLater so that our dialogs may use the - * auto center feature. - */ -#define SystemSevenOrLater 1 - -#include -#include - -/* - * The folowing include and defines help construct - * the version string for Tcl. - */ - -#define RC_INVOKED -#include "tcl.h" -#include "tk.h" - -#if (TK_RELEASE_LEVEL == 0) -# define RELEASE_LEVEL alpha -#elif (TK_RELEASE_LEVEL == 1) -# define RELEASE_LEVEL beta -#elif (TK_RELEASE_LEVEL == 2) -# define RELEASE_LEVEL final -#endif - -#if (TK_RELEASE_LEVEL == 2) -# define MINOR_VERSION (TK_MINOR_VERSION * 16) + TK_RELEASE_SERIAL -#else -# 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 - * application. The example below creates a TEXT resource named - * "Init" from the file "init.tcl". This allows applications to use - * Tcl to define the behavior of the application without having to - * require some predetermined file structure - all needed Tcl "files" - * are located within the application. To source a file for the - * resource fork the source command has been modified to support - * sourcing from resources. In the below case "source -rsrc {Init}" - * will load the TEXT resource named "Init". - */ - -#include "tclMacTclCode.r" - -read 'TEXT' (10, "tk", purgeable, preload) "::library:tk.tcl"; -read 'TEXT' (11, "button", purgeable, preload) "::library:button.tcl"; -read 'TEXT' (12, "dialog", purgeable, preload) "::library:dialog.tcl"; -read 'TEXT' (13, "entry", purgeable, preload) "::library:entry.tcl"; -read 'TEXT' (14, "focus", purgeable, preload) "::library:focus.tcl"; -read 'TEXT' (15, "listbox", purgeable, preload) "::library:listbox.tcl"; -read 'TEXT' (16, "menu", purgeable, preload) "::library:menu.tcl"; -read 'TEXT' (17, "optionMenu", purgeable, preload) "::library:optMenu.tcl"; -read 'TEXT' (18, "palette", purgeable, preload) "::library:palette.tcl"; -read 'TEXT' (19, "scale", purgeable, preload) "::library:scale.tcl"; -read 'TEXT' (20, "scrollbar", purgeable, preload) "::library:scrlbar.tcl"; -read 'TEXT' (21, "tearoff", purgeable, preload) "::library:tearoff.tcl"; -read 'TEXT' (22, "text", purgeable, preload) "::library:text.tcl"; -read 'TEXT' (23, "tkerror", purgeable, preload) "::library:bgerror.tcl"; -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 - * 'STR#' resource named "Tcl Environment Variables" rather than a - * specific resource number. (In other words, feel free to change the - * resource id if it conflicts with your application.) Each string in - * the resource must be of the form "KEYWORD=SOME STRING". See Tcl - * documentation for futher information about the env variable. - */ - -/* A good example of something you may want to set is: - * "TCL_LIBRARY=My disk:etc." - */ - -resource 'STR#' (128, "Tcl Environment Variables") { - { "SCHEDULE_NAME=Agent Controller Schedule", - "SCHEDULE_PATH=Lozoya:System Folder:Tcl Lib:Tcl-Scheduler" - }; -}; - -/* - * The following two resources define the default "About Box" for Mac Tk. - * This dialog appears if the "About Tk..." menu item is selected from - * the Apple menu. This dialog may be overridden by defining a Tcl procedure - * with the name of "tkAboutDialog". If this procedure is defined the - * default dialog will not be shown and the Tcl procedure is expected to - * create and manage an About Dialog box. - */ - -resource 'DLOG' (128, "Default About Box", purgeable) { - {85, 107, 260, 412}, dBoxProc, visible, goAway, 0, - 128, "", centerMainScreen -}; - -resource 'DITL' (128, "About Box", purgeable) { - { - {143, 147, 167, 201}, Button {enabled, "Ok"}, - { 14, 108, 137, 314}, StaticText {disabled, - "Wish - Windowing Shell" "\n" "based on Tcl " - TCL_PATCH_LEVEL " & Tk " TK_PATCH_LEVEL "\n\n" - "Ray Johnson & Jim Ingham" "\n" - "Scriptics Inc." "\n" - "jim.ingham@cygnus.com"}, - { 19, 24, 119, 92}, Picture {enabled, 128} - } -}; - -data 'PICT' (128) { - $"13A4 0000 0000 0064 0044 0011 02FF 0C00" - $"FFFE 0000 0048 0000 0048 0000 0000 0000" - $"0064 0044 0000 0000 0001 000A 0000 0000" - $"0064 0044 0099 8044 0000 0000 0064 0044" - $"0000 0000 0000 0000 0048 0000 0048 0000" - $"0000 0008 0001 0008 0000 0000 0108 00D8" - $"0000 0000 0001 5A5A 8000 00FF 3736 FF00" - $"FF00 FF00 3535 FF00 FF00 CC00 3434 FF00" - $"FF00 9900 3333 FF00 FF00 6600 3736 FF00" - $"FF00 3300 3535 FF00 FF00 0000 3434 FF00" - $"CC00 FF00 3333 FF00 CC00 CC00 3736 FF00" - $"CC00 9900 3535 FF00 CC00 6600 FAFA FF00" - $"CC00 3300 3333 FF00 CC00 0000 3130 FF00" - $"9900 FF00 2F2F FF00 9900 CC00 FAFA FF00" - $"9900 9900 F9F9 FF00 9900 6600 3130 FF00" - $"9900 3300 2F2F FF00 9900 0000 2E2E FF00" - $"6600 FF00 F9F9 FF00 6600 CC00 3130 FF00" - $"6600 9900 2F2F FF00 6600 6600 2E2E FF00" - $"6600 3300 2D2D FF00 6600 0000 3130 FF00" - $"3300 FF00 2F2F FF00 3300 CC00 2E2E FF00" - $"3300 9900 2D2D FF00 3300 6600 3130 FF00" - $"3300 3300 2F2F FF00 3300 0000 2E2E FF00" - $"0000 FF00 2D2D FF00 0000 CC00 3130 FF00" - $"0000 9900 2F2F FF00 0000 6600 2E2E FF00" - $"0000 3300 2DF8 FF00 0000 0000 2B2A CC00" - $"FF00 FF00 2929 CC00 FF00 CC00 2828 CC00" - $"FF00 9900 27F8 CC00 FF00 6600 2B2A CC00" - $"FF00 3300 2929 CC00 FF00 0000 2828 CC00" - $"CC00 FF00 2727 CC00 CC00 CC00 2B2A CC00" - $"CC00 9900 2929 CC00 CC00 6600 2828 CC00" - $"CC00 3300 2727 CC00 CC00 0000 2B2A CC00" - $"9900 FF00 2929 CC00 9900 CC00 2828 CC00" - $"9900 9900 2727 CC00 9900 6600 DBDB CC00" - $"9900 3300 4747 CC00 9900 0000 4646 CC00" - $"6600 FF00 4545 CC00 6600 CC00 DBDB CC00" - $"6600 9900 4747 CC00 6600 6600 4646 CC00" - $"6600 3300 4545 CC00 6600 0000 DBDB CC00" - $"3300 FF00 4747 CC00 3300 CC00 4646 CC00" - $"3300 9900 4545 CC00 3300 6600 DBDB CC00" - $"3300 3300 4141 CC00 3300 0000 4040 CC00" - $"0000 FF00 3F3F CC00 0000 CC00 4342 CC00" - $"0000 9900 4141 CC00 0000 6600 4040 CC00" - $"0000 3300 3F3F CC00 0000 0000 4342 9900" - $"FF00 FF00 4141 9900 FF00 CC00 4040 9900" - $"FF00 9900 3F3F 9900 FF00 6600 4342 9900" - $"FF00 3300 4141 9900 FF00 0000 4040 9900" - $"CC00 FF00 3F3F 9900 CC00 CC00 4342 9900" - $"CC00 9900 4141 9900 CC00 6600 4040 9900" - $"CC00 3300 3F3F 9900 CC00 0000 4342 9900" - $"9900 FF00 4141 9900 9900 CC00 4040 9900" - $"9900 9900 3F3F 9900 9900 6600 3D3C 9900" - $"9900 3300 3B3B 9900 9900 0000 3A3A 9900" - $"6600 FF00 3939 9900 6600 CC00 3D3C 9900" - $"6600 9900 3B3B 9900 6600 6600 3A3A 9900" - $"6600 3300 3939 9900 6600 0000 3D3C 9900" - $"3300 FF00 3B3B 9900 3300 CC00 3A3A 9900" - $"3300 9900 3939 9900 3300 6600 3D3C 9900" - $"3300 3300 3B3B 9900 3300 0000 3A3A 9900" - $"0000 FF00 3939 9900 0000 CC00 3D3C 9900" - $"0000 9900 3B3B 9900 0000 6600 3A3A 9900" - $"0000 3300 3939 9900 0000 0000 3D3C 6600" - $"FF00 FF00 3B3B 6600 FF00 CC00 3A3A 6600" - $"FF00 9900 3939 6600 FF00 6600 3D3C 6600" - $"FF00 3300 3B3B 6600 FF00 0000 3A3A 6600" - $"CC00 FF00 3939 6600 CC00 CC00 3736 6600" - $"CC00 9900 3535 6600 CC00 6600 3434 6600" - $"CC00 3300 3333 6600 CC00 0000 3736 6600" - $"9900 FF00 3535 6600 9900 CC00 3434 6600" - $"9900 9900 3333 6600 9900 6600 3736 6600" - $"9900 3300 3535 6600 9900 0000 3434 6600" - $"6600 FF00 3333 6600 6600 CC00 3736 6600" - $"6600 9900 3535 6600 6600 6600 3434 6600" - $"6600 3300 3333 6600 6600 0000 3736 6600" - $"3300 FF00 3535 6600 3300 CC00 3434 6600" - $"3300 9900 3333 6600 3300 6600 3736 6600" - $"3300 3300 3535 6600 3300 0000 3434 6600" - $"0000 FF00 3333 6600 0000 CC00 3130 6600" - $"0000 9900 2F2F 6600 0000 6600 2E2E 6600" - $"0000 3300 F9F9 6600 0000 0000 3130 3300" - $"FF00 FF00 2F2F 3300 FF00 CC00 2E2E 3300" - $"FF00 9900 F9F9 3300 FF00 6600 3130 3300" - $"FF00 3300 2F2F 3300 FF00 0000 2E2E 3300" - $"CC00 FF00 2D2D 3300 CC00 CC00 3130 3300" - $"CC00 9900 2F2F 3300 CC00 6600 2E2E 3300" - $"CC00 3300 2D2D 3300 CC00 0000 3130 3300" - $"9900 FF00 2F2F 3300 9900 CC00 2E2E 3300" - $"9900 9900 2D2D 3300 9900 6600 3130 3300" - $"9900 3300 2F2F 3300 9900 0000 2E2E 3300" - $"6600 FF00 2DF8 3300 6600 CC00 2B2A 3300" - $"6600 9900 2929 3300 6600 6600 2828 3300" - $"6600 3300 27F8 3300 6600 0000 2B2A 3300" - $"3300 FF00 2929 3300 3300 CC00 2828 3300" - $"3300 9900 2727 3300 3300 6600 2B2A 3300" - $"3300 3300 2929 3300 3300 0000 2828 3300" - $"0000 FF00 2727 3300 0000 CC00 2B2A 3300" - $"0000 9900 2929 3300 0000 6600 2828 3300" - $"0000 3300 2727 3300 0000 0000 4948 0000" - $"FF00 FF00 4747 0000 FF00 CC00 4646 0000" - $"FF00 9900 4545 0000 FF00 6600 4948 0000" - $"FF00 3300 4747 0000 FF00 0000 4646 0000" - $"CC00 FF00 4545 0000 CC00 CC00 4948 0000" - $"CC00 9900 4747 0000 CC00 6600 4646 0000" - $"CC00 3300 4545 0000 CC00 0000 4342 0000" - $"9900 FF00 4141 0000 9900 CC00 4040 0000" - $"9900 9900 3F3F 0000 9900 6600 4342 0000" - $"9900 3300 4141 0000 9900 0000 4040 0000" - $"6600 FF00 3F3F 0000 6600 CC00 4342 0000" - $"6600 9900 4141 0000 6600 6600 4040 0000" - $"6600 3300 3F3F 0000 6600 0000 4342 0000" - $"3300 FF00 4141 0000 3300 CC00 4040 0000" - $"3300 9900 3F3F 0000 3300 6600 4342 0000" - $"3300 3300 4141 0000 3300 0000 4040 0000" - $"0000 FF00 3F3F 0000 0000 CC00 4342 0000" - $"0000 9900 4141 0000 0000 6600 4040 0000" - $"0000 3300 3F3F EE00 0000 0000 3D3C DD00" - $"0000 0000 3B3B BB00 0000 0000 3A3A AA00" - $"0000 0000 3939 8800 0000 0000 3D3C 7700" - $"0000 0000 3B3B 5500 0000 0000 3A3A 4400" - $"0000 0000 3939 2200 0000 0000 3D3C 1100" - $"0000 0000 3B3B 0000 EE00 0000 3A3A 0000" - $"DD00 0000 3939 0000 BB00 0000 3D3C 0000" - $"AA00 0000 3B3B 0000 8800 0000 3A3A 0000" - $"7700 0000 3939 0000 5500 0000 3D3C 0000" - $"4400 0000 3B3B 0000 2200 0000 3A3A 0000" - $"1100 0000 3939 0000 0000 EE00 3D3C 0000" - $"0000 DD00 3B3B 0000 0000 BB00 3A3A 0000" - $"0000 AA00 3939 0000 0000 8800 3D3C 0000" - $"0000 7700 3B3B 0000 0000 5500 3A3A 0000" - $"0000 4400 3939 0000 0000 2200 3736 0000" - $"0000 1100 3535 EE00 EE00 EE00 3434 DD00" - $"DD00 DD00 3333 BB00 BB00 BB00 3736 AA00" - $"AA00 AA00 3535 8800 8800 8800 3434 7700" - $"7700 7700 3333 5500 5500 5500 3736 4400" - $"4400 4400 3535 2200 2200 2200 3434 1100" - $"1100 1100 3333 0000 0000 0000 0000 0000" - $"0064 0044 0000 0000 0064 0044 0000 000A" - $"0000 0000 0064 0044 02BD 0013 E800 01F5" - $"F6FE 07FE 0E02 3232 33FD 3900 0EE6 001D" - $"FC00 01F5 F5FE 0700 08FE 0E02 3232 33FE" - $"3900 3AFC 40F2 4102 4033 07E9 0017 0100" - $"0EFC 40DC 4102 390E F5F5 0002 F5F5 F6FE" - $"0702 0E07 0016 0100 32D5 4104 4039 0E32" - $"33FD 3900 3AFC 40FC 4101 3200 0801 000E" - $"C141 010E 0008 0100 0EC1 4101 0800 0801" - $"000E C141 0107 0008 0100 0EC1 4101 0700" - $"0901 0007 C241 0240 F500 0E01 0007 E841" - $"0147 47DD 4102 4000 0012 0100 07F0 4100" - $"47FA 4101 3B3B DD41 0240 0000 1901 0007" - $"F141 0C47 3B0B 3B47 4141 4711 0505 3B47" - $"DF41 023A 0000 1701 00F6 F041 010B 0BFE" - $"4105 473B 0505 113B DE41 0239 0000 1A02" - $"00F5 40F3 410C 473B 053B 4741 4741 0B0B" - $"3B47 47DE 4102 3900 0018 0200 F540 F341" - $"0247 110B FE41 0447 1105 4147 DC41 0233" - $"0000 1B02 0000 40F3 4103 4711 1147 FE41" - $"0205 3547 F741 FD47 E941 0232 0000 1E02" - $"0000 40F2 4106 113B 4741 4735 0BF7 4106" - $"4741 390E 0E40 47EA 4102 0E00 0021 0200" - $"0040 F241 0711 3B47 4141 0B35 47F9 4102" - $"4740 07FE 0002 F640 47EB 4102 0E00 0023" - $"0200 0040 F341 0847 3541 4147 3B05 4147" - $"FA41 0947 3AF6 00F5 4F55 F50E 47EB 4102" - $"0700 0022 0200 003A F341 0147 3BFE 4101" - $"0B0B F941 0547 3AF5 0055 C8FE CE01 5640" - $"EB41 0207 0000 1F02 0000 39F0 4104 4741" - $"053B 47FB 4104 4740 F5F5 A4FC CE01 C85D" - $"EB41 02F6 0000 1F02 0000 39F0 4104 473B" - $"0541 47FC 4104 4740 07F6 C8FA CE00 64EC" - $"4103 40F5 0000 1C02 0000 39F0 4102 4711" - $"0BFA 4103 4708 2AC8 FACE 0164 D8EC 4100" - $"40FE 0025 0200 0039 EF41 020B 3B47 FC41" - $"0347 0FF5 A4FB CE02 C887 D8FC 41FE 47FC" - $"4100 47F9 4100 3AFE 0028 0200 0039 EF41" - $"020B 3B47 FD41 0347 3900 A4FA CE00 ABFA" - $"4109 3B11 3B41 4147 3B0B 3B47 FA41 0039" - $"FE00 2402 0000 33F1 4102 4741 0BFA 4101" - $"0779 F9CE 0064 FA41 0235 050B FD41 010B" - $"0BF9 4100 39FE 0028 0200 0032 F141 0247" - $"3B0B FC41 0247 39F6 F9CE 0187 D8FB 4103" - $"4741 050B FE41 0247 110B F941 0039 FE00" - $"2C02 0000 32F1 4102 473B 11FB 4101 0879" - $"FACE 05AA 4041 4147 47FE 410A 4741 0511" - $"4741 4147 3511 47FA 4100 32FE 002F 0200" - $"000E F141 0347 3B11 47FE 4103 4740 F6C8" - $"FACE 0564 D841 4039 39FE 4104 473B 053B" - $"47FE 4102 3541 47FA 4100 0EFE 0027 0200" - $"000E F141 0347 3B3B 47FE 4102 470F 79FA" - $"CE0C 8741 4032 F500 003A 4741 473B 05F2" - $"4100 0EFE 0027 0200 000E F141 0347 3B3B" - $"47FD 4101 0EA4 FACE 01AB AAFE C808 7900" - $"3947 4147 110B 47F3 4100 07FE 001C 0200" - $"000E EA41 0240 2BC8 F5CE 0881 0033 4741" - $"410B 3B47 F341 0007 FE00 1A02 0000 08EB" - $"4102 473A 55F4 CE06 5D00 3947 4741 0BF1" - $"4100 F6FE 001C 0200 0007 EB41 0247 3979" - $"F4CE 0739 0039 4747 3511 47F3 4101 40F5" - $"FE00 1C02 0000 07EB 4102 4739 A4F5 CE08" - $"AB0E 0040 4741 1141 47F3 4100 40FD 001B" - $"0200 0007 EB41 0247 39A4 F5CE 0787 0707" - $"4147 4111 47F2 4100 40FD 001B 0200 0007" - $"EB41 0247 39C8 F5CE 0763 F532 4747 3B3B" - $"47F2 4100 3AFD 001A 0300 00F6 40EC 4102" - $"4739 C8F5 CE05 39F5 4047 413B F041 0039" - $"FD00 1C03 0000 F540 EB41 0140 C8FD CE01" - $"C8A4 FCCE 03AB 080E 47ED 4100 39FD 001A" - $"FE00 0040 EB41 0040 FCCE 01A4 C8FC CE03" - $"FA07 4047 ED41 0032 FD00 1AFE 0000 40EA" - $"4100 AAFE CE02 87F9 C8FC CE02 560F 47EC" - $"4100 32FD 0019 FE00 0040 EA41 00AB FECE" - $"0264 56C8 FDCE 01C8 32EA 4100 0EFD 001B" - $"FE00 0040 ED41 030E 4047 87FE CE01 4055" - $"FCCE 01FA 40EA 4100 08FD 001A FE00 003A" - $"ED41 0807 0740 FBCE CEAB 3979 FDCE 00AB" - $"E841 0007 FD00 1CFE 0000 3AED 4108 0700" - $"F6A4 CECE 8733 79FD CE02 4147 47EA 4100" - $"07FD 001E FE00 0039 ED41 0807 2AA4 C8CE" - $"CE88 0E9D FECE 0364 1C39 39EB 4101 40F5" - $"FD00 1CFE 0000 39ED 4101 074F FDCE 0264" - $"F7A4 FECE 03AB 80F6 07EB 4100 40FC 001C" - $"FE00 0039 ED41 0108 79FE CE03 AB40 2BA4" - $"FCCE 02F7 0E47 EC41 0040 FC00 1CFE 0000" - $"39ED 4101 0879 FECE 03AB 40F6 C8FC CE02" - $"F615 47EC 4100 40FC 001E FE00 003A EE41" - $"0247 0E79 FECE 03AB 40F5 C8FD CE03 A4F5" - $"3A47 EC41 0040 FC00 1EFE 0000 3AEE 4102" - $"470E 56FE CE03 FB3A F6C8 FDCE 0280 F540" - $"EB41 0140 F5FD 001E FE00 0040 EE41 0947" - $"0F56 CECE C888 39F6 C8FD CE02 5601 40EB" - $"4101 40F5 FD00 1CFE 0000 40EE 4109 4739" - $"32CE CEC8 8839 2AC8 FDCE 0156 07E9 4100" - $"F6FD 001B FE00 0040 EE41 0847 3A32 CECE" - $"C864 152A FCCE 0132 07E9 4100 07FD 001A" - $"FE00 0040 ED41 0740 32AB CEC8 6439 4EFC" - $"CE01 3A07 E941 0007 FD00 1D03 0000 F540" - $"ED41 0740 0EAB CECE 640F 4EFD CE03 AB40" - $"0840 EA41 0007 FD00 1B03 0000 F540 EC41" - $"060F 81CE CE64 334E FDCE 02AB 400E E941" - $"000E FD00 1C02 0000 F6EC 4107 4715 FACE" - $"CE64 334E FDCE 0387 0F0E 47EA 4100 0EFD" - $"001C 0200 0007 EC41 0747 16F9 CEC8 6433" - $"4EFD CE03 6308 4047 EA41 000E FD00 1A02" - $"0000 07EB 4106 40F9 CEC8 6439 4EFD CE02" - $"3940 47E9 4100 32FD 001B 0200 0007 EA41" - $"0539 CECE 8839 F6FE CE04 AB41 4139 40EA" - $"4100 32FD 001C 0200 0007 EB41 0E47 3AC8" - $"CE88 39F6 C8CE CE64 15F6 F540 EA41 0033" - $"FD00 1A02 0000 07EA 410C 40A4 CE87 392A" - $"C8CE AB41 40F8 F6E9 4100 39FD 001B 0200" - $"000E EB41 0D47 41AB C887 39F5 C8CE ABAB" - $"CEA4 07E9 4100 39FD 001C 0200 000E ED41" - $"0947 3939 4787 C8AB 40F5 C8FD CE01 A40E" - $"E941 0039 FD00 1D02 0000 0EED 4109 473A" - $"0007 80CE AB40 F5C8 FDCE 0255 0E47 EA41" - $"0039 FD00 1B02 0000 0EEB 4107 0779 C8CE" - $"CE40 F6A4 FDCE 022B 3947 EA41 003A FD00" - $"1C02 0000 0EEC 4102 4739 79FE CE02 6407" - $"A4FE CE02 A407 40E9 4100 40FD 001A 0200" - $"0032 EA41 0632 A4CE CE88 0879 FECE 02F9" - $"0F47 E941 0040 FD00 1A02 0000 32EB 4107" - $"4740 F7C8 CE87 0E79 FECE 0132 40E8 4100" - $"40FD 0019 0200 0033 EA41 0B47 40F8 C8AB" - $"0E55 CECE 8015 47E8 4100 40FD 0017 0200" - $"0033 E941 0847 40F9 A439 4FCE CE5D E641" - $"0140 F5FE 0014 0200 0039 E841 0647 64FB" - $"392B C8AB E441 00F6 FE00 1102 0000 39E5" - $"4103 40F6 8764 E441 0007 FE00 1E02 0000" - $"39EB 4102 3A0E 0EFD 4102 0740 47F6 4104" - $"400F 0839 47F4 4100 07FE 0027 0200 0039" - $"FB41 0147 47F2 4102 0800 40FE 4102 0839" - $"47FC 4101 4747 FC41 0339 0039 47F4 4100" - $"07FE 0029 0200 0039 FB41 0140 39F3 4109" - $"470E F540 4141 470E 3347 FC41 0139 3AFD" - $"4104 4739 0039 47F4 4100 08FE 0036 0200" - $"003A FC41 0347 0E00 40FC 4102 4741 40FC" - $"4109 470E F540 4141 4733 0E47 FE41 0447" - $"4000 0E47 FE41 0447 3900 3941 FE40 F741" - $"000E FE00 3A02 0000 3AFD 410E 4740 0700" - $"0E40 4741 4147 390E 390E 40FE 4108 470E" - $"F540 4141 4739 0EFC 4103 0F00 0739 FE41" - $"0747 3900 3940 080F 39F7 4100 0EFE 0035" - $"0200 0040 FB41 020E 0040 FE41 0D47 4000" - $"3941 0032 4741 4147 0EF5 40FE 4101 4008" - $"FC41 023A 000E FD41 0547 3900 3939 33F5" - $"4100 0EFE 0039 0200 0040 FC41 0347 0E00" - $"40FE 4106 4732 0040 4139 40FE 4103 470E" - $"F540 FD41 0108 40FE 4104 4740 000E 47FE" - $"4106 4739 0007 F540 47F6 4100 32FE 003A" - $"0200 0040 FC41 0C47 0E00 4047 4141 470E" - $"0040 4747 FD41 0347 0EF5 40FE 410A 470E" - $"3947 4141 4740 000E 47FE 4107 4739 000E" - $"0007 4147 F741 0032 FE00 3802 0000 40FC" - $"4102 470E 00FD 4106 4739 003A 4740 39FE" - $"4102 470E F5FD 410A 4733 3347 4141 4740" - $"000E 47FE 4106 4739 0039 3900 0EF6 4100" - $"33FE 003A 0200 F540 FC41 0447 3200 0E39" - $"FD41 0B0E 0E40 333A 4741 413A 07F5 39FE" - $"4102 473A 0EFD 410F 40F5 0733 4041 4140" - $"0E00 0E40 0700 0E40 F841 0039 FE00 2902" - $"00F5 40FA 4101 3939 FB41 023A 3A40 FD41" - $"FD40 FD41 0240 0E40 FD41 0240 3940 FD41" - $"FA40 F741 0039 FE00 2A01 00F6 F941 0147" - $"47FB 4101 4747 FB41 0147 47FB 4101 3940" - $"FD41 0147 47FB 4100 47FE 4100 47F6 4100" - $"39FE 000D 0100 07E1 4100 40E4 4100 3AFE" - $"0009 0100 07C3 4100 3AFE 0009 0100 07C3" - $"4100 40FE 0009 0100 07C3 4100 40FE 0009" - $"0100 07C3 4100 40FE 000A 0100 0EC3 4103" - $"40F5 0000 0901 000E C241 02F6 0000 0901" - $"000E C241 0207 0000 0901 000E C241 0207" - $"0000 1101 000E ED41 FE40 003A F940 E241" - $"0207 0000 2B01 0032 F941 FE40 FE39 0632" - $"0E0E 0707 F6F5 F800 02F5 F5F6 FB07 FB0E" - $"0332 3233 33FB 3901 3A3A FB40 0207 0000" - $"0E0A 000E 3939 320E 0E07 07F6 F5C8 0002" - $"BD00 00FF" -}; - -/* - * Here is the custom file open dialog. This dialog is used instead of - * the default file dialog if the -filetypes flag is specified. - */ - -resource 'DLOG' (130, purgeable) { - {0, 0, 195, 344}, dBoxProc, invisible, noGoAway, 0, - 130, "", noAutoCenter -}; - -resource 'DITL' (130, "File Open Box", purgeable) { - { - {135, 252, 155, 332}, Button {enabled, "Open"}, - {104, 252, 124, 332}, Button {enabled, "Cancel"}, - { 0, 0, 0, 0}, HelpItem {disabled, HMScanhdlg {130}}, - { 8, 235, 24, 337}, UserItem {enabled}, - { 32, 252, 52, 332}, Button {enabled, "Eject"}, - { 60, 252, 80, 332}, Button {enabled, "Desktop"}, - { 29, 12, 159, 230}, UserItem {enabled}, - { 6, 12, 25, 230}, UserItem {enabled}, - { 91, 251, 92, 333}, Picture {disabled, 11}, - {168, 20, 187, 300}, Control {enabled, 131} - } -}; - -resource 'CNTL' (131, "File Types menu", purgeable) { - {168, 20, 187, 300}, - popupTitleLeftJust, - visible, - 80, - 132, - popupMenuCDEFProc, - 0, - "File Type:" -}; - - -resource 'MENU' (132, preload) { - 132, - textMenuProc, - 0xFFFF, enabled, "", {} -}; -- cgit v0.12