wip

8 files changed, 452 insertions, 452 deletions

diff --git a/fluid/panels/function_panel.cxx b/fluid/panels/function_panel.cxx
index 4fea9aa1e..a5aa35f12 100644
--- a/fluid/panels/function_panel.cxx
+++ b/fluid/panels/function_panel.cxx
@@ -52,31 +52,31 @@ Fl_Window* make_widgetbin() {
         o->tooltip("Function");
         o->box(FL_THIN_UP_BOX);
         o->callback((Fl_Callback*)type_make_cb, (void*)("Function"));
-        o->image(pixmap[(int)Type::Function]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Function]);
       } // Fl_Button* o
       { Fl_Button* o = new Fl_Button(30, 21, 24, 24);
         o->tooltip("Class");
         o->box(FL_THIN_UP_BOX);
         o->callback((Fl_Callback*)type_make_cb, (void*)("Class"));
-        o->image(pixmap[(int)Type::Class]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Class]);
       } // Fl_Button* o
       { Fl_Button* o = new Fl_Button(55, 21, 24, 24);
         o->tooltip("Comment");
         o->box(FL_THIN_UP_BOX);
         o->callback((Fl_Callback*)type_make_cb, (void*)("comment"));
-        o->image(pixmap[(int)Type::Comment]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Comment]);
       } // Fl_Button* o
       { Fl_Button* o = new Fl_Button(5, 46, 24, 24);
         o->tooltip("Code");
         o->box(FL_THIN_UP_BOX);
         o->callback((Fl_Callback*)type_make_cb, (void*)("Code"));
-        o->image(pixmap[(int)Type::Code]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Code]);
       } // Fl_Button* o
       { Fl_Button* o = new Fl_Button(30, 46, 24, 24);
         o->tooltip("Code Block");
         o->box(FL_THIN_UP_BOX);
         o->callback((Fl_Callback*)type_make_cb, (void*)("CodeBlock"));
-        o->image(pixmap[(int)Type::CodeBlock]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_CodeBlock]);
       } // Fl_Button* o
       { fld::widget::Bin_Window_Button* o = new fld::widget::Bin_Window_Button(55, 46, 24, 24);
         o->tooltip("Widget Class");
@@ -90,25 +90,25 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("widget_class"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Widget_Class]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Widget_Class]);
       } // fld::widget::Bin_Window_Button* o
       { Fl_Button* o = new Fl_Button(5, 71, 24, 24);
         o->tooltip("Declaration");
         o->box(FL_THIN_UP_BOX);
         o->callback((Fl_Callback*)type_make_cb, (void*)("decl"));
-        o->image(pixmap[(int)Type::Decl]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Decl]);
       } // Fl_Button* o
       { Fl_Button* o = new Fl_Button(30, 71, 24, 24);
         o->tooltip("Declaration Block");
         o->box(FL_THIN_UP_BOX);
         o->callback((Fl_Callback*)type_make_cb, (void*)("declblock"));
-        o->image(pixmap[(int)Type::DeclBlock]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_DeclBlock]);
       } // Fl_Button* o
       { Fl_Button* o = new Fl_Button(55, 71, 24, 24);
         o->tooltip("Inline Data");
         o->box(FL_THIN_UP_BOX);
         o->callback((Fl_Callback*)type_make_cb, (void*)("data"));
-        o->image(pixmap[(int)Type::Data]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Data]);
       } // Fl_Button* o
       o->end();
     } // Fl_Group* o
@@ -126,7 +126,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Window"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Window]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Window]);
       } // fld::widget::Bin_Window_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(114, 21, 24, 24);
         o->tooltip("Group");
@@ -140,7 +140,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Group"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Group]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Group]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(139, 21, 24, 24);
         o->tooltip("Pack");
@@ -154,7 +154,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Pack"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Pack]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Pack]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(89, 46, 24, 24);
         o->tooltip("Tabs");
@@ -168,7 +168,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tabs"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Tabs]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Tabs]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(114, 46, 24, 24);
         o->tooltip("Scroll");
@@ -182,7 +182,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Scroll"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Scroll]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Scroll]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(139, 46, 24, 24);
         o->tooltip("Flex");
@@ -196,7 +196,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Flex"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Flex]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Flex]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(89, 71, 24, 24);
         o->tooltip("Tile");
@@ -210,7 +210,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tile"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Tile]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Tile]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(114, 71, 24, 24);
         o->tooltip("Wizard");
@@ -224,7 +224,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Wizard"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Wizard]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Wizard]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(139, 71, 24, 24);
         o->tooltip("Grid");
@@ -238,7 +238,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Grid"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Grid]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Grid]);
       } // fld::widget::Bin_Button* o
       o->end();
     } // Fl_Group* o
@@ -256,7 +256,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Button"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Button]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Button]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(198, 21, 24, 24);
         o->tooltip("Return Button");
@@ -270,7 +270,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Return_Button"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Return_Button]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Return_Button]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(173, 46, 24, 24);
         o->tooltip("Light Button");
@@ -284,7 +284,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Light_Button"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Light_Button]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Light_Button]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(198, 46, 24, 24);
         o->tooltip("Repeat Button");
@@ -298,7 +298,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Repeat_Button"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Repeat_Button]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Repeat_Button]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(173, 71, 24, 24);
         o->tooltip("Check Button");
@@ -312,7 +312,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Check_Button"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Check_Button]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Check_Button]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(198, 71, 24, 24);
         o->tooltip("Round Button");
@@ -326,7 +326,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Round_Button"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Round_Button]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Round_Button]);
       } // fld::widget::Bin_Button* o
       o->end();
     } // Fl_Group* o
@@ -344,7 +344,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Slider"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Slider]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Slider]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(257, 21, 24, 24);
         o->tooltip("Scroll Bar");
@@ -358,7 +358,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Scrollbar"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Scrollbar]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Scrollbar]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(282, 21, 24, 24);
         o->tooltip("Value Slider");
@@ -372,7 +372,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Slider"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Value_Slider]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Value_Slider]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(307, 21, 24, 24);
         o->tooltip("Value Output");
@@ -386,7 +386,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Output"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Value_Output]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Value_Output]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(232, 46, 24, 24);
         o->tooltip("Adjuster");
@@ -400,7 +400,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Adjuster"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Adjuster]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Adjuster]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(257, 46, 24, 24);
         o->tooltip("Counter");
@@ -414,7 +414,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Counter"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Counter]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Counter]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(282, 46, 24, 24);
         o->tooltip("Dial");
@@ -428,7 +428,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Dial"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Dial]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Dial]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(232, 71, 24, 24);
         o->tooltip("Roller");
@@ -442,7 +442,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Roller"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Roller]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Roller]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(257, 71, 24, 24);
         o->tooltip("Spinner");
@@ -456,7 +456,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Spinner"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Spinner]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Spinner]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(282, 71, 24, 24);
         o->tooltip("Value Input");
@@ -470,7 +470,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Value_Input"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Value_Input]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Value_Input]);
       } // fld::widget::Bin_Button* o
       o->end();
     } // Fl_Group* o
@@ -488,7 +488,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Input"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Input]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Input]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(366, 21, 24, 24);
         o->tooltip("Output");
@@ -502,7 +502,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Output"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Output]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Output]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(341, 46, 24, 24);
         o->tooltip("Text Edit");
@@ -516,7 +516,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Text_Editor"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Text_Editor]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Text_Editor]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(366, 46, 24, 24);
         o->tooltip("Text Display");
@@ -530,7 +530,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Text_Display"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Text_Display]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Text_Display]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(341, 71, 24, 24);
         o->tooltip("File Input");
@@ -544,7 +544,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_File_Input"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::File_Input]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_File_Input]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(366, 71, 24, 24);
         o->tooltip("Terminal");
@@ -558,7 +558,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Terminal"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Terminal]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Terminal]);
       } // fld::widget::Bin_Button* o
       o->end();
     } // Fl_Group* o
@@ -576,7 +576,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Input_Choice"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Input_Choice]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Input_Choice]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(425, 21, 24, 24);
         o->tooltip("Menu Item");
@@ -590,7 +590,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("menuitem"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Menu_Item]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Menu_Item]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(450, 21, 24, 24);
         o->tooltip("Menu Bar");
@@ -604,7 +604,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Menu_Bar"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Menu_Bar]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Menu_Bar]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(400, 46, 24, 24);
         o->tooltip("Menu Button");
@@ -618,7 +618,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Menu_Button"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Menu_Button]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Menu_Button]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(425, 46, 24, 24);
         o->tooltip("Checkbox Menu Item");
@@ -632,7 +632,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("checkmenuitem"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Checkbox_Menu_Item]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Checkbox_Menu_Item]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(450, 46, 24, 24);
         o->tooltip("Sub Menu");
@@ -646,7 +646,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("submenu"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Submenu]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Submenu]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(400, 71, 24, 24);
         o->tooltip("Choice");
@@ -660,7 +660,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Choice"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Choice]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Choice]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(425, 71, 24, 24);
         o->tooltip("Radio Menu Item");
@@ -674,7 +674,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("radiomenuitem"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Radio_Menu_Item]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Radio_Menu_Item]);
       } // fld::widget::Bin_Button* o
       o->end();
     } // Fl_Group* o
@@ -692,7 +692,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Browser"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Browser]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Browser]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(509, 21, 24, 24);
         o->tooltip("Tree");
@@ -706,7 +706,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Tree"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Tree]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Tree]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(484, 46, 24, 24);
         o->tooltip("Check Browser");
@@ -720,7 +720,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Check_Browser"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Check_Browser]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Check_Browser]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(509, 46, 24, 24);
         o->tooltip("Help Browser");
@@ -734,7 +734,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Help_View"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Help_View]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Help_View]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(484, 71, 24, 24);
         o->tooltip("File Browser");
@@ -748,7 +748,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_File_Browser"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::File_Browser]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_File_Browser]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(509, 71, 24, 24);
         o->tooltip("Table");
@@ -762,7 +762,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Table"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Table]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Table]);
       } // fld::widget::Bin_Button* o
       o->end();
     } // Fl_Group* o
@@ -780,7 +780,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Box"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Box]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Box]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(567, 21, 24, 24);
         o->tooltip("Clock");
@@ -794,7 +794,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Clock"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Clock]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Clock]);
       } // fld::widget::Bin_Button* o
       { fld::widget::Bin_Button* o = new fld::widget::Bin_Button(542, 46, 24, 24);
         o->tooltip("Progress");
@@ -808,7 +808,7 @@ Fl_Window* make_widgetbin() {
         o->callback((Fl_Callback*)type_make_cb, (void*)("Fl_Progress"));
         o->align(Fl_Align(FL_ALIGN_CENTER));
         o->when(FL_WHEN_RELEASE);
-        o->image(pixmap[(int)Type::Progress]);
+        o->image(pixmap[(int)FLD_NODE_TYPE_Progress]);
       } // fld::widget::Bin_Button* o
       o->end();
     } // Fl_Group* o
diff --git a/fluid/panels/function_panel.fl b/fluid/panels/function_panel.fl
index 23240f469..6bb28907e 100644
--- a/fluid/panels/function_panel.fl
+++ b/fluid/panels/function_panel.fl
@@ -74,56 +74,56 @@ else
         user_data {"Function"}
         callback type_make_cb
         tooltip Function xywh {5 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Function]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Function]);}
       }
       Fl_Button {} {
         user_data {"Class"}
         callback type_make_cb
         tooltip Class xywh {30 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Class]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Class]);}
       }
       Fl_Button {} {
         user_data {"comment"}
         callback type_make_cb
         tooltip Comment xywh {55 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Comment]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Comment]);}
       }
       Fl_Button {} {
         user_data {"Code"}
         callback type_make_cb
         tooltip Code xywh {5 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Code]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Code]);}
       }
       Fl_Button {} {
         user_data {"CodeBlock"}
         callback type_make_cb
         tooltip {Code Block} xywh {30 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::CodeBlock]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_CodeBlock]);}
       }
       Fl_Button {} {
         user_data {"widget_class"}
         callback type_make_cb
         tooltip {Widget Class} xywh {55 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Widget_Class]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Widget_Class]);}
         class {fld::widget::Bin_Window_Button}
       }
       Fl_Button {} {
         user_data {"decl"}
         callback type_make_cb
         tooltip Declaration xywh {5 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Decl]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Decl]);}
       }
       Fl_Button {} {
         user_data {"declblock"}
         callback type_make_cb
         tooltip {Declaration Block} xywh {30 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::DeclBlock]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_DeclBlock]);}
       }
       Fl_Button {} {
         user_data {"data"}
         callback type_make_cb
         tooltip {Inline Data} xywh {55 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Data]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Data]);}
       }
     }
     Fl_Group {} {
@@ -134,63 +134,63 @@ else
         user_data {"Fl_Window"}
         callback type_make_cb
         tooltip Window xywh {89 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Window]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Window]);}
         class {fld::widget::Bin_Window_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Group"}
         callback type_make_cb
         tooltip Group xywh {114 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Group]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Group]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Pack"}
         callback type_make_cb
         tooltip Pack xywh {139 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Pack]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Pack]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Tabs"}
         callback type_make_cb
         tooltip Tabs xywh {89 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Tabs]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Tabs]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Scroll"}
         callback type_make_cb
         tooltip Scroll xywh {114 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Scroll]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Scroll]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Flex"}
         callback type_make_cb
         tooltip Flex xywh {139 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Flex]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Flex]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Tile"}
         callback type_make_cb
         tooltip Tile xywh {89 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Tile]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Tile]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Wizard"}
         callback type_make_cb
         tooltip Wizard xywh {114 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Wizard]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Wizard]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Grid"}
         callback type_make_cb
         tooltip Grid xywh {139 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Grid]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Grid]);}
         class {fld::widget::Bin_Button}
       }
     }
@@ -202,42 +202,42 @@ else
         user_data {"Fl_Button"}
         callback type_make_cb
         tooltip Button xywh {173 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Button]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Button]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Return_Button"}
         callback type_make_cb
         tooltip {Return Button} xywh {198 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Return_Button]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Return_Button]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Light_Button"}
         callback type_make_cb
         tooltip {Light Button} xywh {173 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Light_Button]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Light_Button]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Repeat_Button"}
         callback type_make_cb
         tooltip {Repeat Button} xywh {198 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Repeat_Button]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Repeat_Button]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Check_Button"}
         callback type_make_cb
         tooltip {Check Button} xywh {173 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Check_Button]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Check_Button]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Round_Button"}
         callback type_make_cb
         tooltip {Round Button} xywh {198 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Round_Button]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Round_Button]);}
         class {fld::widget::Bin_Button}
       }
     }
@@ -249,70 +249,70 @@ else
         user_data {"Fl_Slider"}
         callback type_make_cb
         tooltip Slider xywh {232 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Slider]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Slider]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Scrollbar"}
         callback type_make_cb
         tooltip {Scroll Bar} xywh {257 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Scrollbar]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Scrollbar]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Value_Slider"}
         callback type_make_cb
         tooltip {Value Slider} xywh {282 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Value_Slider]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Value_Slider]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Value_Output"}
         callback type_make_cb
         tooltip {Value Output} xywh {307 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Value_Output]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Value_Output]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Adjuster"}
         callback type_make_cb
         tooltip Adjuster xywh {232 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Adjuster]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Adjuster]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Counter"}
         callback type_make_cb
         tooltip Counter xywh {257 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Counter]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Counter]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Dial"}
         callback type_make_cb
         tooltip Dial xywh {282 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Dial]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Dial]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Roller"}
         callback type_make_cb
         tooltip Roller xywh {232 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Roller]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Roller]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Spinner"}
         callback type_make_cb
         tooltip Spinner xywh {257 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Spinner]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Spinner]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Value_Input"}
         callback type_make_cb
         tooltip {Value Input} xywh {282 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Value_Input]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Value_Input]);}
         class {fld::widget::Bin_Button}
       }
     }
@@ -324,42 +324,42 @@ else
         user_data {"Fl_Input"}
         callback type_make_cb
         tooltip Input xywh {341 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Input]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Input]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Output"}
         callback type_make_cb
         tooltip Output xywh {366 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Output]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Output]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Text_Editor"}
         callback type_make_cb
         tooltip {Text Edit} xywh {341 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Text_Editor]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Text_Editor]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Text_Display"}
         callback type_make_cb
         tooltip {Text Display} xywh {366 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Text_Display]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Text_Display]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_File_Input"}
         callback type_make_cb
         tooltip {File Input} xywh {341 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::File_Input]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_File_Input]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Terminal"}
         callback type_make_cb
         tooltip Terminal xywh {366 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Terminal]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Terminal]);}
         class {fld::widget::Bin_Button}
       }
     }
@@ -371,56 +371,56 @@ else
         user_data {"Fl_Input_Choice"}
         callback type_make_cb
         tooltip {Input Choice} xywh {400 22 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Input_Choice]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Input_Choice]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"menuitem"}
         callback type_make_cb
         tooltip {Menu Item} xywh {425 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Menu_Item]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Menu_Item]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Menu_Bar"}
         callback type_make_cb
         tooltip {Menu Bar} xywh {450 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Menu_Bar]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Menu_Bar]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Menu_Button"}
         callback type_make_cb
         tooltip {Menu Button} xywh {400 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Menu_Button]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Menu_Button]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"checkmenuitem"}
         callback type_make_cb
         tooltip {Checkbox Menu Item} xywh {425 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Checkbox_Menu_Item]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Checkbox_Menu_Item]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"submenu"}
         callback type_make_cb
         tooltip {Sub Menu} xywh {450 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Submenu]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Submenu]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Choice"}
         callback type_make_cb
         tooltip Choice xywh {400 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Choice]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Choice]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"radiomenuitem"}
         callback type_make_cb
         tooltip {Radio Menu Item} xywh {425 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Radio_Menu_Item]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Radio_Menu_Item]);}
         class {fld::widget::Bin_Button}
       }
     }
@@ -432,42 +432,42 @@ else
         user_data {"Fl_Browser"}
         callback type_make_cb
         tooltip Browser xywh {484 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Browser]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Browser]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Tree"}
         callback type_make_cb
         tooltip Tree xywh {509 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Tree]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Tree]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Check_Browser"}
         callback type_make_cb
         tooltip {Check Browser} xywh {484 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Check_Browser]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Check_Browser]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Help_View"}
         callback type_make_cb
         tooltip {Help Browser} xywh {509 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Help_View]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Help_View]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_File_Browser"}
         callback type_make_cb
         tooltip {File Browser} xywh {484 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::File_Browser]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_File_Browser]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Table"}
         callback type_make_cb
         tooltip Table xywh {509 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Table]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Table]);}
         class {fld::widget::Bin_Button}
       }
     }
@@ -479,21 +479,21 @@ else
         user_data {"Fl_Box"}
         callback type_make_cb
         tooltip Box xywh {542 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Box]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Box]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Clock"}
         callback type_make_cb
         tooltip Clock xywh {567 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Clock]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Clock]);}
         class {fld::widget::Bin_Button}
       }
       Fl_Button {} {
         user_data {"Fl_Progress"}
         callback type_make_cb
         tooltip Progress xywh {542 46 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[(int)Type::Progress]);}
+        code0 {o->image(pixmap[(int)FLD_NODE_TYPE_Progress]);}
         class {fld::widget::Bin_Button}
       }
     }
diff --git a/fluid/panels/settings_panel.cxx b/fluid/panels/settings_panel.cxx
index e691e9e97..e108e57e4 100644
--- a/fluid/panels/settings_panel.cxx
+++ b/fluid/panels/settings_panel.cxx
@@ -544,7 +544,7 @@ Fl_Menu_Button *w_layout_menu=(Fl_Menu_Button *)0;
 static void cb_w_layout_menu(Fl_Menu_Button*, void* v) {
   if (v == LOAD) {
     fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
-    if (suite.storage_ == fld::Tool_Store::INTERNAL) {
+    if (suite.storage_ == FLD_TOOL_STORE_INTERNAL) {
       w_layout_menu_rename->deactivate();
       for (int i=1; i<4; i++) w_layout_menu_storage[i]->deactivate();
       w_layout_menu_delete->deactivate();
@@ -571,25 +571,25 @@ static void cb_w_layout_menu_rename(Fl_Menu_*, void*) {
 
 static void cb_w_layout_menu_storage(Fl_Menu_*, void*) {
   fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
-  suite.storage(fld::Tool_Store::INTERNAL);
+  suite.storage(FLD_TOOL_STORE_INTERNAL);
   Fluid.layout_list.update_dialogs();
 }
 
 static void cb_w_layout_menu_storage1(Fl_Menu_*, void*) {
   fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
-  suite.storage(fld::Tool_Store::USER);
+  suite.storage(FLD_TOOL_STORE_USER);
   Fluid.layout_list.update_dialogs();
 }
 
 static void cb_w_layout_menu_storage2(Fl_Menu_*, void*) {
   fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
-  suite.storage(fld::Tool_Store::PROJECT);
+  suite.storage(FLD_TOOL_STORE_PROJECT);
   Fluid.layout_list.update_dialogs();
 }
 
 static void cb_w_layout_menu_storage3(Fl_Menu_*, void*) {
   fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
-  suite.storage(fld::Tool_Store::FILE);
+  suite.storage(FLD_TOOL_STORE_FILE);
   Fluid.layout_list.update_dialogs();
 }
 
@@ -895,9 +895,9 @@ static void cb_w_settings_shell_list(Fl_Browser* o, void* v) {
       for (int i=0; i<g_shell_config->list_size; i++) {
         Fd_Shell_Command *cmd = g_shell_config->list[i];
         o->add(cmd->name.c_str());
-        if (cmd->storage == fld::Tool_Store::USER)
+        if (cmd->storage == FLD_TOOL_STORE_USER)
           o->icon(i+1, w_settings_shell_fd_user->image());
-        else if (cmd->storage == fld::Tool_Store::PROJECT)
+        else if (cmd->storage == FLD_TOOL_STORE_PROJECT)
           o->icon(i+1, w_settings_shell_fd_project->image());
       }
     }
@@ -930,9 +930,9 @@ static void cb_a(Fl_Button*, void* v) {
     w_settings_shell_list->insert(selected+1, cmd->name.c_str());
     w_settings_shell_list->deselect();
     w_settings_shell_list->value(selected+1);
-    if (cmd->storage == fld::Tool_Store::USER) {
+    if (cmd->storage == FLD_TOOL_STORE_USER) {
       w_settings_shell_list->icon(selected+1, w_settings_shell_fd_user->image());
-    } else if (cmd->storage == fld::Tool_Store::PROJECT) {
+    } else if (cmd->storage == FLD_TOOL_STORE_PROJECT) {
       w_settings_shell_list->icon(selected+1, w_settings_shell_fd_project->image());
       Fluid.proj.set_modflag(1);
     }
@@ -960,9 +960,9 @@ static void cb_w_settings_shell_dup(Fl_Button* o, void* v) {
     w_settings_shell_list->insert(selected+1, cmd->name.c_str());
     w_settings_shell_list->deselect();
     w_settings_shell_list->value(selected+1);
-    if (cmd->storage == fld::Tool_Store::USER) {
+    if (cmd->storage == FLD_TOOL_STORE_USER) {
       w_settings_shell_list->icon(selected+1, w_settings_shell_fd_user->image());
-    } else if (cmd->storage == fld::Tool_Store::PROJECT) {
+    } else if (cmd->storage == FLD_TOOL_STORE_PROJECT) {
       w_settings_shell_list->icon(selected+1, w_settings_shell_fd_project->image());
       Fluid.proj.set_modflag(1);
     }
@@ -988,7 +988,7 @@ static void cb_w_settings_shell_remove(Fl_Button* o, void* v) {
     int ret = fl_choice("Delete the shell command\n\"%s\"?\n\nThis can not be undone.",
       "Delete", "Cancel", nullptr, g_shell_config->list[selected-1]->name.c_str());
     if (ret==1) return;
-    if (g_shell_config->at(selected-1)->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (g_shell_config->at(selected-1)->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     g_shell_config->remove(selected-1);
     w_settings_shell_list->remove(selected);
     if (selected <= w_settings_shell_list->size())
@@ -1073,7 +1073,7 @@ static void cb_Name(Fl_Input* o, void* v) {
       Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
       cmd->name = o->value();
       w_settings_shell_list->text(selected, o->value());
-      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+      if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1091,7 +1091,7 @@ static void cb_Menu(Fl_Input* o, void* v) {
       Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
       cmd->label = o->value();
       cmd->update_shell_menu();
-      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+      if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1114,7 +1114,7 @@ static void cb_Shortcut(Fl_Shortcut_Button* o, void* v) {
       Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
       cmd->shortcut = o->value();
       cmd->update_shell_menu();
-      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+      if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1126,27 +1126,27 @@ static void cb_Store(Fl_Choice* o, void* v) {
       fld::Tool_Store ts = g_shell_config->list[selected-1]->storage;
       o->value(o->find_item_with_argument((long)ts));
     } else {
-      o->value(o->find_item_with_argument((long)fld::Tool_Store::USER));
+      o->value(o->find_item_with_argument((long)FLD_TOOL_STORE_USER));
     }
   } else {
     if (selected) {
       Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
       fld::Tool_Store ts = (fld::Tool_Store)(o->mvalue()->argument());
-      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+      if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
       cmd->storage = ts;
       //w_settings_shell_list->text(selected, cmd->name.c_str());
-      if (cmd->storage == fld::Tool_Store::USER)
+      if (cmd->storage == FLD_TOOL_STORE_USER)
         w_settings_shell_list->icon(selected, w_settings_shell_fd_user->image());
-      else if (cmd->storage == fld::Tool_Store::PROJECT)
+      else if (cmd->storage == FLD_TOOL_STORE_PROJECT)
         w_settings_shell_list->icon(selected, w_settings_shell_fd_project->image());
-      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+      if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
 
 Fl_Menu_Item menu_Store[] = {
- {"@fd_user User Setting", 0,  0, (void*)(fld::Tool_Store::USER), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0},
- {"@fd_project Project File", 0,  0, (void*)(fld::Tool_Store::PROJECT), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0},
+ {"@fd_user User Setting", 0,  0, (void*)(FLD_TOOL_STORE_USER), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0},
+ {"@fd_project Project File", 0,  0, (void*)(FLD_TOOL_STORE_PROJECT), 0, (uchar)FL_NORMAL_LABEL, 0, 12, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -1165,7 +1165,7 @@ static void cb_Condition(Fl_Choice* o, void* v) {
       int cond = (int)(o->mvalue()->argument());
       cmd->condition = cond;
       g_shell_config->rebuild_shell_menu();
-      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+      if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1202,7 +1202,7 @@ static void cb_w_settings_shell_command(Fl_Text_Editor* o, void* v) {
     if (selected) {
       Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
       cmd->command = o->buffer()->text();
-      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+      if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1281,7 +1281,7 @@ static void cb_save(Fl_Check_Button* o, void* v) {
       } else {
         cmd->flags &= ~Fd_Shell_Command::SAVE_PROJECT;
       }
-      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+      if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1303,7 +1303,7 @@ static void cb_save1(Fl_Check_Button* o, void* v) {
       } else {
         cmd->flags &= ~Fd_Shell_Command::SAVE_SOURCECODE;
       }
-      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+      if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1325,7 +1325,7 @@ static void cb_save2(Fl_Check_Button* o, void* v) {
       } else {
         cmd->flags &= ~Fd_Shell_Command::SAVE_STRINGS;
       }
-      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+      if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1347,7 +1347,7 @@ static void cb_show(Fl_Check_Button* o, void* v) {
       } else {
         cmd->flags &= ~Fd_Shell_Command::DONT_SHOW_TERMINAL;
       }
-      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+      if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1369,7 +1369,7 @@ static void cb_clear(Fl_Check_Button* o, void* v) {
       } else {
         cmd->flags &= ~Fd_Shell_Command::CLEAR_TERMINAL;
       }
-      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+      if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1391,7 +1391,7 @@ static void cb_clear1(Fl_Check_Button* o, void* v) {
       } else {
         cmd->flags &= ~Fd_Shell_Command::CLEAR_HISTORY;
       }
-      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+      if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -2465,8 +2465,8 @@ static void cb_Reset(Fl_Button* o, void* v) {
 
 static void cb_Close(Fl_Button*, void*) {
   if (g_shell_config)
-    g_shell_config->write(Fluid.preferences, fld::Tool_Store::USER);
-  Fluid.layout_list.write(Fluid.preferences, fld::Tool_Store::USER);
+    g_shell_config->write(Fluid.preferences, FLD_TOOL_STORE_USER);
+  Fluid.layout_list.write(Fluid.preferences, FLD_TOOL_STORE_USER);
   settings_window->hide();
 }
 
diff --git a/fluid/panels/settings_panel.fl b/fluid/panels/settings_panel.fl
index 483bb650e..abc0ade2f 100644
--- a/fluid/panels/settings_panel.fl
+++ b/fluid/panels/settings_panel.fl
@@ -513,7 +513,7 @@ Fluid.layout_list.update_dialogs();}
         Fl_Menu_Button w_layout_menu {
           callback {if (v == LOAD) {
   fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
-  if (suite.storage_ == fld::Tool_Store::INTERNAL) {
+  if (suite.storage_ == FLD_TOOL_STORE_INTERNAL) {
     w_layout_menu_rename->deactivate();
     for (int i=1; i<4; i++) w_layout_menu_storage[i]->deactivate();
     w_layout_menu_delete->deactivate();
@@ -542,28 +542,28 @@ Fluid.layout_list.update_dialogs();}
           MenuItem {w_layout_menu_storage[0]} {
             label {@fd_beaker  FLUID Built-In}
             callback {fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
-suite.storage(fld::Tool_Store::INTERNAL);
+suite.storage(FLD_TOOL_STORE_INTERNAL);
 Fluid.layout_list.update_dialogs();}
             xywh {0 0 31 20} type Radio deactivate
           }
           MenuItem {w_layout_menu_storage[1]} {
             label {@fd_user  User Preference}
             callback {fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
-suite.storage(fld::Tool_Store::USER);
+suite.storage(FLD_TOOL_STORE_USER);
 Fluid.layout_list.update_dialogs();}
             xywh {0 0 31 20} type Radio
           }
           MenuItem {w_layout_menu_storage[2]} {
             label {@fd_project  Store in .fl Project File}
             callback {fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
-suite.storage(fld::Tool_Store::PROJECT);
+suite.storage(FLD_TOOL_STORE_PROJECT);
 Fluid.layout_list.update_dialogs();}
             xywh {0 0 31 20} type Radio
           }
           MenuItem {w_layout_menu_storage[3]} {
             label {@fd_file  Store in External File}
             callback {fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
-suite.storage(fld::Tool_Store::FILE);
+suite.storage(FLD_TOOL_STORE_FILE);
 Fluid.layout_list.update_dialogs();}
             xywh {0 0 31 20} type Radio divider
           }
@@ -932,9 +932,9 @@ list:}
     for (int i=0; i<g_shell_config->list_size; i++) {
       Fd_Shell_Command *cmd = g_shell_config->list[i];
       o->add(cmd->name.c_str());
-      if (cmd->storage == fld::Tool_Store::USER)
+      if (cmd->storage == FLD_TOOL_STORE_USER)
         o->icon(i+1, w_settings_shell_fd_user->image());
-      else if (cmd->storage == fld::Tool_Store::PROJECT)
+      else if (cmd->storage == FLD_TOOL_STORE_PROJECT)
         o->icon(i+1, w_settings_shell_fd_project->image());
     }
   }
@@ -966,9 +966,9 @@ list:}
   w_settings_shell_list->insert(selected+1, cmd->name.c_str());
   w_settings_shell_list->deselect();
   w_settings_shell_list->value(selected+1);
-  if (cmd->storage == fld::Tool_Store::USER) {
+  if (cmd->storage == FLD_TOOL_STORE_USER) {
     w_settings_shell_list->icon(selected+1, w_settings_shell_fd_user->image());
-  } else if (cmd->storage == fld::Tool_Store::PROJECT) {
+  } else if (cmd->storage == FLD_TOOL_STORE_PROJECT) {
     w_settings_shell_list->icon(selected+1, w_settings_shell_fd_project->image());
     Fluid.proj.set_modflag(1);
   }
@@ -995,9 +995,9 @@ if (v==LOAD) {
   w_settings_shell_list->insert(selected+1, cmd->name.c_str());
   w_settings_shell_list->deselect();
   w_settings_shell_list->value(selected+1);
-  if (cmd->storage == fld::Tool_Store::USER) {
+  if (cmd->storage == FLD_TOOL_STORE_USER) {
     w_settings_shell_list->icon(selected+1, w_settings_shell_fd_user->image());
-  } else if (cmd->storage == fld::Tool_Store::PROJECT) {
+  } else if (cmd->storage == FLD_TOOL_STORE_PROJECT) {
     w_settings_shell_list->icon(selected+1, w_settings_shell_fd_project->image());
     Fluid.proj.set_modflag(1);
   }
@@ -1022,7 +1022,7 @@ if (v==LOAD) {
   int ret = fl_choice("Delete the shell command\\n\\"%s\\"?\\n\\nThis can not be undone.",
     "Delete", "Cancel", nullptr, g_shell_config->list[selected-1]->name.c_str());
   if (ret==1) return;
-  if (g_shell_config->at(selected-1)->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+  if (g_shell_config->at(selected-1)->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   g_shell_config->remove(selected-1);
   w_settings_shell_list->remove(selected);
   if (selected <= w_settings_shell_list->size())
@@ -1124,7 +1124,7 @@ if (v == LOAD) {
     Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
     cmd->name = o->value();
     w_settings_shell_list->text(selected, o->value());
-    if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   }
 }}
             tooltip {file the shell command under this name in the shell command list} xywh {110 246 230 20} labelfont 1 labelsize 12 when 13 textfont 4 textsize 12
@@ -1143,7 +1143,7 @@ if (v == LOAD) {
     Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
     cmd->label = o->value();
     cmd->update_shell_menu();
-    if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   }
 }}
             tooltip {label text for the Shell menu in the main menu bar} xywh {110 272 230 20} labelfont 1 labelsize 12 textfont 4 textsize 12
@@ -1167,7 +1167,7 @@ if (v == LOAD) {
     Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
     cmd->shortcut = o->value();
     cmd->update_shell_menu();
-    if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   }
 }}
               tooltip {an optional keyboard shortcut to run this shell command} xywh {110 297 130 20} labelsize 12 align 16
@@ -1182,32 +1182,32 @@ if (v == LOAD) {
     fld::Tool_Store ts = g_shell_config->list[selected-1]->storage;
     o->value(o->find_item_with_argument((long)ts));
   } else {
-    o->value(o->find_item_with_argument((long)fld::Tool_Store::USER));
+    o->value(o->find_item_with_argument((long)FLD_TOOL_STORE_USER));
   }
 } else {
   if (selected) {
     Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
     fld::Tool_Store ts = (fld::Tool_Store)(o->mvalue()->argument());
-    if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
     cmd->storage = ts;
     //w_settings_shell_list->text(selected, cmd->name.c_str());
-    if (cmd->storage == fld::Tool_Store::USER)
+    if (cmd->storage == FLD_TOOL_STORE_USER)
       w_settings_shell_list->icon(selected, w_settings_shell_fd_user->image());
-    else if (cmd->storage == fld::Tool_Store::PROJECT)
+    else if (cmd->storage == FLD_TOOL_STORE_PROJECT)
       w_settings_shell_list->icon(selected, w_settings_shell_fd_project->image());
-    if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   }
 }} open
               tooltip {store this shell command as a user setting or save it with the .fl project file} xywh {110 322 130 20} down_box BORDER_BOX labelfont 1 labelsize 12 textsize 12
             } {
               MenuItem {} {
                 label {@fd_user User Setting}
-                user_data {fld::Tool_Store::USER} user_data_type long
+                user_data {FLD_TOOL_STORE_USER} user_data_type long
                 xywh {0 0 100 20} labelsize 12
               }
               MenuItem {} {
                 label {@fd_project Project File}
-                user_data {fld::Tool_Store::PROJECT} user_data_type long
+                user_data {FLD_TOOL_STORE_PROJECT} user_data_type long
                 xywh {0 0 100 20} labelsize 12
               }
             }
@@ -1227,7 +1227,7 @@ if (v == LOAD) {
     int cond = (int)(o->mvalue()->argument());
     cmd->condition = cond;
     g_shell_config->rebuild_shell_menu();
-    if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   }
 }} open
               tooltip {add this command to the main menu bar only if this condition is true} xywh {110 348 130 20} down_box BORDER_BOX labelfont 1 labelsize 12 textsize 12
@@ -1293,7 +1293,7 @@ if (v == LOAD) {
   if (selected) {
     Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
     cmd->command = o->buffer()->text();
-    if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   }
 }}
               xywh {110 373 208 80} labelfont 1 labelsize 12 align 4 textfont 4 textsize 12 resizable
@@ -1414,7 +1414,7 @@ if (v == LOAD) {
     } else {
       cmd->flags &= ~Fd_Shell_Command::SAVE_PROJECT;
     }
-    if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   }
 }}
               tooltip {save the project to the .fl file before running the command} xywh {110 458 110 20} down_box DOWN_BOX labelsize 12
@@ -1437,7 +1437,7 @@ if (v == LOAD) {
     } else {
       cmd->flags &= ~Fd_Shell_Command::SAVE_SOURCECODE;
     }
-    if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   }
 }}
               tooltip {generate the source code and header file before running the command} xywh {110 478 110 19} down_box DOWN_BOX labelsize 12
@@ -1460,7 +1460,7 @@ if (v == LOAD) {
     } else {
       cmd->flags &= ~Fd_Shell_Command::SAVE_STRINGS;
     }
-    if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   }
 }}
               tooltip {save the internationalisation strings before running the command} xywh {110 498 110 20} down_box DOWN_BOX labelsize 12
@@ -1483,7 +1483,7 @@ if (v == LOAD) {
     } else {
       cmd->flags &= ~Fd_Shell_Command::DONT_SHOW_TERMINAL;
     }
-    if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   }
 }}
               tooltip {show the terminal window when launching this script} xywh {229 458 106 20} down_box DOWN_BOX labelsize 12
@@ -1506,7 +1506,7 @@ if (v == LOAD) {
     } else {
       cmd->flags &= ~Fd_Shell_Command::CLEAR_TERMINAL;
     }
-    if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   }
 }}
               tooltip {clear the teminal window before running this script} xywh {229 478 106 19} down_box DOWN_BOX labelsize 12
@@ -1529,7 +1529,7 @@ if (v == LOAD) {
     } else {
       cmd->flags &= ~Fd_Shell_Command::CLEAR_HISTORY;
     }
-    if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
+    if (cmd->storage == FLD_TOOL_STORE_PROJECT) Fluid.proj.set_modflag(1);
   }
 }}
               tooltip {clear the teminal history in the terminal window} xywh {229 498 106 19} down_box DOWN_BOX labelsize 12
@@ -1880,8 +1880,8 @@ widget_browser->save_prefs();}
       Fl_Button {} {
         label Close
         callback {if (g_shell_config)
-  g_shell_config->write(Fluid.preferences, fld::Tool_Store::USER);
-Fluid.layout_list.write(Fluid.preferences, fld::Tool_Store::USER);
+  g_shell_config->write(Fluid.preferences, FLD_TOOL_STORE_USER);
+Fluid.layout_list.write(Fluid.preferences, FLD_TOOL_STORE_USER);
 settings_window->hide();}
         tooltip {Close this dialog.} xywh {230 550 120 25}
       }
diff --git a/fluid/panels/widget_panel.cxx b/fluid/panels/widget_panel.cxx
index a6f4129ae..195ddc533 100644
--- a/fluid/panels/widget_panel.cxx
+++ b/fluid/panels/widget_panel.cxx
@@ -127,7 +127,7 @@ fld::widget::Formula_Input *image_panel_imagew=(fld::widget::Formula_Input *)0;
 static void cb_image_panel_imagew(fld::widget::Formula_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~--~=---~-~=-=~~~-~~- ▼ fl//
   if (v == LOAD) {
-      if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+      if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
         o->value(current_widget->scale_image_w_);
       }
     } else {
@@ -159,7 +159,7 @@ fld::widget::Formula_Input *image_panel_imageh=(fld::widget::Formula_Input *)0;
 static void cb_image_panel_imageh(fld::widget::Formula_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~-~=-~~-=-=~~~--~----= ▼ fl//
   if (v == LOAD) {
-      if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+      if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
         o->value(current_widget->scale_image_h_);
       }
     } else {
@@ -200,7 +200,7 @@ static void cb_Reset(Fl_Button*, void* v) {
 static void cb_convert(Fl_Check_Button* o, void* v) {
 //fl ▼ ---------------------- callback --~~=-=-~-~--=---~-=~= ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+    if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->activate();
       o->value(!current_widget->compress_image_);
     } else {
@@ -220,7 +220,7 @@ static void cb_convert(Fl_Check_Button* o, void* v) {
 static void cb_bind(Fl_Check_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~~~~~-=~=~---~--~~~~~= ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+    if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->activate();
       o->value(current_widget->bind_image_);
     } else {
@@ -267,7 +267,7 @@ fld::widget::Formula_Input *image_panel_deimagew=(fld::widget::Formula_Input *)0
 static void cb_image_panel_deimagew(fld::widget::Formula_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~--=~=~=~=~-=~--=~~=- ▼ fl//
   if (v == LOAD) {
-      if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+      if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
         o->value(current_widget->scale_deimage_w_);
       }
     } else {
@@ -299,7 +299,7 @@ fld::widget::Formula_Input *image_panel_deimageh=(fld::widget::Formula_Input *)0
 static void cb_image_panel_deimageh(fld::widget::Formula_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~=-=---~-~~-=-=~-~--- ▼ fl//
   if (v == LOAD) {
-      if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+      if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
         o->value(current_widget->scale_deimage_h_);
       }
     } else {
@@ -340,7 +340,7 @@ static void cb_Reset1(Fl_Button*, void* v) {
 static void cb_convert1(Fl_Check_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~~-==--~~-~~=~-==~-~-- ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+    if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->activate();
       o->value(!current_widget->compress_deimage_);
     } else {
@@ -360,7 +360,7 @@ static void cb_convert1(Fl_Check_Button* o, void* v) {
 static void cb_bind1(Fl_Check_Button* o, void* v) {
 //fl ▼ ---------------------- callback ---=--~-=--~-~~~-=-=~= ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+    if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->activate();
       o->value(current_widget->bind_deimage_);
     } else {
@@ -580,14 +580,14 @@ void run_image_panel() {
 void flex_margin_cb(Fl_Value_Input* i, void* v, void (*load_margin)(Fl_Flex*,Fl_Value_Input*), int (*update_margin)(Fl_Flex*,int)) {
 //fl ▼ ------------------------ code ------=--~--~=-~-~~~~~-= ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Flex)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Flex)) {
       load_margin((Fl_Flex*)current_widget->o, i);
     }
   } else {
     int mod = 0;
     int new_value = (int)i->value();
     for (Node *o = Fluid.proj.tree.first; o; o = o->next) {
-      if (o->selected && o->is_a(Type::Flex)) {
+      if (o->selected && o->is_a(FLD_NODE_TYPE_Flex)) {
         Flex_Node* q = (Flex_Node*)o;
         Fl_Flex* w = (Fl_Flex*)q->o;
         if (update_margin(w, new_value)) {
@@ -627,7 +627,7 @@ Fl_Input *widget_image_input=(Fl_Input *)0;
 static void cb_widget_image_input(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback --~-------=~=~~==~-=~~ ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+    if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->activate();
       o->value(((Widget_Node*)current_widget)->image_name().c_str());
     } else o->deactivate();
@@ -645,7 +645,7 @@ static void cb_widget_image_input(Fl_Input* o, void* v) {
 static void cb_Browse(Fl_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~~-~-=~~=~~-=--~=--~-~ ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_widget() && !current_widget->is_a(Type::Window))
+    if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window))
       o->activate();
     else
       o->deactivate();
@@ -677,7 +677,7 @@ Fl_Input *widget_deimage_input=(Fl_Input *)0;
 static void cb_widget_deimage_input(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~=-~=-=-------~-~~-=~ ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+    if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->activate();
       o->value(((Widget_Node*)current_widget)->inactive_name().c_str());
     } else o->deactivate();
@@ -695,7 +695,7 @@ static void cb_widget_deimage_input(Fl_Input* o, void* v) {
 static void cb_Browse1(Fl_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~~-=~=~~-~=~~-=~~---~~ ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_widget() && !current_widget->is_a(Type::Window))
+    if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window))
       o->activate();
     else
       o->deactivate();
@@ -881,7 +881,7 @@ static void cb_widget_h_input(fld::widget::Formula_Input* o, void* v) {
 static void cb_Children(Fl_Choice* o, void* v) {
 //fl ▼ ---------------------- callback ---=-=-~=-~=~=~-~=~-~- ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Widget_Class)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Widget_Class)) {
       o->show();
       o->value(((Widget_Class_Node *)current_widget)->wc_relative);
     } else {
@@ -891,7 +891,7 @@ static void cb_Children(Fl_Choice* o, void* v) {
     int mod = 0;
     Fluid.proj.undo.checkpoint();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Widget_Class)) {
+      if (q->is_a(FLD_NODE_TYPE_Widget_Class)) {
         Widget_Class_Node *t = (Widget_Class_Node *)q;
         t->wc_relative = o->value();
         mod = 1;
@@ -1004,9 +1004,9 @@ Fl_Group *wp_gui_values=(Fl_Group *)0;
 static void cb_wp_gui_values(Fl_Group* o, void* v) {
 //fl ▼ ---------------------- callback ~~~~=~-=-==~--~=~==-~- ▼ fl//
   if (v == LOAD) {
-    if (   current_widget->is_a(Type::Flex)
-        || current_widget->is_a(Type::Grid)
-        || current_widget->is_a(Type::Window))
+    if (   current_widget->is_a(FLD_NODE_TYPE_Flex)
+        || current_widget->is_a(FLD_NODE_TYPE_Grid)
+        || current_widget->is_a(FLD_NODE_TYPE_Window))
     {
       o->hide();
     } else {
@@ -1020,7 +1020,7 @@ static void cb_wp_gui_values(Fl_Group* o, void* v) {
 static void cb_Size(Fl_Value_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~~-~~-=~=~-~~---==--~ ▼ fl//
   if (v == LOAD) {
-    if (!current_widget->is_a(Type::Slider)) {o->deactivate(); return;}
+    if (!current_widget->is_a(FLD_NODE_TYPE_Slider)) {o->deactivate(); return;}
     o->activate();
     o->value(((Fl_Slider*)(current_widget->o))->slider_size());
   } else {
@@ -1028,7 +1028,7 @@ static void cb_Size(Fl_Value_Input* o, void* v) {
     Fluid.proj.undo.checkpoint();
     double n = o->value();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Slider)) {
+      if (q->is_a(FLD_NODE_TYPE_Slider)) {
         ((Fl_Slider*)(q->o))->slider_size(n);
         q->o->redraw();
         mod = 1;
@@ -1042,10 +1042,10 @@ static void cb_Size(Fl_Value_Input* o, void* v) {
 static void cb_Minimum(Fl_Value_Input* o, void* v) {
 //fl ▼ ---------------------- callback -~-=~~-=-=-=~=~==-~~~- ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Valuator_)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Valuator_)) {
       o->activate();
       o->value(((Fl_Valuator*)(current_widget->o))->minimum());
-    } else if (current_widget->is_a(Type::Spinner)) {
+    } else if (current_widget->is_a(FLD_NODE_TYPE_Spinner)) {
       o->activate();
       o->value(((Fl_Spinner*)(current_widget->o))->minimum());
     } else {
@@ -1057,11 +1057,11 @@ static void cb_Minimum(Fl_Value_Input* o, void* v) {
     Fluid.proj.undo.checkpoint();
     double n = o->value();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Valuator_)) {
+      if (q->is_a(FLD_NODE_TYPE_Valuator_)) {
         ((Fl_Valuator*)(q->o))->minimum(n);
         q->o->redraw();
         mod = 1;
-      } else if (q->is_a(Type::Spinner)) {
+      } else if (q->is_a(FLD_NODE_TYPE_Spinner)) {
         ((Fl_Spinner*)(q->o))->minimum(n);
         q->o->redraw();
         mod = 1;
@@ -1075,10 +1075,10 @@ static void cb_Minimum(Fl_Value_Input* o, void* v) {
 static void cb_Maximum(Fl_Value_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~-~-=~=-=-~-=-~-~=---= ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Valuator_)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Valuator_)) {
       o->activate();
       o->value(((Fl_Valuator*)(current_widget->o))->maximum());
-    } else if (current_widget->is_a(Type::Spinner)) {
+    } else if (current_widget->is_a(FLD_NODE_TYPE_Spinner)) {
       o->activate();
       o->value(((Fl_Spinner*)(current_widget->o))->maximum());
     } else {
@@ -1090,11 +1090,11 @@ static void cb_Maximum(Fl_Value_Input* o, void* v) {
     Fluid.proj.undo.checkpoint();
     double n = o->value();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Valuator_)) {
+      if (q->is_a(FLD_NODE_TYPE_Valuator_)) {
         ((Fl_Valuator*)(q->o))->maximum(n);
         q->o->redraw();
         mod = 1;
-      } else if (q->is_a(Type::Spinner)) {
+      } else if (q->is_a(FLD_NODE_TYPE_Spinner)) {
         ((Fl_Spinner*)(q->o))->maximum(n);
         q->o->redraw();
         mod = 1;
@@ -1108,10 +1108,10 @@ static void cb_Maximum(Fl_Value_Input* o, void* v) {
 static void cb_Step(Fl_Value_Input* o, void* v) {
 //fl ▼ ---------------------- callback --~-=~-~=~~~~~-~=--~~= ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Valuator_)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Valuator_)) {
       o->activate();
       o->value(((Fl_Valuator*)(current_widget->o))->step());
-    } else if (current_widget->is_a(Type::Spinner)) {
+    } else if (current_widget->is_a(FLD_NODE_TYPE_Spinner)) {
       o->activate();
       o->value(((Fl_Spinner*)(current_widget->o))->step());
     } else {
@@ -1123,11 +1123,11 @@ static void cb_Step(Fl_Value_Input* o, void* v) {
     Fluid.proj.undo.checkpoint();
     double n = o->value();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Valuator_)) {
+      if (q->is_a(FLD_NODE_TYPE_Valuator_)) {
         ((Fl_Valuator*)(q->o))->step(n);
         q->o->redraw();
         mod = 1;
-      } else if (q->is_a(Type::Spinner)) {
+      } else if (q->is_a(FLD_NODE_TYPE_Spinner)) {
         ((Fl_Spinner*)(q->o))->step(n);
         q->o->redraw();
         mod = 1;
@@ -1141,13 +1141,13 @@ static void cb_Step(Fl_Value_Input* o, void* v) {
 static void cb_Value(Fl_Value_Input* o, void* v) {
 //fl ▼ ---------------------- callback --=-=-~--~-~-~-~~=-~~~ ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Valuator_)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Valuator_)) {
       o->activate();
       o->value(((Fl_Valuator*)(current_widget->o))->value());
     } else if (current_widget->is_button()) {
       o->activate();
       o->value(((Fl_Button*)(current_widget->o))->value());
-    } else if (current_widget->is_a(Type::Spinner)) {
+    } else if (current_widget->is_a(FLD_NODE_TYPE_Spinner)) {
       o->activate();
       o->value(((Fl_Spinner*)(current_widget->o))->value());
     } else
@@ -1157,14 +1157,14 @@ static void cb_Value(Fl_Value_Input* o, void* v) {
     Fluid.proj.undo.checkpoint();
     double n = o->value();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Valuator_)) {
+      if (q->is_a(FLD_NODE_TYPE_Valuator_)) {
         ((Fl_Valuator*)(q->o))->value(n);
         mod = 1;
       } else if (q->is_button()) {
         ((Fl_Button*)(q->o))->value(n != 0);
-        if (q->is_a(Type::Menu_Item)) q->redraw();
+        if (q->is_a(FLD_NODE_TYPE_Menu_Item)) q->redraw();
         mod = 1;
-      } else if (q->is_a(Type::Spinner)) {
+      } else if (q->is_a(FLD_NODE_TYPE_Spinner)) {
         ((Fl_Spinner*)(q->o))->value(n);
         mod = 1;
       }
@@ -1179,7 +1179,7 @@ Fl_Group *wp_gui_margins=(Fl_Group *)0;
 static void cb_wp_gui_margins(Fl_Group* o, void* v) {
 //fl ▼ ---------------------- callback ---~~==--~-~=~~--==~~- ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Flex)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Flex)) {
       o->show();
       propagate_load(o, v);
     } else {
@@ -1312,7 +1312,7 @@ Fl_Group *wp_gui_sizerange=(Fl_Group *)0;
 static void cb_wp_gui_sizerange(Fl_Group* o, void* v) {
 //fl ▼ ---------------------- callback ~~-==-=~--=-=~-~-~-=-~ ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Window)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->show();
       propagate_load(o, v);
     } else {
@@ -1325,14 +1325,14 @@ static void cb_wp_gui_sizerange(Fl_Group* o, void* v) {
 static void cb_Minimum1(Fl_Value_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~-=~=-~-~==~~-~~~-~--= ▼ fl//
   if (v == LOAD) {
-    if (!current_widget->is_a(Type::Window)) return;
+    if (!current_widget->is_a(FLD_NODE_TYPE_Window)) return;
     o->value(((Window_Node*)current_widget)->sr_min_w);
   } else {
     int mod = 0;
     Fluid.proj.undo.checkpoint();
     int n = (int)o->value();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Window)) {
+      if (q->is_a(FLD_NODE_TYPE_Window)) {
         ((Window_Node*)q)->sr_min_w = n;
         mod = 1;
       }
@@ -1345,14 +1345,14 @@ static void cb_Minimum1(Fl_Value_Input* o, void* v) {
 static void cb_1(Fl_Value_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~-~-=~~=~-=-~==-=~-=-= ▼ fl//
   if (v == LOAD) {
-    if (!current_widget->is_a(Type::Window)) return;
+    if (!current_widget->is_a(FLD_NODE_TYPE_Window)) return;
     o->value(((Window_Node*)current_widget)->sr_min_h);
   } else {
     int mod = 0;
     Fluid.proj.undo.checkpoint();
     int n = (int)o->value();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Window)) {
+      if (q->is_a(FLD_NODE_TYPE_Window)) {
         ((Window_Node*)q)->sr_min_h = n;
         mod = 1;
       }
@@ -1369,7 +1369,7 @@ static void cb_set(Fl_Button* o, void* v) {
     int mod = 0;
     Fluid.proj.undo.checkpoint();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Window)) {
+      if (q->is_a(FLD_NODE_TYPE_Window)) {
         Window_Node *win = (Window_Node*)q;
         win->sr_min_w = win->o->w();
         win->sr_min_h = win->o->h();
@@ -1385,14 +1385,14 @@ static void cb_set(Fl_Button* o, void* v) {
 static void cb_Maximum1(Fl_Value_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~~~-=~=-~--=~=~-~=~=~ ▼ fl//
   if (v == LOAD) {
-    if (!current_widget->is_a(Type::Window)) return;
+    if (!current_widget->is_a(FLD_NODE_TYPE_Window)) return;
     o->value(((Window_Node*)current_widget)->sr_max_w);
   } else {
     int mod = 0;
     Fluid.proj.undo.checkpoint();
     int n = (int)o->value();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Window)) {
+      if (q->is_a(FLD_NODE_TYPE_Window)) {
         ((Window_Node*)q)->sr_max_w = n;
         mod = 1;
       }
@@ -1405,14 +1405,14 @@ static void cb_Maximum1(Fl_Value_Input* o, void* v) {
 static void cb_2(Fl_Value_Input* o, void* v) {
 //fl ▼ ---------------------- callback -~~~~=~==-~~~=-~=-~~~~ ▼ fl//
   if (v == LOAD) {
-    if (!current_widget->is_a(Type::Window)) return;
+    if (!current_widget->is_a(FLD_NODE_TYPE_Window)) return;
     o->value(((Window_Node*)current_widget)->sr_max_h);
   } else {
     int mod = 0;
     Fluid.proj.undo.checkpoint();
     int n = (int)o->value();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Window)) {
+      if (q->is_a(FLD_NODE_TYPE_Window)) {
         ((Window_Node*)q)->sr_max_h = n;
         mod = 1;
       }
@@ -1429,7 +1429,7 @@ static void cb_set1(Fl_Button* o, void* v) {
     int mod = 0;
     Fluid.proj.undo.checkpoint();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Window)) {
+      if (q->is_a(FLD_NODE_TYPE_Window)) {
         Window_Node *win = (Window_Node*)q;
         win->sr_max_w = win->o->w();
         win->sr_max_h = win->o->h();
@@ -1449,11 +1449,11 @@ static void cb_wp_gui_shortcut(Fl_Shortcut_Button* o, void* v) {
   if (v == LOAD) {
     if (current_widget->is_button())
       o->value( ((Fl_Button*)(current_widget->o))->shortcut() );
-    else if (current_widget->is_a(Type::Input))
+    else if (current_widget->is_a(FLD_NODE_TYPE_Input))
       o->value( ((Fl_Input_*)(current_widget->o))->shortcut() );
-    else if (current_widget->is_a(Type::Value_Input))
+    else if (current_widget->is_a(FLD_NODE_TYPE_Value_Input))
       o->value( ((Fl_Value_Input*)(current_widget->o))->shortcut() );
-    else if (current_widget->is_a(Type::Text_Display))
+    else if (current_widget->is_a(FLD_NODE_TYPE_Text_Display))
       o->value( ((Fl_Text_Display*)(current_widget->o))->shortcut() );
     else {
       o->hide();
@@ -1471,16 +1471,16 @@ static void cb_wp_gui_shortcut(Fl_Shortcut_Button* o, void* v) {
         Fl_Button* b = (Fl_Button*)(q->o);
         if (b->shortcut() != (int)o->value()) mod = 1;
         b->shortcut(o->value());
-        if (q->is_a(Type::Menu_Item)) q->redraw();
-      } else if (q->is_a(Type::Input)) {
+        if (q->is_a(FLD_NODE_TYPE_Menu_Item)) q->redraw();
+      } else if (q->is_a(FLD_NODE_TYPE_Input)) {
         Fl_Input_* b = (Fl_Input_*)(q->o);
         if (b->shortcut() != (int)o->value()) mod = 1;
         b->shortcut(o->value());
-      } else if (q->is_a(Type::Value_Input)) {
+      } else if (q->is_a(FLD_NODE_TYPE_Value_Input)) {
         Fl_Value_Input* b = (Fl_Value_Input*)(q->o);
         if (b->shortcut() != (int)o->value()) mod = 1;
         b->shortcut(o->value());
-      } else if (q->is_a(Type::Text_Display)) {
+      } else if (q->is_a(FLD_NODE_TYPE_Text_Display)) {
         Fl_Text_Display* b = (Fl_Text_Display*)(q->o);
         if (b->shortcut() != (int)o->value()) mod = 1;
         b->shortcut(o->value());
@@ -1495,7 +1495,7 @@ Fl_Group *wp_gui_xclass=(Fl_Group *)0;
 static void cb_3(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~-~=~-~~=~~~-~~-~~~~-= ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Window)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->show();
       o->parent()->show();
       o->value(((Window_Node *)current_widget)->xclass);
@@ -1507,7 +1507,7 @@ static void cb_3(Fl_Input* o, void* v) {
     int mod = 0;
     Fluid.proj.undo.checkpoint();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Window)) {
+      if (q->is_a(FLD_NODE_TYPE_Window)) {
         mod = 1;
         Window_Node *wt = (Window_Node *)q;
         storestring(o->value(), wt->xclass);
@@ -1522,7 +1522,7 @@ static void cb_3(Fl_Input* o, void* v) {
 static void cb_Border(Fl_Light_Button* o, void* v) {
 //fl ▼ ---------------------- callback -~-=~-=~~-~~-=-~--~~-= ▼ fl//
   if (v == LOAD) {
-    if (!current_widget->is_a(Type::Window)) {o->hide(); return;}
+    if (!current_widget->is_a(FLD_NODE_TYPE_Window)) {o->hide(); return;}
     o->show();
     o->value(((Fl_Window*)(current_widget->o))->border());
   } else {
@@ -1536,7 +1536,7 @@ static void cb_Border(Fl_Light_Button* o, void* v) {
 static void cb_Modal(Fl_Light_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~---~~~=~==~-=-=~=-=-- ▼ fl//
   if (v == LOAD) {
-    if (!current_widget->is_a(Type::Window)) {o->hide(); return;}
+    if (!current_widget->is_a(FLD_NODE_TYPE_Window)) {o->hide(); return;}
     o->show();
     o->value(((Window_Node *)current_widget)->modal);
   } else {
@@ -1550,7 +1550,7 @@ static void cb_Modal(Fl_Light_Button* o, void* v) {
 static void cb_Nonmodal(Fl_Light_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~~~~-~~=~=~=---~-=~~~- ▼ fl//
   if (v == LOAD) {
-    if (!current_widget->is_a(Type::Window)) {o->hide(); return;}
+    if (!current_widget->is_a(FLD_NODE_TYPE_Window)) {o->hide(); return;}
     o->show();
     o->value(((Window_Node *)current_widget)->non_modal);
   } else {
@@ -1567,7 +1567,7 @@ static void cb_Visible(Fl_Light_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~-~~=-~-~==--~=-~~=-=- ▼ fl//
   if (v == LOAD) {
     o->value(current_widget->o->visible());
-    if (current_widget->is_a(Type::Window)) o->deactivate();
+    if (current_widget->is_a(FLD_NODE_TYPE_Window)) o->deactivate();
     else o->activate();
   } else {
     int mod = 0;
@@ -1580,9 +1580,9 @@ static void cb_Visible(Fl_Light_Button* o, void* v) {
       n ? q->o->show() : q->o->hide();
       q->redraw();
       if (n && q->parent && q->parent->type_name()) {
-        if (q->parent->is_a(Type::Tabs)) {
+        if (q->parent->is_a(FLD_NODE_TYPE_Tabs)) {
           ((Fl_Tabs *)q->o->parent())->value(q->o);
-        } else if (q->parent->is_a(Type::Wizard)) {
+        } else if (q->parent->is_a(FLD_NODE_TYPE_Wizard)) {
           ((Fl_Wizard *)q->o->parent())->value(q->o);
         }
       }
@@ -1599,7 +1599,7 @@ static void cb_Active(Fl_Light_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~~-~--~--=~=~~--~-=~~~ ▼ fl//
   if (v == LOAD) {
     o->value(current_widget->o->active());
-    if (current_widget->is_a(Type::Window)) o->deactivate();
+    if (current_widget->is_a(FLD_NODE_TYPE_Window)) o->deactivate();
     else o->activate();
   } else {
     int mod = 0;
@@ -1620,7 +1620,7 @@ static void cb_Active(Fl_Light_Button* o, void* v) {
 static void cb_Resizable(Fl_Light_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~~=-=~-==~=~~----=-=~= ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Menu_Item)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
       o->hide();
       return;
     }
@@ -1642,7 +1642,7 @@ static void cb_Resizable(Fl_Light_Button* o, void* v) {
 static void cb_Headline(Fl_Light_Button* o, void* v) {
 //fl ▼ ---------------------- callback -~--~=~-=~-=~--=~~---- ▼ fl//
   if (v == LOAD) {
-    if (!current_widget->is_a(Type::Menu_Item)) {
+    if (!current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
       o->hide();
       return;
     }
@@ -1652,7 +1652,7 @@ static void cb_Headline(Fl_Light_Button* o, void* v) {
     int mod = 0;
     int n = o->value();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Menu_Item)) {
+      if (q->is_a(FLD_NODE_TYPE_Menu_Item)) {
         if (!mod) {
           mod = 1;
           Fluid.proj.undo.checkpoint();
@@ -1670,21 +1670,21 @@ static void cb_Hotspot(Fl_Light_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~~=-~-=~=-=~-~-=~=~~-= ▼ fl//
   if (v == LOAD) {
     if (numselected > 1) {o->deactivate(); return;}
-    if (current_widget->is_a(Type::Menu_Item)) o->label("divider");
+    if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) o->label("divider");
     else o->label("hotspot");
     o->activate();
     o->value(current_widget->hotspot());
   } else {
     Fluid.proj.undo.checkpoint();
     current_widget->hotspot(o->value());
-    if (current_widget->is_a(Type::Menu_Item)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
       current_widget->redraw();
       return;
     }
     if (o->value()) {
       Node *p = current_widget->parent;
       if (!p || !p->is_widget()) return;
-      while (!p->is_a(Type::Window)) p = p->parent;
+      while (!p->is_a(FLD_NODE_TYPE_Window)) p = p->parent;
       for (Node *q = p->next; q && q->level > p->level; q = q->next) {
         if (q->is_widget() && q != current_widget)
           ((Widget_Node*)q)->hotspot(0);
@@ -1799,7 +1799,7 @@ Fl_Group *wp_style_box=(Fl_Group *)0;
 static void cb_7(Fl_Choice* o, void* v) {
 //fl ▼ ---------------------- callback ~-~--~-~~=--~~=-=---=- ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Menu_Item)) {o->deactivate(); return;} else o->activate();
+    if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {o->deactivate(); return;} else o->activate();
     int n = current_widget->o->box();
     if (!n) n = ZERO_ENTRY;
     for (int j = 0; j < 72 /*int(sizeof(boxmenu)/sizeof(*boxmenu))*/; j++)
@@ -1826,7 +1826,7 @@ static void cb_w_color(Fl_Button* o, void* v) {
 //fl ▼ ---------------------- callback --=---~=~--~~-=~--~~~- ▼ fl//
   Fl_Color c = current_widget->o->color();
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Menu_Item)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
       o->deactivate();
     } else {
       o->activate();
@@ -1847,7 +1847,7 @@ static void cb_8(Fl_Menu_Button* o, void* v) {
 //fl ▼ ---------------------- callback ---~-~~==--==--=~-=--= ▼ fl//
   Fl_Color c = current_widget->o->color();
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Menu_Item)) {o->deactivate(); return;} else o->activate();
+    if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {o->deactivate(); return;} else o->activate();
   } else {
     Fl_Color d = (Fl_Color)(o->mvalue()->argument());
     if (d == c) return;
@@ -1866,11 +1866,11 @@ static void cb_9(Fl_Choice* o, void* v) {
 //fl ▼ ---------------------- callback -~-=----~-~-~==-=--=~= ▼ fl//
   if (v == LOAD) {
     int n;
-    if (current_widget->is_a(Type::Button))
+    if (current_widget->is_a(FLD_NODE_TYPE_Button))
       n = ((Fl_Button*)(current_widget->o))->down_box();
-    else if (current_widget->is_a(Type::Input_Choice))
+    else if (current_widget->is_a(FLD_NODE_TYPE_Input_Choice))
       n = ((Fl_Input_Choice*)(current_widget->o))->down_box();
-    else if (current_widget->is_a(Type::Menu_Manager_))
+    else if (current_widget->is_a(FLD_NODE_TYPE_Menu_Manager_))
       n = ((Fl_Menu_*)(current_widget->o))->down_box();
     else {
       o->deactivate(); return;
@@ -1886,12 +1886,12 @@ static void cb_9(Fl_Choice* o, void* v) {
     if (!n) return; // should not happen
     if (n == ZERO_ENTRY) n = 0;
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Button)) {
+      if (q->is_a(FLD_NODE_TYPE_Button)) {
         ((Fl_Button*)(q->o))->down_box((Fl_Boxtype)n);
         if (((Fl_Button*)(q->o))->value()) q->redraw();
-      } else if (q->is_a(Type::Input_Choice)) {
+      } else if (q->is_a(FLD_NODE_TYPE_Input_Choice)) {
         ((Fl_Input_Choice*)(q->o))->down_box((Fl_Boxtype)n);
-      } else if (q->is_a(Type::Menu_Manager_)) {
+      } else if (q->is_a(FLD_NODE_TYPE_Menu_Manager_)) {
         ((Fl_Menu_*)(q->o))->down_box((Fl_Boxtype)n);
       }
       mod = 1;
@@ -1907,7 +1907,7 @@ static void cb_w_selectcolor(Fl_Button* o, void* v) {
 //fl ▼ ---------------------- callback --~~~-=~~-=--~~~~-=~~~ ▼ fl//
   Fl_Color c = current_widget->o->selection_color();
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Menu_Item)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
       o->deactivate();
       return;
     } else {
@@ -1929,7 +1929,7 @@ static void cb_a(Fl_Menu_Button* o, void* v) {
 //fl ▼ ---------------------- callback -~~=~~-~-~-~~~~=--~~=~ ▼ fl//
   Fl_Color c = current_widget->o->selection_color();
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Menu_Item)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
       o->deactivate();
       return;
     } else {
@@ -2133,7 +2133,7 @@ static void cb_Compact(Fl_Light_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~-~-=~-~-==~=-~~=--=-= ▼ fl//
   if (v == LOAD) {
     uchar n;
-    if (current_widget->is_a(Type::Button) && !current_widget->is_a(Type::Menu_Item)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Button) && !current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
       n = ((Fl_Button*)(current_widget->o))->compact();
       o->value(n);
       o->show();
@@ -2144,7 +2144,7 @@ static void cb_Compact(Fl_Light_Button* o, void* v) {
     int mod = 0;
     uchar n = (uchar)o->value();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-      if (q->is_a(Type::Button) && !q->is_a(Type::Menu_Item)) {
+      if (q->is_a(FLD_NODE_TYPE_Button) && !q->is_a(FLD_NODE_TYPE_Menu_Item)) {
         uchar v = ((Fl_Button*)(q->o))->compact();
         if (n != v) {
           if (!mod) {
@@ -2168,7 +2168,7 @@ Fl_Group *wp_cpp_class=(Fl_Group *)0;
 static void cb_e(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~-~=~--~--~-~-~=-~~-~~ ▼ fl//
   if (v == LOAD) {
-      if (current_widget->is_a(Type::Menu_Item)) {
+      if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
         o->deactivate();
       } else {
         o->activate();
@@ -2203,7 +2203,7 @@ static void cb_f(Fl_Choice* o, void* v) {
         int j;
         for (j = 0;; j++) {
           if (!m[j].text) {j = 0; break;}
-          if (current_widget->is_a(Type::Spinner)) {
+          if (current_widget->is_a(FLD_NODE_TYPE_Spinner)) {
             if (m[j].argument() == ((Fl_Spinner*)current_widget->o)->type()) break;
           } else {
             if (m[j].argument() == current_widget->o->type()) break;
@@ -2219,9 +2219,9 @@ static void cb_f(Fl_Choice* o, void* v) {
       Fl_Menu_Item* m = current_widget->subtypes();
       for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
         if (q->subtypes()==m) {
-          if (q->is_a(Type::Spinner))
+          if (q->is_a(FLD_NODE_TYPE_Spinner))
             ((Fl_Spinner*)q->o)->type(n);
-          else if (q->is_a(Type::Flex))
+          else if (q->is_a(FLD_NODE_TYPE_Flex))
             ((Flex_Node*)q)->change_subtype_to(n);
           else
             q->o->type(n);
@@ -2414,7 +2414,7 @@ static void cb_13(Fl_Input* o, void* v) {
 static void cb_When(Fl_Menu_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~~=--==-~-=~=~~==-~-~- ▼ fl//
   if (v == LOAD) {
-    if (current_widget->is_a(Type::Menu_Item)) {o->deactivate(); return;} else o->activate();
+    if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {o->deactivate(); return;} else o->activate();
     int n = current_widget->o->when();
     set_whenmenu(n);
     w_when_box->copy_label(when_symbol_name(n));
@@ -2496,7 +2496,7 @@ Fl_Tabs *data_tabs=(Fl_Tabs *)0;
 
 static void cb_data_tabs(Fl_Tabs* o, void* v) {
 //fl ▼ ---------------------- callback -~-==~-~-~-~-=-~~-~==- ▼ fl//
-  if (current_node && current_node->is_a(Type::Data))
+  if (current_node && current_node->is_a(FLD_NODE_TYPE_Data))
     propagate_load((Fl_Group *)o,v);
 //fl ▲ ----------~=~~=-~~-==-----------~-=~=~~=--~--==~=-=~=- ▲ fl//
 }
@@ -2505,7 +2505,7 @@ Fl_Group *data_tabs_data=(Fl_Group *)0;
 
 static void cb_15(Fl_Choice* o, void* v) {
 //fl ▼ ---------------------- callback --~~-==-=~-==-~-~-~~-= ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Data)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Data)) return;
   Data_Node* nd = (Data_Node*)current_node;
 
   if (v == LOAD) {
@@ -2537,7 +2537,7 @@ Fl_Menu_Item menu_5[] = {
 
 static void cb_16(Fl_Choice* o, void* v) {
 //fl ▼ ---------------------- callback ~-=~-=--~~-=--=~~~=-=- ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Data)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Data)) return;
   Data_Node* nd = (Data_Node*)current_node;
 
   if (v == LOAD) {
@@ -2568,7 +2568,7 @@ Fl_Menu_Item menu_6[] = {
 
 static void cb_17(Fl_Choice* o, void* v) {
 //fl ▼ ---------------------- callback -~=---~-=~=---=~~~=--= ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Data)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Data)) return;
   Data_Node* nd = (Data_Node*)current_node;
 
   if (v == LOAD) {
@@ -2594,7 +2594,7 @@ Fl_Menu_Item menu_7[] = {
 
 static void cb_Name(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~-~~~-~=~~~=~-~~=-~-= ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Data)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Data)) return;
   Data_Node* nd = (Data_Node*)current_node;
 
   if (v == LOAD) {
@@ -2617,7 +2617,7 @@ Fl_Input *wp_data_filename=(Fl_Input *)0;
 
 static void cb_wp_data_filename(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~-~=~~~~~~-=~~=~-==--- ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Data)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Data)) return;
   Data_Node* nd = (Data_Node*)current_node;
   update_current(o, v,
     [nd](){return nd->filename();},
@@ -2646,7 +2646,7 @@ static void cb_fileopen(Fl_Button*, void* v) {
 
 static void cb_Comment(Fl_Text_Editor* o, void* v) {
 //fl ▼ ---------------------- callback ~--=---~~~-=-~=-=-~-=~ ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Data)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Data)) return;
   Data_Node* nd = (Data_Node*)current_node;
 
   if (v == LOAD) {
@@ -2671,7 +2671,7 @@ Fl_Tabs *comment_tabs=(Fl_Tabs *)0;
 
 static void cb_comment_tabs(Fl_Tabs* o, void* v) {
 //fl ▼ ---------------------- callback ---~~~~==~~=~~~~--~~~~ ▼ fl//
-  if (current_node && current_node->is_a(Type::Comment))
+  if (current_node && current_node->is_a(FLD_NODE_TYPE_Comment))
     propagate_load((Fl_Group *)o,v);
 //fl ▲ ----------=~--~=---~~=----------~--~=-~=---=~-~=~~=-~~ ▲ fl//
 }
@@ -2682,7 +2682,7 @@ Fl_Text_Editor *comment_tabs_name=(Fl_Text_Editor *)0;
 
 static void cb_comment_tabs_name(Fl_Text_Editor* o, void* v) {
 //fl ▼ ---------------------- callback --~~-~-~~=--~---~~~~=- ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Comment)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Comment)) return;
   Comment_Node* nd = (Comment_Node*)current_node;
 
   if (v == LOAD) {
@@ -2708,7 +2708,7 @@ Fl_Menu_Button *comment_predefined_2=(Fl_Menu_Button *)0;
 
 static void cb_comment_predefined_2(Fl_Menu_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~-~-=~=~=-=--=~==-~--- ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Comment)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Comment)) return;
 
   static char itempath[256];
   static int last_selected_item { 0 };
@@ -2807,7 +2807,7 @@ static void cb_comment_load_2(Fl_Button*, void* v) {
 
 static void cb_output(Fl_Check_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~-=~=-~~~~=-------~~=- ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Comment)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Comment)) return;
   Comment_Node* nd = (Comment_Node*)current_node;
 
   if (v == LOAD) {
@@ -2823,7 +2823,7 @@ static void cb_output(Fl_Check_Button* o, void* v) {
 
 static void cb_output1(Fl_Check_Button* o, void* v) {
 //fl ▼ ---------------------- callback ---=~-~-=~=--~~~~-=~-= ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Comment)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Comment)) return;
   Comment_Node* nd = (Comment_Node*)current_node;
 
   if (v == LOAD) {
@@ -2841,7 +2841,7 @@ Fl_Tabs *class_tabs=(Fl_Tabs *)0;
 
 static void cb_class_tabs(Fl_Tabs* o, void* v) {
 //fl ▼ ---------------------- callback -~-----=-~-=~-~=-~---- ▼ fl//
-  if (current_node && current_node->is_a(Type::Class))
+  if (current_node && current_node->is_a(FLD_NODE_TYPE_Class))
     propagate_load((Fl_Group *)o,v);
 //fl ▲ ----------=~----~=-==-----------~-~~~~=~~~-==~-=~=~~-= ▲ fl//
 }
@@ -2850,7 +2850,7 @@ Fl_Group *class_tabs_main=(Fl_Group *)0;
 
 static void cb_18(Fl_Choice* o, void* v) {
 //fl ▼ ---------------------- callback ---=~~-~=~--=----=~--= ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Class)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Class)) return;
   Class_Node* nd = (Class_Node*)current_node;
 
   if (v == LOAD) {
@@ -2881,7 +2881,7 @@ Fl_Menu_Item menu_8[] = {
 
 static void cb_Attribute(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback -~~==-~---~~~~~=~=--~~ ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Class)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Class)) return;
   Class_Node* nd = (Class_Node*)current_node;
 
   if (v == LOAD) {
@@ -2899,7 +2899,7 @@ static void cb_Attribute(Fl_Input* o, void* v) {
 
 static void cb_Class(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~~-~-~-~-~==-~-~==~~= ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Class)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Class)) return;
   Class_Node* nd = (Class_Node*)current_node;
 
   if (v == LOAD) {
@@ -2944,7 +2944,7 @@ static void cb_Class(Fl_Input* o, void* v) {
 
 static void cb_Base(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~=~=-=-~==~=~=-~==~=~ ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Class)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Class)) return;
   Class_Node* nd = (Class_Node*)current_node;
 
   if (v == LOAD) {
@@ -2961,7 +2961,7 @@ static void cb_Base(Fl_Input* o, void* v) {
 
 static void cb_Comment1(Fl_Text_Editor* o, void* v) {
 //fl ▼ ---------------------- callback -~~=~=-==----=~~-~~-=- ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Class)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Class)) return;
   Class_Node* nd = (Class_Node*)current_node;
 
   if (v == LOAD) {
@@ -2986,7 +2986,7 @@ Fl_Tabs *declblock_tabs=(Fl_Tabs *)0;
 
 static void cb_declblock_tabs(Fl_Tabs* o, void* v) {
 //fl ▼ ---------------------- callback ~~--=~~=~~~~-==-~=~~=~ ▼ fl//
-  if (current_node && current_node->is_a(Type::DeclBlock))
+  if (current_node && current_node->is_a(FLD_NODE_TYPE_DeclBlock))
     propagate_load((Fl_Group *)o,v);
 //fl ▲ ----------=~=~~=-=~--=-------------~-~=~~=-=-~=~----=~ ▲ fl//
 }
@@ -2995,7 +2995,7 @@ Fl_Group *declblock_tabs_main=(Fl_Group *)0;
 
 static void cb_Start(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~-~=~-~=----~=~==~~-~~ ▼ fl//
-  if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
   DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
 
   if (v == LOAD) {
@@ -3016,7 +3016,7 @@ static void cb_Start(Fl_Input* o, void* v) {
 
 static void cb_End(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback -~-~--~-----=-~~~~~=-~ ▼ fl//
-  if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
   DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
   update_current(o, v,
     [nd](){return nd->end_code();},
@@ -3027,7 +3027,7 @@ static void cb_End(Fl_Input* o, void* v) {
 
 static void cb_implementations(Fl_Check_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~-~=-~~=-==~=~--=-=~-= ▼ fl//
-  if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
   DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
 
   if (v == LOAD) {
@@ -3048,7 +3048,7 @@ static void cb_implementations(Fl_Check_Button* o, void* v) {
 
 static void cb_static(Fl_Check_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~-~=-~~=~~-~=~~=~==-=~ ▼ fl//
-  if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
   DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
 
   if (v == LOAD) {
@@ -3069,7 +3069,7 @@ static void cb_static(Fl_Check_Button* o, void* v) {
 
 static void cb_forward(Fl_Check_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~--=~=-==~~--=--~~~-~~ ▼ fl//
-  if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
   DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
 
   if (v == LOAD) {
@@ -3090,7 +3090,7 @@ static void cb_forward(Fl_Check_Button* o, void* v) {
 
 static void cb_preprecessor(Fl_Check_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~~~~-=~=~~~=~==~-~-=~= ▼ fl//
-  if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
   DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
 
   if (v == LOAD) {
@@ -3111,7 +3111,7 @@ static void cb_preprecessor(Fl_Check_Button* o, void* v) {
 
 static void cb_Comment2(Fl_Text_Editor* o, void* v) {
 //fl ▼ ---------------------- callback ~-=~=~-=~-~=-==~~~=-~- ▼ fl//
-  if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
   DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
 
   if (v == LOAD) {
@@ -3136,7 +3136,7 @@ Fl_Tabs *decl_tabs=(Fl_Tabs *)0;
 
 static void cb_decl_tabs(Fl_Tabs* o, void* v) {
 //fl ▼ ---------------------- callback --~--~=~~~-~--=~--=~=~ ▼ fl//
-  if (current_node && current_node->is_a(Type::Decl))
+  if (current_node && current_node->is_a(FLD_NODE_TYPE_Decl))
     propagate_load((Fl_Group *)o,v);
 //fl ▲ ----------=~~~-==-=~=~----------~~-~=~~~~==~--~--=--=~ ▲ fl//
 }
@@ -3145,7 +3145,7 @@ Fl_Group *decl_tabs_main=(Fl_Group *)0;
 
 static void cb_19(Fl_Choice* o, void* v) {
 //fl ▼ ---------------------- callback -~~==~--~~~-=-~~-==--= ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Decl)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Decl)) return;
   Decl_Node* nd = (Decl_Node*)current_node;
 
   if (v == LOAD) {
@@ -3177,7 +3177,7 @@ Fl_Menu_Item menu_9[] = {
 
 static void cb_1a(Fl_Choice* o, void* v) {
 //fl ▼ ---------------------- callback -~-~-=~~~~=~~=--~-~~~= ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Decl)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Decl)) return;
   Decl_Node* nd = (Decl_Node*)current_node;
 
   if (v == LOAD) {
@@ -3214,7 +3214,7 @@ static void cb_1b(Fl_Tile* o, void* v) {
 
 static void cb_Declaration(fld::widget::Code_Editor* o, void* v) {
 //fl ▼ ---------------------- callback ---==--~~-=-=-~=----=- ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Decl)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Decl)) return;
   Decl_Node* nd = (Decl_Node*)current_node;
 
   if (v == LOAD) {
@@ -3238,7 +3238,7 @@ static void cb_Declaration(fld::widget::Code_Editor* o, void* v) {
 
 static void cb_Comment3(Fl_Text_Editor* o, void* v) {
 //fl ▼ ---------------------- callback -~-~~=~--=~--==-=----- ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Decl)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Decl)) return;
   Decl_Node* nd = (Decl_Node*)current_node;
 
   if (v == LOAD) {
@@ -3263,7 +3263,7 @@ Fl_Tabs *codeblock_tabs=(Fl_Tabs *)0;
 
 static void cb_codeblock_tabs(Fl_Tabs* o, void* v) {
 //fl ▼ ---------------------- callback ~-~=~~~--~~=-~~-~---~~ ▼ fl//
-  if (current_node && current_node->is_a(Type::CodeBlock))
+  if (current_node && current_node->is_a(FLD_NODE_TYPE_CodeBlock))
     propagate_load((Fl_Group *)o,v);
 //fl ▲ ----------=~--~~~~~-~-----------~-=-=--~-=-=---=---~=- ▲ fl//
 }
@@ -3272,7 +3272,7 @@ Fl_Group *codeblock_tabs_main=(Fl_Group *)0;
 
 static void cb_Start1(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback -~-~=-=~~=~=~-~==-~-=- ▼ fl//
-  if (!current_node || !current_node->is_a(Type::CodeBlock)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_CodeBlock)) return;
   CodeBlock_Node* nd = (CodeBlock_Node*)current_node;
 
   if (v == LOAD) {
@@ -3293,7 +3293,7 @@ static void cb_Start1(Fl_Input* o, void* v) {
 
 static void cb_End1(Fl_Input* o, void* v) {
 //fl ▼ ---------------------- callback ~~-~~=~=-~=-~-=~~~=-=~ ▼ fl//
-  if (!current_node || !current_node->is_a(Type::CodeBlock)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_CodeBlock)) return;
   CodeBlock_Node* nd = (CodeBlock_Node*)current_node;
   update_current(o, v,
     [nd](){return nd->end_code();},
@@ -3304,7 +3304,7 @@ static void cb_End1(Fl_Input* o, void* v) {
 
 static void cb_Comment4(Fl_Text_Editor* o, void* v) {
 //fl ▼ ---------------------- callback ~~~=~=~=-~--=--==~~-=- ▼ fl//
-  if (!current_node || !current_node->is_a(Type::CodeBlock)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_CodeBlock)) return;
   CodeBlock_Node* nd = (CodeBlock_Node*)current_node;
 
   if (v == LOAD) {
@@ -3329,7 +3329,7 @@ Fl_Tabs *code_tabs=(Fl_Tabs *)0;
 
 static void cb_code_tabs(Fl_Tabs* o, void* v) {
 //fl ▼ ---------------------- callback ---~-=-~-==-~=-=~~=-~- ▼ fl//
-  if (current_node && current_node->is_a(Type::Code))
+  if (current_node && current_node->is_a(FLD_NODE_TYPE_Code))
     propagate_load((Fl_Group *)o,v);
 //fl ▲ ----------=~=~-~=~-~=~----------~~=~~~-=--~-=~--=~---= ▲ fl//
 }
@@ -3338,7 +3338,7 @@ Fl_Group *code_tabs_main=(Fl_Group *)0;
 
 static void cb_1c(fld::widget::Code_Editor* o, void* v) {
 //fl ▼ ---------------------- callback ~-=--~=~~==~=~=~-~--=~ ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Code)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Code)) return;
   Code_Node* nd = (Code_Node*)current_node;
    if (v == LOAD) {
     the_panel->label("Code Editor");
@@ -3368,7 +3368,7 @@ Fl_Tabs *func_tabs=(Fl_Tabs *)0;
 
 static void cb_func_tabs(Fl_Tabs* o, void* v) {
 //fl ▼ ---------------------- callback ~~=~~==~~-~~-~=~=-=~-- ▼ fl//
-  if (current_node && current_node->is_a(Type::Function))
+  if (current_node && current_node->is_a(FLD_NODE_TYPE_Function))
     propagate_load((Fl_Group *)o,v);
 //fl ▲ ----------~=~--=~=--~~------------~-~=-~=~=~=~~~~~=--= ▲ fl//
 }
@@ -3377,7 +3377,7 @@ Fl_Group *func_tabs_main=(Fl_Group *)0;
 
 static void cb_1d(Fl_Choice* o, void* v) {
 //fl ▼ ---------------------- callback ----~-~=--~-=~~~-~~==- ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Function)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
   Function_Node* nd = (Function_Node*)current_node;
 
   if (v == LOAD) {
@@ -3408,7 +3408,7 @@ Fl_Menu_Item menu_b[] = {
 
 static void cb_1e(Fl_Choice* o, void* v) {
 //fl ▼ ---------------------- callback ~-=~-=~---=~--~==-=~=- ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Function)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
   Function_Node* nd = (Function_Node*)current_node;
 
   if (v == LOAD) {
@@ -3439,7 +3439,7 @@ Fl_Menu_Item menu_c[] = {
 
 static void cb_declare(Fl_Check_Button* o, void* v) {
 //fl ▼ ---------------------- callback ~-~-=-~-=~-=~=~-~=-=-~ ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Function)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
   Function_Node* nd = (Function_Node*)current_node;
 
   if (v == LOAD) {
@@ -3461,7 +3461,7 @@ static void cb_1f(Fl_Tile* o, void* v) {
 
 static void cb_Function(fld::widget::Code_Editor* o, void* v) {
 //fl ▼ ---------------------- callback --=~=----~=~~-=~-==--~ ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Function)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
   Function_Node* nd = (Function_Node*)current_node;
 
   if (v == LOAD) {
@@ -3485,7 +3485,7 @@ static void cb_Function(fld::widget::Code_Editor* o, void* v) {
 
 static void cb_Return(fld::widget::Code_Editor* o, void* v) {
 //fl ▼ ---------------------- callback -~=--~-~=~=~~~---=~~=~ ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Function)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
   Function_Node* nd = (Function_Node*)current_node;
   update_current(o, v,
     [nd](){return nd->return_type();},
@@ -3496,7 +3496,7 @@ static void cb_Return(fld::widget::Code_Editor* o, void* v) {
 
 static void cb_Comment5(Fl_Text_Editor* o, void* v) {
 //fl ▼ ---------------------- callback ----=~--=~-==-~=-~=~=~ ▼ fl//
-  if (!current_node || !current_node->is_a(Type::Function)) return;
+  if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
   Function_Node* nd = (Function_Node*)current_node;
 
   if (v == LOAD) {
diff --git a/fluid/panels/widget_panel.fl b/fluid/panels/widget_panel.fl
index 03c08272b..0fb788ff2 100644
--- a/fluid/panels/widget_panel.fl
+++ b/fluid/panels/widget_panel.fl
@@ -192,7 +192,7 @@ Function {make_image_panel()} {uid b832
         Fl_Input image_panel_imagew {uid 7e73
           label {Width:}
           callback {if (v == LOAD) {
-    if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+    if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->value(current_widget->scale_image_w_);
     }
   } else {
@@ -222,7 +222,7 @@ Function {make_image_panel()} {uid b832
         Fl_Input image_panel_imageh {uid e676
           label {Height:}
           callback {if (v == LOAD) {
-    if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+    if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->value(current_widget->scale_image_h_);
     }
   } else {
@@ -271,7 +271,7 @@ Function {make_image_panel()} {uid b832
       Fl_Check_Button {} {uid 08b7
         label {convert to raw pixel data}
         callback {if (v == LOAD) {
-  if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+  if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
     o->activate();
     o->value(!current_widget->compress_image_);
   } else {
@@ -290,7 +290,7 @@ Function {make_image_panel()} {uid b832
       Fl_Check_Button {} {uid 62a3
         label {bind to widget}
         callback {if (v == LOAD) {
-  if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+  if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
     o->activate();
     o->value(current_widget->bind_image_);
   } else {
@@ -342,7 +342,7 @@ Function {make_image_panel()} {uid b832
         Fl_Input image_panel_deimagew {uid 117f
           label {Width:}
           callback {if (v == LOAD) {
-    if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+    if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->value(current_widget->scale_deimage_w_);
     }
   } else {
@@ -372,7 +372,7 @@ Function {make_image_panel()} {uid b832
         Fl_Input image_panel_deimageh {uid c6c4
           label {Height:}
           callback {if (v == LOAD) {
-    if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+    if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
       o->value(current_widget->scale_deimage_h_);
     }
   } else {
@@ -421,7 +421,7 @@ Function {make_image_panel()} {uid b832
       Fl_Check_Button {} {uid 0d5e
         label {convert to raw pixel data}
         callback {if (v == LOAD) {
-  if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+  if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
     o->activate();
     o->value(!current_widget->compress_deimage_);
   } else {
@@ -440,7 +440,7 @@ Function {make_image_panel()} {uid b832
       Fl_Check_Button {} {uid c4ca
         label {bind to widget}
         callback {if (v == LOAD) {
-  if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+  if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
     o->activate();
     o->value(current_widget->bind_deimage_);
   } else {
@@ -493,14 +493,14 @@ if (img) {
 Function {flex_margin_cb(Fl_Value_Input* i, void* v, void (*load_margin)(Fl_Flex*,Fl_Value_Input*), int (*update_margin)(Fl_Flex*,int))} {uid 03b3 return_type void
 } {
   code {if (v == LOAD) {
-  if (current_widget->is_a(Type::Flex)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Flex)) {
     load_margin((Fl_Flex*)current_widget->o, i);
   }
 } else {
   int mod = 0;
   int new_value = (int)i->value();
   for (Node *o = Fluid.proj.tree.first; o; o = o->next) {
-    if (o->selected && o->is_a(Type::Flex)) {
+    if (o->selected && o->is_a(FLD_NODE_TYPE_Flex)) {
       Flex_Node* q = (Flex_Node*)o;
       Fl_Flex* w = (Fl_Flex*)q->o;
       if (update_margin(w, new_value)) {
@@ -561,7 +561,7 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 15 t
           } {
             Fl_Input widget_image_input {uid cbeb
               callback {if (v == LOAD) {
-  if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+  if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
     o->activate();
     o->value(((Widget_Node*)current_widget)->image_name().c_str());
   } else o->deactivate();
@@ -578,7 +578,7 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 15 t
             Fl_Button {} {uid cdf4
               label {Browse...}
               callback {if (v == LOAD) {
-  if (current_widget->is_widget() && !current_widget->is_a(Type::Window))
+  if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window))
     o->activate();
   else
     o->deactivate();
@@ -611,7 +611,7 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 15 t
           } {
             Fl_Input widget_deimage_input {uid 887c
               callback {if (v == LOAD) {
-  if (current_widget->is_widget() && !current_widget->is_a(Type::Window)) {
+  if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window)) {
     o->activate();
     o->value(((Widget_Node*)current_widget)->inactive_name().c_str());
   } else o->deactivate();
@@ -628,7 +628,7 @@ Use Ctrl-J for newlines.} xywh {95 40 190 20} labelfont 1 labelsize 11 when 15 t
             Fl_Button {} {uid 8947
               label {Browse...}
               callback {if (v == LOAD) {
-  if (current_widget->is_widget() && !current_widget->is_a(Type::Window))
+  if (current_widget->is_widget() && !current_widget->is_a(FLD_NODE_TYPE_Window))
     o->activate();
   else
     o->deactivate();
@@ -954,7 +954,7 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
             Fl_Choice {} {uid 4f6a
               label {Children:}
               callback {if (v == LOAD) {
-  if (current_widget->is_a(Type::Widget_Class)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Widget_Class)) {
     o->show();
     o->value(((Widget_Class_Node *)current_widget)->wc_relative);
   } else {
@@ -964,7 +964,7 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
   int mod = 0;
   Fluid.proj.undo.checkpoint();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Widget_Class)) {
+    if (q->is_a(FLD_NODE_TYPE_Widget_Class)) {
       Widget_Class_Node *t = (Widget_Class_Node *)q;
       t->wc_relative = o->value();
       mod = 1;
@@ -1080,9 +1080,9 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
           Fl_Group wp_gui_values {uid 2348
             label {Values:}
             callback {if (v == LOAD) {
-  if (   current_widget->is_a(Type::Flex)
-      || current_widget->is_a(Type::Grid)
-      || current_widget->is_a(Type::Window))
+  if (   current_widget->is_a(FLD_NODE_TYPE_Flex)
+      || current_widget->is_a(FLD_NODE_TYPE_Grid)
+      || current_widget->is_a(FLD_NODE_TYPE_Window))
   {
     o->hide();
   } else {
@@ -1095,7 +1095,7 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
             Fl_Value_Input {} {uid 4e4e
               label {Size:}
               callback {if (v == LOAD) {
-  if (!current_widget->is_a(Type::Slider)) {o->deactivate(); return;}
+  if (!current_widget->is_a(FLD_NODE_TYPE_Slider)) {o->deactivate(); return;}
   o->activate();
   o->value(((Fl_Slider*)(current_widget->o))->slider_size());
 } else {
@@ -1103,7 +1103,7 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
   Fluid.proj.undo.checkpoint();
   double n = o->value();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Slider)) {
+    if (q->is_a(FLD_NODE_TYPE_Slider)) {
       ((Fl_Slider*)(q->o))->slider_size(n);
       q->o->redraw();
       mod = 1;
@@ -1116,10 +1116,10 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
             Fl_Value_Input {} {uid eaec
               label {Minimum:}
               callback {if (v == LOAD) {
-  if (current_widget->is_a(Type::Valuator_)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Valuator_)) {
     o->activate();
     o->value(((Fl_Valuator*)(current_widget->o))->minimum());
-  } else if (current_widget->is_a(Type::Spinner)) {
+  } else if (current_widget->is_a(FLD_NODE_TYPE_Spinner)) {
     o->activate();
     o->value(((Fl_Spinner*)(current_widget->o))->minimum());
   } else {
@@ -1131,11 +1131,11 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
   Fluid.proj.undo.checkpoint();
   double n = o->value();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Valuator_)) {
+    if (q->is_a(FLD_NODE_TYPE_Valuator_)) {
       ((Fl_Valuator*)(q->o))->minimum(n);
       q->o->redraw();
       mod = 1;
-    } else if (q->is_a(Type::Spinner)) {
+    } else if (q->is_a(FLD_NODE_TYPE_Spinner)) {
       ((Fl_Spinner*)(q->o))->minimum(n);
       q->o->redraw();
       mod = 1;
@@ -1148,10 +1148,10 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
             Fl_Value_Input {} {uid 6bdb
               label {Maximum:}
               callback {if (v == LOAD) {
-  if (current_widget->is_a(Type::Valuator_)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Valuator_)) {
     o->activate();
     o->value(((Fl_Valuator*)(current_widget->o))->maximum());
-  } else if (current_widget->is_a(Type::Spinner)) {
+  } else if (current_widget->is_a(FLD_NODE_TYPE_Spinner)) {
     o->activate();
     o->value(((Fl_Spinner*)(current_widget->o))->maximum());
   } else {
@@ -1163,11 +1163,11 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
   Fluid.proj.undo.checkpoint();
   double n = o->value();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Valuator_)) {
+    if (q->is_a(FLD_NODE_TYPE_Valuator_)) {
       ((Fl_Valuator*)(q->o))->maximum(n);
       q->o->redraw();
       mod = 1;
-    } else if (q->is_a(Type::Spinner)) {
+    } else if (q->is_a(FLD_NODE_TYPE_Spinner)) {
       ((Fl_Spinner*)(q->o))->maximum(n);
       q->o->redraw();
       mod = 1;
@@ -1180,10 +1180,10 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
             Fl_Value_Input {} {uid 0339
               label {Step:}
               callback {if (v == LOAD) {
-  if (current_widget->is_a(Type::Valuator_)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Valuator_)) {
     o->activate();
     o->value(((Fl_Valuator*)(current_widget->o))->step());
-  } else if (current_widget->is_a(Type::Spinner)) {
+  } else if (current_widget->is_a(FLD_NODE_TYPE_Spinner)) {
     o->activate();
     o->value(((Fl_Spinner*)(current_widget->o))->step());
   } else {
@@ -1195,11 +1195,11 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
   Fluid.proj.undo.checkpoint();
   double n = o->value();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Valuator_)) {
+    if (q->is_a(FLD_NODE_TYPE_Valuator_)) {
       ((Fl_Valuator*)(q->o))->step(n);
       q->o->redraw();
       mod = 1;
-    } else if (q->is_a(Type::Spinner)) {
+    } else if (q->is_a(FLD_NODE_TYPE_Spinner)) {
       ((Fl_Spinner*)(q->o))->step(n);
       q->o->redraw();
       mod = 1;
@@ -1212,13 +1212,13 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
             Fl_Value_Input {} {uid aa3f
               label {Value:}
               callback {if (v == LOAD) {
-  if (current_widget->is_a(Type::Valuator_)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Valuator_)) {
     o->activate();
     o->value(((Fl_Valuator*)(current_widget->o))->value());
   } else if (current_widget->is_button()) {
     o->activate();
     o->value(((Fl_Button*)(current_widget->o))->value());
-  } else if (current_widget->is_a(Type::Spinner)) {
+  } else if (current_widget->is_a(FLD_NODE_TYPE_Spinner)) {
     o->activate();
     o->value(((Fl_Spinner*)(current_widget->o))->value());
   } else
@@ -1228,14 +1228,14 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
   Fluid.proj.undo.checkpoint();
   double n = o->value();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Valuator_)) {
+    if (q->is_a(FLD_NODE_TYPE_Valuator_)) {
       ((Fl_Valuator*)(q->o))->value(n);
       mod = 1;
     } else if (q->is_button()) {
       ((Fl_Button*)(q->o))->value(n != 0);
-      if (q->is_a(Type::Menu_Item)) q->redraw();
+      if (q->is_a(FLD_NODE_TYPE_Menu_Item)) q->redraw();
       mod = 1;
-    } else if (q->is_a(Type::Spinner)) {
+    } else if (q->is_a(FLD_NODE_TYPE_Spinner)) {
       ((Fl_Spinner*)(q->o))->value(n);
       mod = 1;
     }
@@ -1251,7 +1251,7 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
           Fl_Group wp_gui_margins {uid 910a
             label {Margins:}
             callback {if (v == LOAD) {
-  if (current_widget->is_a(Type::Flex)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Flex)) {
     o->show();
     propagate_load(o, v);
   } else {
@@ -1381,7 +1381,7 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
           Fl_Group wp_gui_sizerange {uid 0e6b
             label {Size Range:}
             callback {if (v == LOAD) {
-  if (current_widget->is_a(Type::Window)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Window)) {
     o->show();
     propagate_load(o, v);
   } else {
@@ -1393,14 +1393,14 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
             Fl_Value_Input {} {uid a350
               label {Minimum Size:}
               callback {if (v == LOAD) {
-  if (!current_widget->is_a(Type::Window)) return;
+  if (!current_widget->is_a(FLD_NODE_TYPE_Window)) return;
   o->value(((Window_Node*)current_widget)->sr_min_w);
 } else {
   int mod = 0;
   Fluid.proj.undo.checkpoint();
   int n = (int)o->value();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Window)) {
+    if (q->is_a(FLD_NODE_TYPE_Window)) {
       ((Window_Node*)q)->sr_min_w = n;
       mod = 1;
     }
@@ -1411,14 +1411,14 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
             }
             Fl_Value_Input {} {uid f50b
               callback {if (v == LOAD) {
-  if (!current_widget->is_a(Type::Window)) return;
+  if (!current_widget->is_a(FLD_NODE_TYPE_Window)) return;
   o->value(((Window_Node*)current_widget)->sr_min_h);
 } else {
   int mod = 0;
   Fluid.proj.undo.checkpoint();
   int n = (int)o->value();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Window)) {
+    if (q->is_a(FLD_NODE_TYPE_Window)) {
       ((Window_Node*)q)->sr_min_h = n;
       mod = 1;
     }
@@ -1434,7 +1434,7 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
   int mod = 0;
   Fluid.proj.undo.checkpoint();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Window)) {
+    if (q->is_a(FLD_NODE_TYPE_Window)) {
       Window_Node *win = (Window_Node*)q;
       win->sr_min_w = win->o->w();
       win->sr_min_h = win->o->h();
@@ -1449,14 +1449,14 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
             Fl_Value_Input {} {uid 99ee
               label {Maximum Size:}
               callback {if (v == LOAD) {
-  if (!current_widget->is_a(Type::Window)) return;
+  if (!current_widget->is_a(FLD_NODE_TYPE_Window)) return;
   o->value(((Window_Node*)current_widget)->sr_max_w);
 } else {
   int mod = 0;
   Fluid.proj.undo.checkpoint();
   int n = (int)o->value();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Window)) {
+    if (q->is_a(FLD_NODE_TYPE_Window)) {
       ((Window_Node*)q)->sr_max_w = n;
       mod = 1;
     }
@@ -1467,14 +1467,14 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
             }
             Fl_Value_Input {} {uid e850
               callback {if (v == LOAD) {
-  if (!current_widget->is_a(Type::Window)) return;
+  if (!current_widget->is_a(FLD_NODE_TYPE_Window)) return;
   o->value(((Window_Node*)current_widget)->sr_max_h);
 } else {
   int mod = 0;
   Fluid.proj.undo.checkpoint();
   int n = (int)o->value();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Window)) {
+    if (q->is_a(FLD_NODE_TYPE_Window)) {
       ((Window_Node*)q)->sr_max_h = n;
       mod = 1;
     }
@@ -1490,7 +1490,7 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
   int mod = 0;
   Fluid.proj.undo.checkpoint();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Window)) {
+    if (q->is_a(FLD_NODE_TYPE_Window)) {
       Window_Node *win = (Window_Node*)q;
       win->sr_max_w = win->o->w();
       win->sr_max_h = win->o->h();
@@ -1515,11 +1515,11 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
               callback {if (v == LOAD) {
   if (current_widget->is_button())
     o->value( ((Fl_Button*)(current_widget->o))->shortcut() );
-  else if (current_widget->is_a(Type::Input))
+  else if (current_widget->is_a(FLD_NODE_TYPE_Input))
     o->value( ((Fl_Input_*)(current_widget->o))->shortcut() );
-  else if (current_widget->is_a(Type::Value_Input))
+  else if (current_widget->is_a(FLD_NODE_TYPE_Value_Input))
     o->value( ((Fl_Value_Input*)(current_widget->o))->shortcut() );
-  else if (current_widget->is_a(Type::Text_Display))
+  else if (current_widget->is_a(FLD_NODE_TYPE_Text_Display))
     o->value( ((Fl_Text_Display*)(current_widget->o))->shortcut() );
   else {
     o->hide();
@@ -1537,16 +1537,16 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11
       Fl_Button* b = (Fl_Button*)(q->o);
       if (b->shortcut() != (int)o->value()) mod = 1;
       b->shortcut(o->value());
-      if (q->is_a(Type::Menu_Item)) q->redraw();
-    } else if (q->is_a(Type::Input)) {
+      if (q->is_a(FLD_NODE_TYPE_Menu_Item)) q->redraw();
+    } else if (q->is_a(FLD_NODE_TYPE_Input)) {
       Fl_Input_* b = (Fl_Input_*)(q->o);
       if (b->shortcut() != (int)o->value()) mod = 1;
       b->shortcut(o->value());
-    } else if (q->is_a(Type::Value_Input)) {
+    } else if (q->is_a(FLD_NODE_TYPE_Value_Input)) {
       Fl_Value_Input* b = (Fl_Value_Input*)(q->o);
       if (b->shortcut() != (int)o->value()) mod = 1;
       b->shortcut(o->value());
-    } else if (q->is_a(Type::Text_Display)) {
+    } else if (q->is_a(FLD_NODE_TYPE_Text_Display)) {
       Fl_Text_Display* b = (Fl_Text_Display*)(q->o);
       if (b->shortcut() != (int)o->value()) mod = 1;
       b->shortcut(o->value());
@@ -1568,7 +1568,7 @@ Use 'Backspace' key to clear.} xywh {95 210 310 20} box DOWN_BOX color 7 selecti
             Fl_Input {} {uid f009
               label {:}
               callback {if (v == LOAD) {
-  if (current_widget->is_a(Type::Window)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Window)) {
     o->show();
     o->parent()->show();
     o->value(((Window_Node *)current_widget)->xclass);
@@ -1580,7 +1580,7 @@ Use 'Backspace' key to clear.} xywh {95 210 310 20} box DOWN_BOX color 7 selecti
   int mod = 0;
   Fluid.proj.undo.checkpoint();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Window)) {
+    if (q->is_a(FLD_NODE_TYPE_Window)) {
       mod = 1;
       Window_Node *wt = (Window_Node *)q;
       storestring(o->value(), wt->xclass);
@@ -1594,7 +1594,7 @@ Use 'Backspace' key to clear.} xywh {95 210 310 20} box DOWN_BOX color 7 selecti
             Fl_Light_Button {} {uid eca1
               label Border
               callback {if (v == LOAD) {
-  if (!current_widget->is_a(Type::Window)) {o->hide(); return;}
+  if (!current_widget->is_a(FLD_NODE_TYPE_Window)) {o->hide(); return;}
   o->show();
   o->value(((Fl_Window*)(current_widget->o))->border());
 } else {
@@ -1607,7 +1607,7 @@ Use 'Backspace' key to clear.} xywh {95 210 310 20} box DOWN_BOX color 7 selecti
             Fl_Light_Button {} {uid 457d
               label Modal
               callback {if (v == LOAD) {
-  if (!current_widget->is_a(Type::Window)) {o->hide(); return;}
+  if (!current_widget->is_a(FLD_NODE_TYPE_Window)) {o->hide(); return;}
   o->show();
   o->value(((Window_Node *)current_widget)->modal);
 } else {
@@ -1620,7 +1620,7 @@ Use 'Backspace' key to clear.} xywh {95 210 310 20} box DOWN_BOX color 7 selecti
             Fl_Light_Button {} {uid 3574
               label Nonmodal
               callback {if (v == LOAD) {
-  if (!current_widget->is_a(Type::Window)) {o->hide(); return;}
+  if (!current_widget->is_a(FLD_NODE_TYPE_Window)) {o->hide(); return;}
   o->show();
   o->value(((Window_Node *)current_widget)->non_modal);
 } else {
@@ -1640,7 +1640,7 @@ Use 'Backspace' key to clear.} xywh {95 210 310 20} box DOWN_BOX color 7 selecti
               label Visible
               callback {if (v == LOAD) {
   o->value(current_widget->o->visible());
-  if (current_widget->is_a(Type::Window)) o->deactivate();
+  if (current_widget->is_a(FLD_NODE_TYPE_Window)) o->deactivate();
   else o->activate();
 } else {
   int mod = 0;
@@ -1653,9 +1653,9 @@ Use 'Backspace' key to clear.} xywh {95 210 310 20} box DOWN_BOX color 7 selecti
     n ? q->o->show() : q->o->hide();
     q->redraw();
     if (n && q->parent && q->parent->type_name()) {
-      if (q->parent->is_a(Type::Tabs)) {
+      if (q->parent->is_a(FLD_NODE_TYPE_Tabs)) {
         ((Fl_Tabs *)q->o->parent())->value(q->o);
-      } else if (q->parent->is_a(Type::Wizard)) {
+      } else if (q->parent->is_a(FLD_NODE_TYPE_Wizard)) {
         ((Fl_Wizard *)q->o->parent())->value(q->o);
       }
     }
@@ -1671,7 +1671,7 @@ Use 'Backspace' key to clear.} xywh {95 210 310 20} box DOWN_BOX color 7 selecti
               label Active
               callback {if (v == LOAD) {
   o->value(current_widget->o->active());
-  if (current_widget->is_a(Type::Window)) o->deactivate();
+  if (current_widget->is_a(FLD_NODE_TYPE_Window)) o->deactivate();
   else o->activate();
 } else {
   int mod = 0;
@@ -1691,7 +1691,7 @@ Use 'Backspace' key to clear.} xywh {95 210 310 20} box DOWN_BOX color 7 selecti
             Fl_Light_Button {} {uid 9305
               label Resizable
               callback {if (v == LOAD) {
-  if (current_widget->is_a(Type::Menu_Item)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
     o->hide();
     return;
   }
@@ -1712,7 +1712,7 @@ Use 'Backspace' key to clear.} xywh {95 210 310 20} box DOWN_BOX color 7 selecti
             Fl_Light_Button {} {uid 32ad
               label Headline
               callback {if (v == LOAD) {
-  if (!current_widget->is_a(Type::Menu_Item)) {
+  if (!current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
     o->hide();
     return;
   }
@@ -1722,7 +1722,7 @@ Use 'Backspace' key to clear.} xywh {95 210 310 20} box DOWN_BOX color 7 selecti
   int mod = 0;
   int n = o->value();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Menu_Item)) {
+    if (q->is_a(FLD_NODE_TYPE_Menu_Item)) {
       if (!mod) {
         mod = 1;
         Fluid.proj.undo.checkpoint();
@@ -1740,21 +1740,21 @@ unselectable, but not grayed out} xywh {225 260 75 20} selection_color 1 labelsi
               label Hotspot
               callback {if (v == LOAD) {
   if (numselected > 1) {o->deactivate(); return;}
-  if (current_widget->is_a(Type::Menu_Item)) o->label("divider");
+  if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) o->label("divider");
   else o->label("hotspot");
   o->activate();
   o->value(current_widget->hotspot());
 } else {
   Fluid.proj.undo.checkpoint();
   current_widget->hotspot(o->value());
-  if (current_widget->is_a(Type::Menu_Item)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
     current_widget->redraw();
     return;
   }
   if (o->value()) {
     Node *p = current_widget->parent;
     if (!p || !p->is_widget()) return;
-    while (!p->is_a(Type::Window)) p = p->parent;
+    while (!p->is_a(FLD_NODE_TYPE_Window)) p = p->parent;
     for (Node *q = p->next; q && q->level > p->level; q = q->next) {
       if (q->is_widget() && q != current_widget)
         ((Widget_Node*)q)->hotspot(0);
@@ -1878,7 +1878,7 @@ if (v != LOAD) {
           } {
             Fl_Choice {} {uid 5454
               callback {if (v == LOAD) {
-  if (current_widget->is_a(Type::Menu_Item)) {o->deactivate(); return;} else o->activate();
+  if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {o->deactivate(); return;} else o->activate();
   int n = current_widget->o->box();
   if (!n) n = ZERO_ENTRY;
   for (int j = 0; j < 72 /*int(sizeof(boxmenu)/sizeof(*boxmenu))*/; j++)
@@ -1904,7 +1904,7 @@ if (v != LOAD) {
               label Color
               callback {Fl_Color c = current_widget->o->color();
 if (v == LOAD) {
-  if (current_widget->is_a(Type::Menu_Item)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
     o->deactivate();
   } else {
     o->activate();
@@ -1923,7 +1923,7 @@ o->redraw();}
             Fl_Menu_Button {} {uid 7a18
               callback {Fl_Color c = current_widget->o->color();
 if (v == LOAD) {
-  if (current_widget->is_a(Type::Menu_Item)) {o->deactivate(); return;} else o->activate();
+  if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {o->deactivate(); return;} else o->activate();
 } else {
   Fl_Color d = (Fl_Color)(o->mvalue()->argument());
   if (d == c) return;
@@ -1946,11 +1946,11 @@ if (v == LOAD) {
             Fl_Choice {} {uid d304
               callback {if (v == LOAD) {
   int n;
-  if (current_widget->is_a(Type::Button))
+  if (current_widget->is_a(FLD_NODE_TYPE_Button))
     n = ((Fl_Button*)(current_widget->o))->down_box();
-  else if (current_widget->is_a(Type::Input_Choice))
+  else if (current_widget->is_a(FLD_NODE_TYPE_Input_Choice))
     n = ((Fl_Input_Choice*)(current_widget->o))->down_box();
-  else if (current_widget->is_a(Type::Menu_Manager_))
+  else if (current_widget->is_a(FLD_NODE_TYPE_Menu_Manager_))
     n = ((Fl_Menu_*)(current_widget->o))->down_box();
   else {
     o->deactivate(); return;
@@ -1966,12 +1966,12 @@ if (v == LOAD) {
   if (!n) return; // should not happen
   if (n == ZERO_ENTRY) n = 0;
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Button)) {
+    if (q->is_a(FLD_NODE_TYPE_Button)) {
       ((Fl_Button*)(q->o))->down_box((Fl_Boxtype)n);
       if (((Fl_Button*)(q->o))->value()) q->redraw();
-    } else if (q->is_a(Type::Input_Choice)) {
+    } else if (q->is_a(FLD_NODE_TYPE_Input_Choice)) {
       ((Fl_Input_Choice*)(q->o))->down_box((Fl_Boxtype)n);
-    } else if (q->is_a(Type::Menu_Manager_)) {
+    } else if (q->is_a(FLD_NODE_TYPE_Menu_Manager_)) {
       ((Fl_Menu_*)(q->o))->down_box((Fl_Boxtype)n);
     }
     mod = 1;
@@ -1986,7 +1986,7 @@ if (v == LOAD) {
               label {Select Color}
               callback {Fl_Color c = current_widget->o->selection_color();
 if (v == LOAD) {
-  if (current_widget->is_a(Type::Menu_Item)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
     o->deactivate();
     return;
   } else {
@@ -2006,7 +2006,7 @@ o->redraw();}
             Fl_Menu_Button {} {uid b1b3
               callback {Fl_Color c = current_widget->o->selection_color();
 if (v == LOAD) {
-  if (current_widget->is_a(Type::Menu_Item)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
     o->deactivate();
     return;
   } else {
@@ -2217,7 +2217,7 @@ if (v == LOAD) {
             label Compact
             callback {if (v == LOAD) {
   uchar n;
-  if (current_widget->is_a(Type::Button) && !current_widget->is_a(Type::Menu_Item)) {
+  if (current_widget->is_a(FLD_NODE_TYPE_Button) && !current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
     n = ((Fl_Button*)(current_widget->o))->compact();
     o->value(n);
     o->show();
@@ -2228,7 +2228,7 @@ if (v == LOAD) {
   int mod = 0;
   uchar n = (uchar)o->value();
   for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
-    if (q->is_a(Type::Button) && !q->is_a(Type::Menu_Item)) {
+    if (q->is_a(FLD_NODE_TYPE_Button) && !q->is_a(FLD_NODE_TYPE_Menu_Item)) {
       uchar v = ((Fl_Button*)(q->o))->compact();
       if (n != v) {
         if (!mod) {
@@ -2261,7 +2261,7 @@ if (v == LOAD) {
             Fl_Input {} {uid 31e6
               user_data 4
               callback {if (v == LOAD) {
-    if (current_widget->is_a(Type::Menu_Item)) {
+    if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {
       o->deactivate();
     } else {
       o->activate();
@@ -2294,7 +2294,7 @@ if (v == LOAD) {
       int j;
       for (j = 0;; j++) {
         if (!m[j].text) {j = 0; break;}
-        if (current_widget->is_a(Type::Spinner)) {
+        if (current_widget->is_a(FLD_NODE_TYPE_Spinner)) {
           if (m[j].argument() == ((Fl_Spinner*)current_widget->o)->type()) break;
         } else {
           if (m[j].argument() == current_widget->o->type()) break;
@@ -2310,9 +2310,9 @@ if (v == LOAD) {
     Fl_Menu_Item* m = current_widget->subtypes();
     for (Widget_Node *q: Fluid.proj.tree.all_selected_widgets()) {
       if (q->subtypes()==m) {
-        if (q->is_a(Type::Spinner))
+        if (q->is_a(FLD_NODE_TYPE_Spinner))
           ((Fl_Spinner*)q->o)->type(n);
-        else if (q->is_a(Type::Flex))
+        else if (q->is_a(FLD_NODE_TYPE_Flex))
           ((Flex_Node*)q)->change_subtype_to(n);
         else
           q->o->type(n);
@@ -2523,7 +2523,7 @@ wCallback->do_callback(wCallback, v);} open
             Fl_Menu_Button {} {uid ba4c
               label When
               callback {if (v == LOAD) {
-  if (current_widget->is_a(Type::Menu_Item)) {o->deactivate(); return;} else o->activate();
+  if (current_widget->is_a(FLD_NODE_TYPE_Menu_Item)) {o->deactivate(); return;} else o->activate();
   int n = current_widget->o->when();
   set_whenmenu(n);
   w_when_box->copy_label(when_symbol_name(n));
@@ -2611,7 +2611,7 @@ if (v == LOAD) {
         } {}
       }
       Fl_Tabs data_tabs {uid 3ae5
-        callback {if (current_node && current_node->is_a(Type::Data))
+        callback {if (current_node && current_node->is_a(FLD_NODE_TYPE_Data))
   propagate_load((Fl_Group *)o,v);}
         xywh {10 10 400 350} selection_color 12 labelsize 11 labelcolor 255 hide
       } {
@@ -2626,7 +2626,7 @@ if (v == LOAD) {
             xywh {95 49 310 21} labelfont 1 labelsize 11 align 4
           } {
             Fl_Choice {} {uid 0b51
-              callback {if (!current_node || !current_node->is_a(Type::Data)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Data)) return;
 Data_Node* nd = (Data_Node*)current_node;
 
 if (v == LOAD) {
@@ -2665,7 +2665,7 @@ if (v == LOAD) {
               }
             }
             Fl_Choice {} {uid e705
-              callback {if (!current_node || !current_node->is_a(Type::Data)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Data)) return;
 Data_Node* nd = (Data_Node*)current_node;
 
 if (v == LOAD) {
@@ -2709,7 +2709,7 @@ if (v == LOAD) {
             xywh {95 75 310 20} labelfont 1 labelsize 11 align 4
           } {
             Fl_Choice {} {uid 6268
-              callback {if (!current_node || !current_node->is_a(Type::Data)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Data)) return;
 Data_Node* nd = (Data_Node*)current_node;
 
 if (v == LOAD) {
@@ -2759,7 +2759,7 @@ if (v == LOAD) {
           }
           Fl_Input {} {uid f233
             label {Name:}
-            callback {if (!current_node || !current_node->is_a(Type::Data)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Data)) return;
 Data_Node* nd = (Data_Node*)current_node;
 
 if (v == LOAD) {
@@ -2779,7 +2779,7 @@ if (v == LOAD) {
           }
           Fl_Input wp_data_filename {uid 1148
             label {Filename:}
-            callback {if (!current_node || !current_node->is_a(Type::Data)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Data)) return;
 Data_Node* nd = (Data_Node*)current_node;
 update_current(o, v,
   [nd](){return nd->filename();},
@@ -2806,7 +2806,7 @@ update_current(o, v,
           }
           Fl_Text_Editor {} {uid 8a96
             label {Comment:}
-            callback {if (!current_node || !current_node->is_a(Type::Data)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Data)) return;
 Data_Node* nd = (Data_Node*)current_node;
 
 if (v == LOAD) {
@@ -2831,7 +2831,7 @@ if (v == LOAD) {
         }
       }
       Fl_Tabs comment_tabs {uid 8c0e
-        callback {if (current_node && current_node->is_a(Type::Comment))
+        callback {if (current_node && current_node->is_a(FLD_NODE_TYPE_Comment))
   propagate_load((Fl_Group *)o,v);}
         xywh {10 10 400 350} selection_color 12 labelsize 11 labelcolor 255 hide
       } {
@@ -2842,7 +2842,7 @@ if (v == LOAD) {
         } {
           Fl_Text_Editor comment_tabs_name {uid e7bf
             label {Comment:}
-            callback {if (!current_node || !current_node->is_a(Type::Comment)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Comment)) return;
 Comment_Node* nd = (Comment_Node*)current_node;
 
 if (v == LOAD) {
@@ -2871,7 +2871,7 @@ if (v == LOAD) {
           } {
             Fl_Menu_Button comment_predefined_2 {uid 35da
               label Predefined
-              callback {if (!current_node || !current_node->is_a(Type::Comment)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Comment)) return;
 
 static char itempath[256];
 static int last_selected_item { 0 };
@@ -2968,7 +2968,7 @@ if (v != LOAD) {
             }
             Fl_Check_Button {} {uid b4f1
               label {output to header file}
-              callback {if (!current_node || !current_node->is_a(Type::Comment)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Comment)) return;
 Comment_Node* nd = (Comment_Node*)current_node;
 
 if (v == LOAD) {
@@ -2983,7 +2983,7 @@ if (v == LOAD) {
             }
             Fl_Check_Button {} {uid 4b86
               label {output to source file}
-              callback {if (!current_node || !current_node->is_a(Type::Comment)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Comment)) return;
 Comment_Node* nd = (Comment_Node*)current_node;
 
 if (v == LOAD) {
@@ -3003,7 +3003,7 @@ if (v == LOAD) {
         }
       }
       Fl_Tabs class_tabs {uid 81a5
-        callback {if (current_node && current_node->is_a(Type::Class))
+        callback {if (current_node && current_node->is_a(FLD_NODE_TYPE_Class))
   propagate_load((Fl_Group *)o,v);}
         xywh {10 10 400 350} selection_color 12 labelsize 11 labelcolor 255 hide
       } {
@@ -3020,7 +3020,7 @@ support a class inside a class at this point} open
             xywh {95 50 310 21} labelfont 1 labelsize 11 align 4 hide
           } {
             Fl_Choice {} {uid 5488
-              callback {if (!current_node || !current_node->is_a(Type::Class)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Class)) return;
 Class_Node* nd = (Class_Node*)current_node;
 
 if (v == LOAD) {
@@ -3060,7 +3060,7 @@ if (v == LOAD) {
           }
           Fl_Input {} {uid df8b
             label {Attribute:}
-            callback {if (!current_node || !current_node->is_a(Type::Class)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Class)) return;
 Class_Node* nd = (Class_Node*)current_node;
 
 if (v == LOAD) {
@@ -3077,7 +3077,7 @@ if (v == LOAD) {
           }
           Fl_Input {} {uid 2af0
             label {Class Name:}
-            callback {if (!current_node || !current_node->is_a(Type::Class)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Class)) return;
 Class_Node* nd = (Class_Node*)current_node;
 
 if (v == LOAD) {
@@ -3121,7 +3121,7 @@ if (v == LOAD) {
           }
           Fl_Input {} {uid 31d1
             label {Base Class:}
-            callback {if (!current_node || !current_node->is_a(Type::Class)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Class)) return;
 Class_Node* nd = (Class_Node*)current_node;
 
 if (v == LOAD) {
@@ -3138,7 +3138,7 @@ e.g. `public Fl_Widget`} xywh {95 100 305 20} labelfont 1 labelsize 11 textfont
           }
           Fl_Text_Editor {} {uid 9923
             label {Comment:}
-            callback {if (!current_node || !current_node->is_a(Type::Class)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Class)) return;
 Class_Node* nd = (Class_Node*)current_node;
 
 if (v == LOAD) {
@@ -3163,7 +3163,7 @@ if (v == LOAD) {
         }
       }
       Fl_Tabs declblock_tabs {uid fd14
-        callback {if (current_node && current_node->is_a(Type::DeclBlock))
+        callback {if (current_node && current_node->is_a(FLD_NODE_TYPE_DeclBlock))
   propagate_load((Fl_Group *)o,v);}
         xywh {10 10 400 350} selection_color 12 labelsize 11 labelcolor 255 hide
       } {
@@ -3174,7 +3174,7 @@ if (v == LOAD) {
         } {
           Fl_Input {} {uid 7354
             label {Start Code:}
-            callback {if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
 DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
 
 if (v == LOAD) {
@@ -3194,7 +3194,7 @@ if (v == LOAD) {
           }
           Fl_Input {} {uid b795
             label {End Code:}
-            callback {if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
 DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
 update_current(o, v,
   [nd](){return nd->end_code();},
@@ -3212,7 +3212,7 @@ update_current(o, v,
             }
             Fl_Check_Button {} {uid 7b16
               label implementations
-              callback {if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
 DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
 
 if (v == LOAD) {
@@ -3232,7 +3232,7 @@ if (v == LOAD) {
             }
             Fl_Check_Button {} {uid 02cf
               label {static initializations and callbacks}
-              callback {if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
 DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
 
 if (v == LOAD) {
@@ -3256,7 +3256,7 @@ if (v == LOAD) {
             }
             Fl_Check_Button {} {uid 1686
               label {forward declarations}
-              callback {if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
 DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
 
 if (v == LOAD) {
@@ -3276,7 +3276,7 @@ if (v == LOAD) {
             }
             Fl_Check_Button {} {uid e71b
               label {preprecessor and callback declarations}
-              callback {if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
 DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
 
 if (v == LOAD) {
@@ -3300,7 +3300,7 @@ if (v == LOAD) {
           }
           Fl_Text_Editor {} {uid 9e73
             label {Comment:}
-            callback {if (!current_node || !current_node->is_a(Type::DeclBlock)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_DeclBlock)) return;
 DeclBlock_Node* nd = (DeclBlock_Node*)current_node;
 
 if (v == LOAD) {
@@ -3325,7 +3325,7 @@ if (v == LOAD) {
         }
       }
       Fl_Tabs decl_tabs {uid b97f
-        callback {if (current_node && current_node->is_a(Type::Decl))
+        callback {if (current_node && current_node->is_a(FLD_NODE_TYPE_Decl))
   propagate_load((Fl_Group *)o,v);}
         xywh {10 10 400 350} selection_color 12 labelsize 11 labelcolor 255 hide
       } {
@@ -3346,7 +3346,7 @@ if (v == LOAD) {
               xywh {95 50 1 20} labelfont 1 labelsize 11 align 4
             }
             Fl_Choice {} {uid 871c
-              callback {if (!current_node || !current_node->is_a(Type::Decl)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Decl)) return;
 Decl_Node* nd = (Decl_Node*)current_node;
 
 if (v == LOAD) {
@@ -3385,7 +3385,7 @@ if (v == LOAD) {
               }
             }
             Fl_Choice {} {uid 796e
-              callback {if (!current_node || !current_node->is_a(Type::Decl)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Decl)) return;
 Decl_Node* nd = (Decl_Node*)current_node;
 
 if (v == LOAD) {
@@ -3432,7 +3432,7 @@ if (v == LOAD) {
             } {
               Fl_Text_Editor {} {uid b84e
                 label {Declaration:}
-                callback {if (!current_node || !current_node->is_a(Type::Decl)) return;
+                callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Decl)) return;
 Decl_Node* nd = (Decl_Node*)current_node;
 
 if (v == LOAD) {
@@ -3465,7 +3465,7 @@ a `\#` directive: `\#include <foo.h>`, a typedef `typedef char byte;`,
             } {
               Fl_Text_Editor {} {uid 0067
                 label {Comment:}
-                callback {if (!current_node || !current_node->is_a(Type::Decl)) return;
+                callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Decl)) return;
 Decl_Node* nd = (Decl_Node*)current_node;
 
 if (v == LOAD) {
@@ -3492,7 +3492,7 @@ if (v == LOAD) {
         }
       }
       Fl_Tabs codeblock_tabs {uid 86d2
-        callback {if (current_node && current_node->is_a(Type::CodeBlock))
+        callback {if (current_node && current_node->is_a(FLD_NODE_TYPE_CodeBlock))
   propagate_load((Fl_Group *)o,v);}
         xywh {10 10 400 350} selection_color 12 labelsize 11 labelcolor 255 hide
       } {
@@ -3503,7 +3503,7 @@ if (v == LOAD) {
         } {
           Fl_Input {} {uid 2539
             label {Start Code:}
-            callback {if (!current_node || !current_node->is_a(Type::CodeBlock)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_CodeBlock)) return;
 CodeBlock_Node* nd = (CodeBlock_Node*)current_node;
 
 if (v == LOAD) {
@@ -3523,7 +3523,7 @@ if (v == LOAD) {
           }
           Fl_Input {} {uid 0157
             label {End Code:}
-            callback {if (!current_node || !current_node->is_a(Type::CodeBlock)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_CodeBlock)) return;
 CodeBlock_Node* nd = (CodeBlock_Node*)current_node;
 update_current(o, v,
   [nd](){return nd->end_code();},
@@ -3533,7 +3533,7 @@ update_current(o, v,
           }
           Fl_Text_Editor {} {uid 13f0
             label {Comment:}
-            callback {if (!current_node || !current_node->is_a(Type::CodeBlock)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_CodeBlock)) return;
 CodeBlock_Node* nd = (CodeBlock_Node*)current_node;
 
 if (v == LOAD) {
@@ -3558,7 +3558,7 @@ if (v == LOAD) {
         }
       }
       Fl_Tabs code_tabs {uid f3cf
-        callback {if (current_node && current_node->is_a(Type::Code))
+        callback {if (current_node && current_node->is_a(FLD_NODE_TYPE_Code))
   propagate_load((Fl_Group *)o,v);}
         xywh {10 10 400 350} selection_color 12 labelsize 11 labelcolor 255 hide
       } {
@@ -3568,7 +3568,7 @@ if (v == LOAD) {
           xywh {10 30 400 330} labelsize 11 resizable
         } {
           Fl_Text_Editor {} {uid ff87
-            callback {if (!current_node || !current_node->is_a(Type::Code)) return;
+            callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Code)) return;
 Code_Node* nd = (Code_Node*)current_node;
  if (v == LOAD) {
   the_panel->label("Code Editor");
@@ -3600,7 +3600,7 @@ o->linenumber_size(o->Fl_Text_Display::textsize());}
         }
       }
       Fl_Tabs func_tabs {uid 2983
-        callback {if (current_node && current_node->is_a(Type::Function))
+        callback {if (current_node && current_node->is_a(FLD_NODE_TYPE_Function))
   propagate_load((Fl_Group *)o,v);}
         xywh {10 10 400 350} selection_color 12 labelsize 11 labelcolor 255 hide resizable
       } {
@@ -3621,7 +3621,7 @@ o->linenumber_size(o->Fl_Text_Display::textsize());}
               xywh {95 50 1 20} labelfont 1 labelsize 11 align 4
             }
             Fl_Choice {} {uid 8105
-              callback {if (!current_node || !current_node->is_a(Type::Function)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
 Function_Node* nd = (Function_Node*)current_node;
 
 if (v == LOAD) {
@@ -3656,7 +3656,7 @@ if (v == LOAD) {
               }
             }
             Fl_Choice {} {uid 2fa7
-              callback {if (!current_node || !current_node->is_a(Type::Function)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
 Function_Node* nd = (Function_Node*)current_node;
 
 if (v == LOAD) {
@@ -3692,7 +3692,7 @@ if (v == LOAD) {
             }
             Fl_Check_Button {} {uid 4f85
               label {declare "C"}
-              callback {if (!current_node || !current_node->is_a(Type::Function)) return;
+              callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
 Function_Node* nd = (Function_Node*)current_node;
 
 if (v == LOAD) {
@@ -3721,7 +3721,7 @@ if (v == LOAD) {
                 label {Function
 Name and
 Args:}
-                callback {if (!current_node || !current_node->is_a(Type::Function)) return;
+                callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
 Function_Node* nd = (Function_Node*)current_node;
 
 if (v == LOAD) {
@@ -3752,7 +3752,7 @@ if (v == LOAD) {
             } {
               Fl_Text_Editor {} {uid 3fba
                 label {Return Type:}
-                callback {if (!current_node || !current_node->is_a(Type::Function)) return;
+                callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
 Function_Node* nd = (Function_Node*)current_node;
 update_current(o, v,
   [nd](){return nd->return_type();},
@@ -3770,7 +3770,7 @@ update_current(o, v,
             } {
               Fl_Text_Editor {} {uid b95f
                 label {Comment:}
-                callback {if (!current_node || !current_node->is_a(Type::Function)) return;
+                callback {if (!current_node || !current_node->is_a(FLD_NODE_TYPE_Function)) return;
 Function_Node* nd = (Function_Node*)current_node;
 
 if (v == LOAD) {
diff --git a/fluid/panels/widget_panel/Grid_Child_Tab.cxx b/fluid/panels/widget_panel/Grid_Child_Tab.cxx
index b0f943803..d39f46477 100644
--- a/fluid/panels/widget_panel/Grid_Child_Tab.cxx
+++ b/fluid/panels/widget_panel/Grid_Child_Tab.cxx
@@ -84,7 +84,7 @@ void Grid_Child_Tab::cb_widget_grid_transient(Fl_Box* o, void* v) {
 void Grid_Child_Tab::cb_Horizontal_i(Fl_Choice* o, void* v) {
   if (   !current_widget
         || !current_widget->parent
-        || !current_widget->parent->is_a(Type::Grid))
+        || !current_widget->parent->is_a(FLD_NODE_TYPE_Grid))
     {
       return;
     }
@@ -131,7 +131,7 @@ Fl_Menu_Item* Grid_Child_Tab::GRID_LEFT = Grid_Child_Tab::menu_Horizontal + 0;
 void Grid_Child_Tab::cb_Vertical_i(Fl_Choice* o, void* v) {
   if (   !current_widget
         || !current_widget->parent
-        || !current_widget->parent->is_a(Type::Grid))
+        || !current_widget->parent->is_a(FLD_NODE_TYPE_Grid))
     {
       return;
     }
@@ -470,7 +470,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
 void Grid_Child_Tab::grid_child_cb(fld::widget::Formula_Input* i, void* v, int what) {
   if (   !current_widget
         || !current_widget->parent
-        || !current_widget->parent->is_a(Type::Grid))
+        || !current_widget->parent->is_a(FLD_NODE_TYPE_Grid))
     {
       return;
     }
diff --git a/fluid/panels/widget_panel/Grid_Child_Tab.fl b/fluid/panels/widget_panel/Grid_Child_Tab.fl
index 0fa9ffef9..4bd3744d6 100644
--- a/fluid/panels/widget_panel/Grid_Child_Tab.fl
+++ b/fluid/panels/widget_panel/Grid_Child_Tab.fl
@@ -120,7 +120,7 @@ widget_class Grid_Child_Tab {
       label Horizontal
       callback {if (   !current_widget
       || !current_widget->parent
-      || !current_widget->parent->is_a(Type::Grid))
+      || !current_widget->parent->is_a(FLD_NODE_TYPE_Grid))
   {
     return;
   }
@@ -177,7 +177,7 @@ widget_class Grid_Child_Tab {
       label Vertical
       callback {if (   !current_widget
       || !current_widget->parent
-      || !current_widget->parent->is_a(Type::Grid))
+      || !current_widget->parent->is_a(FLD_NODE_TYPE_Grid))
   {
     return;
   }
@@ -329,7 +329,7 @@ widget_class Grid_Child_Tab {
   } {
     code {if (   !current_widget
       || !current_widget->parent
-      || !current_widget->parent->is_a(Type::Grid))
+      || !current_widget->parent->is_a(FLD_NODE_TYPE_Grid))
   {
     return;
   }