diff options
| author | wolfsuit <wolfsuit> | 2004-05-24 18:28:39 (GMT) |
|---|---|---|
| committer | wolfsuit <wolfsuit> | 2004-05-24 18:28:39 (GMT) |
| commit | 547207fe06ecee21456e7f6dc4afd5669f0b33c8 (patch) | |
| tree | 2d4930d4a7500f80bee9ff408ce6e7c779e4a732 | |
| parent | 277dae22116724e1b69a6af79542fa48e1b674e3 (diff) | |
| download | tk-547207fe06ecee21456e7f6dc4afd5669f0b33c8.zip tk-547207fe06ecee21456e7f6dc4afd5669f0b33c8.tar.gz tk-547207fe06ecee21456e7f6dc4afd5669f0b33c8.tar.bz2 | |
Turn on the -finemessage option (TIP 152) for Mac OS X.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | macosx/tkMacOSXDialog.c | 10 |
2 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2004-05-24 Jim Ingham <jingham@apple.com> + + * tkMacOSXDialog.c (Tk_MessageBoxObjCmd): Turn on the + -finemessage option for Mac OS X. + 2004-05-23 Donal K. Fellows <donal.k.fellows@man.ac.uk> * ChangeLog.2002: Split older ChangeLog entries off into a diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c index 9f3a9e0..10fd586 100644 --- a/macosx/tkMacOSXDialog.c +++ b/macosx/tkMacOSXDialog.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: tkMacOSXDialog.c,v 1.8 2004/02/16 00:19:42 wolfsuit Exp $ + * RCS: @(#) $Id: tkMacOSXDialog.c,v 1.9 2004/05/24 18:28:40 wolfsuit Exp $ */ #include <Carbon/Carbon.h> @@ -1316,7 +1316,7 @@ Tk_MessageBoxObjCmd( int result = TCL_OK; static CONST char *movableAlertStrings[] = { - "-default", /* "-finemessage", */ "-icon", + "-default", "-finemessage", "-icon", "-message", "-parent", "-title", "-type", (char *)NULL @@ -1337,7 +1337,7 @@ Tk_MessageBoxObjCmd( (char *)NULL }; enum movableAlertOptions { - ALERT_DEFAULT, /* ALERT_FINEMESSAGE, */ ALERT_ICON, + ALERT_DEFAULT, ALERT_FINEMESSAGE, ALERT_ICON, ALERT_MESSAGE, ALERT_PARENT, ALERT_TITLE, ALERT_TYPE }; @@ -1422,11 +1422,11 @@ Tk_MessageBoxObjCmd( indexDefaultOption = i; break; -/* case ALERT_FINEMESSAGE: + case ALERT_FINEMESSAGE: str = Tcl_GetStringFromObj( objv[i + 1], NULL ); finemessageTextCF = CFStringCreateWithCString( NULL, str, kCFStringEncodingUTF8 ); break; -*/ + case ALERT_ICON: /* not sure about UTF translation here... */ if (Tcl_GetIndexFromObj( interp, objv[i + 1], movableIconStrings, |