Revert "Switch to FLTK's copy() method for menus"
This reverts commit e95412569bd45ec3da43e1b9a244856e0408f6ab
and commit 52a18150a7a8f2802000136c35005bc83b5b0855.
The copy() method unfortunately has its own problems so it was not
a good replacement.
diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx
index f367840..b9752aa 100644
--- a/vncviewer/OptionsDialog.cxx
+++ b/vncviewer/OptionsDialog.cxx
@@ -724,19 +724,9 @@
menuKeyChoice = new Fl_Choice(LBLLEFT(tx, ty, 150, CHOICE_HEIGHT, _("Menu key")));
- Fl_Menu_Item items[getMenuKeySymbolCount() + 2];
-
- memset(items, 0, sizeof(items));
-
- items[0].text = strdup(_("None"));
- items[0].flags = FL_MENU_DIVIDER;
-
+ menuKeyChoice->add(_("None"), 0, NULL, (void*)0, FL_MENU_DIVIDER);
for (int i = 0; i < getMenuKeySymbolCount(); i++)
- items[i+1].text = strdup(getMenuKeySymbols()[i].name);
-
- items[getMenuKeySymbolCount()+1].text = NULL;
-
- menuKeyChoice->copy(items);
+ menuKeyChoice->add(getMenuKeySymbols()[i].name, 0, NULL, 0, 0);
ty += CHOICE_HEIGHT + TIGHT_MARGIN;