diff options
Diffstat (limited to 'test/menubar.cxx')
| -rw-r--r-- | test/menubar.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/menubar.cxx b/test/menubar.cxx index 067661cfa..e6dac6ccc 100644 --- a/test/menubar.cxx +++ b/test/menubar.cxx @@ -133,7 +133,7 @@ Fl_Menu_Item menutable[] = { {"Size", 0, 0}, {0}, {"&Checkbox",FL_F+3,0,0,FL_SUBMENU}, - {" Greek: ", 0, 0, nullptr, FL_MENU_HEADLINE, 0, FL_BOLD }, + {" Greek: ", 0, 0, 0, FL_MENU_HEADLINE, 0, FL_BOLD }, {"&Alpha", FL_F+2, 0, (void *)1, FL_MENU_TOGGLE}, {"&Beta", 0, 0, (void *)2, FL_MENU_TOGGLE}, {"&Gamma", 0, 0, (void *)3, FL_MENU_TOGGLE}, @@ -141,10 +141,10 @@ Fl_Menu_Item menutable[] = { {"&Epsilon",0, 0, (void *)5, FL_MENU_TOGGLE}, {"&Pi", 0, 0, (void *)6, FL_MENU_TOGGLE}, {"&Mu", 0, 0, (void *)7, FL_MENU_TOGGLE|FL_MENU_DIVIDER}, - {" Colors: ", 0, 0, nullptr, FL_MENU_HEADLINE, 0, FL_BOLD }, + {" Colors: ", 0, 0, 0, FL_MENU_HEADLINE, 0, FL_BOLD }, {"Red", 0, 0, (void *)1, FL_MENU_TOGGLE, 0, 0, 0, 1}, {"Black", 0, 0, (void *)1, FL_MENU_TOGGLE|FL_MENU_DIVIDER}, - {" Digits: ", 0, 0, nullptr, FL_MENU_HEADLINE, 0, FL_BOLD }, + {" Digits: ", 0, 0, 0, FL_MENU_HEADLINE, 0, FL_BOLD }, {"00", 0, 0, (void *)1, FL_MENU_TOGGLE}, {"000", 0, 0, (void *)1, FL_MENU_TOGGLE}, {0}, @@ -252,9 +252,9 @@ void about_cb(Fl_Widget*, void*) { class Dynamic_Choice: public Fl_Choice { public: - Dynamic_Choice(int x, int y, int w, int h, const char *label=nullptr) + Dynamic_Choice(int x, int y, int w, int h, const char *label=0) : Fl_Choice(x, y, w, h, label) { } - int handle(int event) override { + int handle(int event) { static int flip_flop = 0; if (event == FL_BEFORE_MENU) { // The following line is legal because we used `copy()` to create a |