From 8c32c708a9ad32970f332d2c8863edba1071bec8 Mon Sep 17 00:00:00 2001 From: Greg Ercolano Date: Wed, 18 Apr 2018 18:28:46 +0000 Subject: [PATCH] Clarified the fl_choice ordering in first example with an image and arrows, as it's not clear in the text how the code order is reversed on-screen. Also, the whole 'three musketeers' thing with the case values not matching the numeric button names has always been confusing: case 0: .. // One case 1: .. // Two (default) case 2: .. // Three Changed that so it's a Zero/One/Two example instead. case 0: .. // "Zero" case 1: .. // "One" (default) case 2: .. // "Two" git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12853 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- .../src/fl_choice_left_middle_right.png | Bin 0 -> 5004 bytes src/fl_ask.cxx | 26 ++++++------------ 2 files changed, 8 insertions(+), 18 deletions(-) create mode 100644 documentation/src/fl_choice_left_middle_right.png diff --git a/documentation/src/fl_choice_left_middle_right.png b/documentation/src/fl_choice_left_middle_right.png new file mode 100644 index 0000000000000000000000000000000000000000..1295a409e6140b28e9a1b3210f6c9e4c7481325a GIT binary patch literal 5004 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 Ty!rXGp+%*Q)d!0)cZ2^A7)EK= literal 0 HcmV?d00001 diff --git a/src/fl_ask.cxx b/src/fl_ask.cxx index 09ff328cb..0eeb33660 100644 --- a/src/fl_ask.cxx +++ b/src/fl_ask.cxx @@ -363,19 +363,9 @@ int fl_ask(const char *fmt, ...) { /** Shows a dialog displaying the printf style \p fmt message, this dialog features up to 3 customizable choice buttons - which are specified in *right-to-left* order, e.g. - \code - // - // ______________________________________________ - // | ___ | - // | | ? | Message text.. | - // | |___| | - // | [Left] [Middle] [Right] | - // |______________________________________________| - // - // - fl_choice("Message text..", "Right", "Middle", "Left"); - \endcode + which are specified in order of *right-to-left* in the dialog, e.g. + \image html fl_choice_left_middle_right.png + \image latex fl_choice_left_middle_right.png "fl_choice() button ordering" width=4cm \note Common dialog boxes are application modal. No more than one common dialog box can be open at any time. Requests for additional dialog boxes are ignored. @@ -398,11 +388,11 @@ int fl_ask(const char *fmt, ...) { \image html fl_choice_three.png \image latex fl_choice_three.png "fl_choice() three choices" width=4cm \code - switch ( fl_choice("How many musketeers?", "One", "Two", "Three") ) { - case 0: .. // One - case 1: .. // Two (default) - case 2: .. // Three - } + switch ( fl_choice("How many bedrooms?", "Zero", "One", "Two") ) { + case 0: .. // "Zero" + case 1: .. // "One" (default) + case 2: .. // "Two" + } \endcode Two choice example: