From 5d063ab7b3a58f14bc462097c7a345f2de83f9b2 Mon Sep 17 00:00:00 2001 From: dkf Date: Sat, 4 Apr 2009 16:18:37 +0000 Subject: Fix [Bug 1881896] --- ChangeLog | 8 +++++++- doc/messageBox.n | 23 +++++++++++++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7bacc53..7cff596 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ +2009-04-04 Donal K. Fellows + + * doc/messageBox.n: [Bug 1881896]: Reworded to be clearer on what the + platform restrictions really are. + 2009-04-03 Joe English - * unix/tkUnixWm.c: Don't Panic [Bug 1789819]. + * unix/tkUnixWm.c: [Bug 1789819]: Don't panic when the window manager + does something unexpected with the stacking order. 2009-04-03 Donal K. Fellows diff --git a/doc/messageBox.n b/doc/messageBox.n index c771d96..d956f7e 100644 --- a/doc/messageBox.n +++ b/doc/messageBox.n @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: messageBox.n,v 1.12 2008/09/23 13:36:45 dkf Exp $ +'\" RCS: @(#) $Id: messageBox.n,v 1.13 2009/04/04 16:18:37 dkf Exp $ '\" .so man.macros .TH tk_messageBox n 4.2 Tk "Tk Built-In Commands" @@ -27,6 +27,7 @@ buttons. Then it returns the symbolic name of the selected button. The following option-value pairs are supported: .TP \fB\-default\fR \fIname\fR +. \fIName\fR gives the symbolic name of the default button for this message window ( .QW ok , @@ -36,50 +37,64 @@ for a list of the symbolic names. If this option is not specified, the first button in the dialog will be made the default. .TP \fB\-detail\fR \fIstring\fR +. Specifies an auxiliary message to the main message given by the -\fB\-message\fR option. Where supported by the underlying OS, the -message detail will be presented in a less emphasized font than the +\fB\-message\fR option. The message detail will be presented beneath the main +message and, where supported by the OS, in a less emphasized font than the main message. .TP \fB\-icon\fR \fIiconImage\fR +. Specifies an icon to display. \fIIconImage\fR must be one of the following: \fBerror\fR, \fBinfo\fR, \fBquestion\fR or \fBwarning\fR. If this option is not specified, then the info icon will be displayed. .TP \fB\-message\fR \fIstring\fR -Specifies the message to display in this message box. +. +Specifies the message to display in this message box. This option is ignored +on Mac OS X, where platform guidelines forbid the use of a title on this kind +of dialog. .TP \fB\-parent\fR \fIwindow\fR +. Makes \fIwindow\fR the logical parent of the message box. The message box is displayed on top of its parent window. .TP \fB\-title\fR \fItitleString\fR +. Specifies a string to display as the title of the message box. The default value is an empty string. .TP \fB\-type\fR \fIpredefinedType\fR +. Arranges for a predefined set of buttons to be displayed. The following values are possible for \fIpredefinedType\fR: .RS .TP 18 \fBabortretryignore\fR +. Displays three buttons whose symbolic names are \fBabort\fR, \fBretry\fR and \fBignore\fR. .TP 18 \fBok\fR +. Displays one button whose symbolic name is \fBok\fR. .TP 18 \fBokcancel\fR +. Displays two buttons whose symbolic names are \fBok\fR and \fBcancel\fR. .TP 18 \fBretrycancel\fR +. Displays two buttons whose symbolic names are \fBretry\fR and \fBcancel\fR. .TP 18 \fByesno\fR +. Displays two buttons whose symbolic names are \fByes\fR and \fBno\fR. .TP 18 \fByesnocancel\fR +. Displays three buttons whose symbolic names are \fByes\fR, \fBno\fR and \fBcancel\fR. .RE -- cgit v0.12