1 files changed, 11 insertions, 9 deletions

diff --git a/src/dialog.cc b/src/dialog.cc
index 10988c98..03949a1c 100644
--- a/src/dialog.cc
+++ b/src/dialog.cc
@@ -325,6 +325,7 @@ static void choice_cb(Fl_Widget *button, void *number)
 {
   choice_answer = VOIDP2INT(number);
   _MSG("choice_cb: %d\n", choice_answer);
+
   button->window()->hide();
 }
 
@@ -358,16 +359,15 @@ int a_Dialog_choice(const char *title, const char *msg, ...)
    Fl_Window *window = new Fl_Window(ww, wh, title);
    window->set_modal();
    window->begin();
-    Fl_Group *ib = new Fl_Group(0, 0, window->w(), window->h());
-    ib->begin();
-    window->resizable(ib);
 
-    if (msg != NULL){
-       Fl_Box *box = new Fl_Box(0, 0, ww, wh - bh, msg);
-       box->labelfont(FL_HELVETICA);
-       box->labelsize(14);
-       box->align(FL_ALIGN_WRAP);
-    }
+    Fl_Text_Buffer *buf = new Fl_Text_Buffer();
+    buf->text(msg);
+    Fl_Text_Display *td = new Fl_Text_Display(0, 0, ww, wh - bh);
+    td->buffer(buf);
+    td->textsize((int) rint(14.0 * prefs.font_factor));
+    td->wrap_mode(Fl_Text_Display::WRAP_AT_BOUNDS, 0);
+    
+    window->resizable(td);
 
     int xpos = gap;
     va_start(ap, msg);
@@ -386,6 +386,8 @@ int a_Dialog_choice(const char *title, const char *msg, ...)
    while (window->shown())
       Fl::wait();
    _MSG("Dialog_choice answer = %d\n", answer);
+   td->buffer(NULL);
+   delete buf;
    delete window;
 
    return choice_answer;