wip

1 files changed, 69 insertions, 69 deletions

diff --git a/fluid/rsrcs/pixmaps.cxx b/fluid/rsrcs/pixmaps.cxx
index 640cf79d9..486c98267 100644
--- a/fluid/rsrcs/pixmaps.cxx
+++ b/fluid/rsrcs/pixmaps.cxx
@@ -90,7 +90,7 @@ Fl_Pixmap *protected_pixmap;
 Fl_Pixmap *invisible_pixmap;
 Fl_Pixmap *compressed_pixmap;
 
-Fl_Pixmap *pixmap[(int)Type::Max_] = { nullptr };
+Fl_Pixmap *pixmap[(int)FLD_NODE_TYPE_Max_] = { nullptr };
 
 /**
  Draw a zoom cross pointing in all four diagonal directions
@@ -152,74 +152,74 @@ void loadPixmaps()
   invisible_pixmap = new Fl_Pixmap(invisible_xpm); invisible_pixmap->scale(16, 16);
   compressed_pixmap = new Fl_Pixmap(compressed_xpm); compressed_pixmap->scale(16, 16);
 
-  pixmap[(int)Type::Window] = tmp = new Fl_Pixmap(flWindow_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Button] = tmp = new Fl_Pixmap(flButton_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Check_Button] = tmp = new Fl_Pixmap(flCheckButton_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Round_Button] = tmp = new Fl_Pixmap(flRoundButton_xpm); tmp->scale(16, 16);
-
-  pixmap[(int)Type::Box] = tmp = new Fl_Pixmap(flBox_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Group] = tmp = new Fl_Pixmap(flGroup_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Function] = tmp = new Fl_Pixmap(flFunction_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Code] = tmp = new Fl_Pixmap(flCode_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::CodeBlock] = tmp = new Fl_Pixmap(flCodeBlock_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Decl] = tmp = new Fl_Pixmap(flDeclaration_xpm); tmp->scale(16, 16);
-
-  pixmap[(int)Type::DeclBlock] = tmp = new Fl_Pixmap(flDeclarationBlock_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Class] = tmp = new Fl_Pixmap(flClass_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Tabs] = tmp = new Fl_Pixmap(flTabs_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Input] = tmp = new Fl_Pixmap(flInput_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Choice] = tmp = new Fl_Pixmap(flChoice_xpm); tmp->scale(16, 16);
-
-  pixmap[(int)Type::Menu_Item] = tmp = new Fl_Pixmap(flMenuitem_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Menu_Bar] = tmp = new Fl_Pixmap(flMenubar_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Submenu] = tmp = new Fl_Pixmap(flSubmenu_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Scroll] = tmp = new Fl_Pixmap(flScroll_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Tile] = tmp = new Fl_Pixmap(flTile_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Wizard] = tmp = new Fl_Pixmap(flWizard_xpm); tmp->scale(16, 16);
-
-  pixmap[(int)Type::Pack] = tmp = new Fl_Pixmap(flPack_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Return_Button] = tmp = new Fl_Pixmap(flReturnButton_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Light_Button] = tmp = new Fl_Pixmap(flLightButton_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Repeat_Button] = tmp = new Fl_Pixmap(flRepeatButton_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Menu_Button] = tmp = new Fl_Pixmap(flMenuButton_xpm); tmp->scale(16, 16);
-
-  pixmap[(int)Type::Output] = tmp = new Fl_Pixmap(flOutput_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Text_Display] = tmp = new Fl_Pixmap(flTextDisplay_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Text_Editor] = tmp = new Fl_Pixmap(flTextEdit_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::File_Input] = tmp = new Fl_Pixmap(flFileInput_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Browser] = tmp = new Fl_Pixmap(flBrowser_xpm); tmp->scale(16, 16);
-
-  pixmap[(int)Type::Check_Browser] = tmp = new Fl_Pixmap(flCheckBrowser_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::File_Browser] = tmp = new Fl_Pixmap(flFileBrowser_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Clock] = tmp = new Fl_Pixmap(flClock_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Help_View] = tmp = new Fl_Pixmap(flHelp_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Progress] = tmp = new Fl_Pixmap(flProgress_xpm); tmp->scale(16, 16);
-
-  pixmap[(int)Type::Slider] = tmp = new Fl_Pixmap(flSlider_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Scrollbar] = tmp = new Fl_Pixmap(flScrollBar_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Value_Slider] = tmp = new Fl_Pixmap(flValueSlider_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Adjuster] = tmp = new Fl_Pixmap(flAdjuster_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Counter] = tmp = new Fl_Pixmap(flCounter_xpm); tmp->scale(16, 16);
-
-  pixmap[(int)Type::Dial] = tmp = new Fl_Pixmap(flDial_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Roller] = tmp = new Fl_Pixmap(flRoller_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Value_Input] = tmp = new Fl_Pixmap(flValueInput_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Value_Output] = tmp = new Fl_Pixmap(flValueOutput_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Comment] = tmp = new Fl_Pixmap(flComment_xpm); tmp->scale(16, 16);
-
-  pixmap[(int)Type::Spinner] = tmp = new Fl_Pixmap(flSpinner_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Widget_Class] = tmp = new Fl_Pixmap(flWidgetClass_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Data] = tmp = new Fl_Pixmap(flData_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Tree] = tmp = new Fl_Pixmap(flTree_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Table] = tmp = new Fl_Pixmap(flTable_xpm); tmp->scale(16, 16);
-
-  pixmap[(int)Type::Terminal] = tmp = new Fl_Pixmap(flSimpleTerminal_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Input_Choice] = tmp = new Fl_Pixmap(flInputChoice_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Checkbox_Menu_Item] = tmp = new Fl_Pixmap(flCheckMenuitem_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Radio_Menu_Item] = tmp = new Fl_Pixmap(flRadioMenuitem_xpm); tmp->scale(16, 16);
-
-  pixmap[(int)Type::Flex] = tmp = new Fl_Pixmap(flFlex_xpm); tmp->scale(16, 16);
-  pixmap[(int)Type::Grid] = tmp = new Fl_Pixmap(flGrid_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Window] = tmp = new Fl_Pixmap(flWindow_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Button] = tmp = new Fl_Pixmap(flButton_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Check_Button] = tmp = new Fl_Pixmap(flCheckButton_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Round_Button] = tmp = new Fl_Pixmap(flRoundButton_xpm); tmp->scale(16, 16);
+
+  pixmap[(int)FLD_NODE_TYPE_Box] = tmp = new Fl_Pixmap(flBox_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Group] = tmp = new Fl_Pixmap(flGroup_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Function] = tmp = new Fl_Pixmap(flFunction_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Code] = tmp = new Fl_Pixmap(flCode_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_CodeBlock] = tmp = new Fl_Pixmap(flCodeBlock_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Decl] = tmp = new Fl_Pixmap(flDeclaration_xpm); tmp->scale(16, 16);
+
+  pixmap[(int)FLD_NODE_TYPE_DeclBlock] = tmp = new Fl_Pixmap(flDeclarationBlock_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Class] = tmp = new Fl_Pixmap(flClass_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Tabs] = tmp = new Fl_Pixmap(flTabs_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Input] = tmp = new Fl_Pixmap(flInput_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Choice] = tmp = new Fl_Pixmap(flChoice_xpm); tmp->scale(16, 16);
+
+  pixmap[(int)FLD_NODE_TYPE_Menu_Item] = tmp = new Fl_Pixmap(flMenuitem_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Menu_Bar] = tmp = new Fl_Pixmap(flMenubar_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Submenu] = tmp = new Fl_Pixmap(flSubmenu_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Scroll] = tmp = new Fl_Pixmap(flScroll_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Tile] = tmp = new Fl_Pixmap(flTile_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Wizard] = tmp = new Fl_Pixmap(flWizard_xpm); tmp->scale(16, 16);
+
+  pixmap[(int)FLD_NODE_TYPE_Pack] = tmp = new Fl_Pixmap(flPack_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Return_Button] = tmp = new Fl_Pixmap(flReturnButton_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Light_Button] = tmp = new Fl_Pixmap(flLightButton_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Repeat_Button] = tmp = new Fl_Pixmap(flRepeatButton_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Menu_Button] = tmp = new Fl_Pixmap(flMenuButton_xpm); tmp->scale(16, 16);
+
+  pixmap[(int)FLD_NODE_TYPE_Output] = tmp = new Fl_Pixmap(flOutput_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Text_Display] = tmp = new Fl_Pixmap(flTextDisplay_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Text_Editor] = tmp = new Fl_Pixmap(flTextEdit_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_File_Input] = tmp = new Fl_Pixmap(flFileInput_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Browser] = tmp = new Fl_Pixmap(flBrowser_xpm); tmp->scale(16, 16);
+
+  pixmap[(int)FLD_NODE_TYPE_Check_Browser] = tmp = new Fl_Pixmap(flCheckBrowser_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_File_Browser] = tmp = new Fl_Pixmap(flFileBrowser_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Clock] = tmp = new Fl_Pixmap(flClock_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Help_View] = tmp = new Fl_Pixmap(flHelp_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Progress] = tmp = new Fl_Pixmap(flProgress_xpm); tmp->scale(16, 16);
+
+  pixmap[(int)FLD_NODE_TYPE_Slider] = tmp = new Fl_Pixmap(flSlider_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Scrollbar] = tmp = new Fl_Pixmap(flScrollBar_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Value_Slider] = tmp = new Fl_Pixmap(flValueSlider_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Adjuster] = tmp = new Fl_Pixmap(flAdjuster_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Counter] = tmp = new Fl_Pixmap(flCounter_xpm); tmp->scale(16, 16);
+
+  pixmap[(int)FLD_NODE_TYPE_Dial] = tmp = new Fl_Pixmap(flDial_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Roller] = tmp = new Fl_Pixmap(flRoller_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Value_Input] = tmp = new Fl_Pixmap(flValueInput_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Value_Output] = tmp = new Fl_Pixmap(flValueOutput_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Comment] = tmp = new Fl_Pixmap(flComment_xpm); tmp->scale(16, 16);
+
+  pixmap[(int)FLD_NODE_TYPE_Spinner] = tmp = new Fl_Pixmap(flSpinner_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Widget_Class] = tmp = new Fl_Pixmap(flWidgetClass_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Data] = tmp = new Fl_Pixmap(flData_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Tree] = tmp = new Fl_Pixmap(flTree_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Table] = tmp = new Fl_Pixmap(flTable_xpm); tmp->scale(16, 16);
+
+  pixmap[(int)FLD_NODE_TYPE_Terminal] = tmp = new Fl_Pixmap(flSimpleTerminal_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Input_Choice] = tmp = new Fl_Pixmap(flInputChoice_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Checkbox_Menu_Item] = tmp = new Fl_Pixmap(flCheckMenuitem_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Radio_Menu_Item] = tmp = new Fl_Pixmap(flRadioMenuitem_xpm); tmp->scale(16, 16);
+
+  pixmap[(int)FLD_NODE_TYPE_Flex] = tmp = new Fl_Pixmap(flFlex_xpm); tmp->scale(16, 16);
+  pixmap[(int)FLD_NODE_TYPE_Grid] = tmp = new Fl_Pixmap(flGrid_xpm); tmp->scale(16, 16);
 
   fl_add_symbol("fd_zoom", fd_zoom, 1);
 }