1 files changed, 17 insertions, 0 deletions

diff --git a/src/ui/util.c b/src/ui/util.c
index c518d5db..fb12dd7c 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1685,6 +1685,9 @@ iWidget *makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions) {
         int         key       = actions[i].key;
         int         kmods     = actions[i].kmods;
         const iBool isDefault = (i == numActions - 1);
+        if (*label == '=' || *label == '-') {
+            continue; /* Special value selection items for a Question dialog. */
+        }
         if (!iCmpStr(label, "---")) {
             /* Separator.*/
             addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag);
@@ -1792,6 +1795,20 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg,
     setCommandHandler_Widget(dlg, messageHandler_);
     addChildFlags_Widget(dlg, iClob(new_LabelWidget(title, NULL)), frameless_WidgetFlag);
     addChildFlags_Widget(dlg, iClob(new_LabelWidget(msg, NULL)), frameless_WidgetFlag);
+    /* Check for value selections. */
+    for (size_t i = 0; i < numItems; i++) {
+        const iMenuItem *item = &items[i];
+        const char first = item->label[0];
+        if (first == '-' || first == '=') {
+            addChildFlags_Widget(dlg,
+                                 iClob(newKeyMods_LabelWidget(item->label + 1,
+                                                              item->key,
+                                                              item->kmods,
+                                                              item->command)),
+                                 resizeToParentWidth_WidgetFlag |
+                                 (first == '=' ? selected_WidgetFlag : 0));
+        }
+    }
     addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
     addChild_Widget(dlg, iClob(makeDialogButtons_Widget(items, numItems)));
     addChild_Widget(get_Window()->root, iClob(dlg));