summaryrefslogtreecommitdiff
path: root/fluid/app/Menu.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'fluid/app/Menu.cxx')
-rw-r--r--fluid/app/Menu.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/fluid/app/Menu.cxx b/fluid/app/Menu.cxx
index 54db5801f..fc5fad4b2 100644
--- a/fluid/app/Menu.cxx
+++ b/fluid/app/Menu.cxx
@@ -49,7 +49,7 @@ void about_cb(Fl_Widget *, void *) { Fluid.about(); }
void help_cb(Fl_Widget *, void *) {
Fluid.show_help("fluid.html");
}
-static void save_template_cb(Fl_Widget *, void *) { fld::app::save_template(); }
+static void save_template_cb(Fl_Widget *, void *) { save_template(); }
void mergeback_cb(Fl_Widget *, void *);
void manual_cb(Fl_Widget *, void *) {
@@ -85,7 +85,7 @@ void toggle_widgetbin_cb(Fl_Widget *, void *) { Fluid.toggle_widget_bin(); }
\todo Shortcuts are all over the place (Alt, Ctrl, Command, Shift-Ctrl,
function keys), and there should be a help page listing all shortcuts.
*/
-Fl_Menu_Item fld::Application::main_menu[] = {
+Fl_Menu_Item Application::main_menu[] = {
{"&File",0,0,0,FL_SUBMENU},
{"&New", FL_COMMAND+'n', menu_file_new_cb},
{"&Open...", FL_COMMAND+'o', menu_file_open_cb},
@@ -113,8 +113,8 @@ Fl_Menu_Item fld::Application::main_menu[] = {
{"&Quit", FL_COMMAND+'q', exit_cb},
{0},
{"&Edit",0,0,0,FL_SUBMENU},
- {"&Undo", FL_COMMAND+'z', fld::proj::Undo::undo_cb},
- {"&Redo", FL_COMMAND+FL_SHIFT+'z', fld::proj::Undo::redo_cb, 0, FL_MENU_DIVIDER},
+ {"&Undo", FL_COMMAND+'z', Undo::undo_cb},
+ {"&Redo", FL_COMMAND+FL_SHIFT+'z', Undo::redo_cb, 0, FL_MENU_DIVIDER},
{"C&ut", FL_COMMAND+'x', cut_cb},
{"&Copy", FL_COMMAND+'c', copy_cb},
{"&Paste", FL_COMMAND+'v', paste_cb},