Fixed keyboard navigation in fl_choice() (STR #2591)

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8616 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 6 insertions, 0 deletions

diff --git a/CHANGES b/CHANGES
index eddfd1dda..0d0822c68 100644
--- a/CHANGES
+++ b/CHANGES
@@ -146,6 +146,7 @@ CHANGES IN FLTK 1.3.0
 
 	  Bug Fixes
 
+	- Fixed keyboard navigation in fl_choice() (STR #2591)
 	- Fixed alpha blending under X11 when line data size != 0 (STR #2606)
 	- Fixed Fl_Tabs selection border drawing, if tabs are at the bottom
 	  of the widget (STR #2480)
diff --git a/src/fl_ask.cxx b/src/fl_ask.cxx
index 444dabec6..c06f0b524 100644
--- a/src/fl_ask.cxx
+++ b/src/fl_ask.cxx
@@ -99,6 +99,7 @@ static Fl_Window *makeform() {
   o->color(FL_WHITE);
   o->labelcolor(FL_BLUE);
  }
+ w->end(); // don't add the buttons automatically
  // create the buttons (right to left)
  for (int b=0, x=310; b<3; b++, x -= 100) {
    if (b==1)
@@ -109,6 +110,10 @@ static Fl_Window *makeform() {
    button[b]->callback(button_cb,(void *)b);
  }
  button[0]->shortcut(FL_Escape);
+ // add the buttons (left to right)
+ for (int b=2; b>=0; b--)
+   w->add(button[b]);
+ w->begin();
  w->resizable(new Fl_Box(60,10,110-60,27));
  w->end();
  w->set_modal();