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/Widget_Node.cxx | |
| parent | 63db80c07888e5f4dcaff3579a0d174b7df5424d (diff) | |
Reactivating Mergeback functionality. (#1226)
Reactivated code.
Various fixes.
New documentation.
Diffstat (limited to 'fluid/nodes/Widget_Node.cxx')
| -rw-r--r-- | fluid/nodes/Widget_Node.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fluid/nodes/Widget_Node.cxx b/fluid/nodes/Widget_Node.cxx index cba8607f2..95be9493d 100644 --- a/fluid/nodes/Widget_Node.cxx +++ b/fluid/nodes/Widget_Node.cxx @@ -46,6 +46,9 @@ #undef max #include <algorithm> +using namespace fld; +using namespace fld::proj; + // Make an Widget_Node subclass instance. // It figures out the automatic size and parent of the new widget, // creates the Fl_Widget (by calling the virtual function _make), @@ -1468,7 +1471,7 @@ void Widget_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::WIDGET_CALLBACK, 0); f.write_c_indented(callback(), 1, 0); if (*(d-1) != ';' && *(d-1) != '}') { const char *p = strrchr(callback(), '\n'); @@ -1479,7 +1482,7 @@ void Widget_Node::write_static(fld::io::Code_Writer& f) { if (*p != '#' && *p) f.write_c(";"); } f.write_c("\n"); - // Matt: disabled f.tag(FD_TAG_WIDGET_CALLBACK, get_uid()); + f.tag(Mergeback::Tag::WIDGET_CALLBACK, Mergeback::Tag::GENERIC, get_uid()); f.write_c("}\n"); if (k) { f.write_c("void %s::%s(%s* o, %s v) {\n", k, cn, t, ut); |