diff options
| author | Matthias Melcher <github@matthiasm.com> | 2025-04-15 14:47:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-15 14:47:24 +0200 |
| commit | fc91880faf7968432710e439e77ef067759d16fc (patch) | |
| tree | f941b5ebbc70e8380775098a225001c2379b6e0f /fluid/nodes/Menu_Node.cxx | |
| parent | 63db80c07888e5f4dcaff3579a0d174b7df5424d (diff) | |
Reactivating Mergeback functionality. (#1226)
Reactivated code.
Various fixes.
New documentation.
Diffstat (limited to 'fluid/nodes/Menu_Node.cxx')
| -rw-r--r-- | fluid/nodes/Menu_Node.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fluid/nodes/Menu_Node.cxx b/fluid/nodes/Menu_Node.cxx index 2a76b833a..a4434a4dd 100644 --- a/fluid/nodes/Menu_Node.cxx +++ b/fluid/nodes/Menu_Node.cxx @@ -44,6 +44,9 @@ #include <stdio.h> #include <stdlib.h> +using namespace fld; +using namespace fld::proj; + Fl_Menu_Item menu_item_type_menu[] = { {"Normal",0,nullptr,(void*)nullptr}, {"Toggle",0,nullptr,(void*)FL_MENU_BOX}, @@ -349,7 +352,7 @@ void Menu_Item_Node::write_static(fld::io::Code_Writer& f) { f.write_c(", %s", ut); if (use_v) f.write_c(" v"); f.write_c(") {\n"); - // Matt: disabled f.tag(FD_TAG_GENERIC, 0); + f.tag(Mergeback::Tag::GENERIC, Mergeback::Tag::MENU_CALLBACK, 0); f.write_c_indented(callback(), 1, 0); if (*(d-1) != ';' && *(d-1) != '}') { const char *p = strrchr(callback(), '\n'); @@ -360,7 +363,7 @@ void Menu_Item_Node::write_static(fld::io::Code_Writer& f) { if (*p != '#' && *p) f.write_c(";"); } f.write_c("\n"); - // Matt: disabled f.tag(FD_TAG_MENU_CALLBACK, get_uid()); + f.tag(Mergeback::Tag::MENU_CALLBACK, Mergeback::Tag::GENERIC, get_uid()); f.write_c("}\n"); // If the menu item is part of a Class or Widget Class, FLUID generates |