FLUID: using symbols instead of integers

1 files changed, 60 insertions, 60 deletions

diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl
index 914ebc9f8..177eb4ea2 100644
--- a/fluid/function_panel.fl
+++ b/fluid/function_panel.fl
@@ -31,7 +31,7 @@ decl {\#include "fluid.h"} {private local
 decl {\#include "custom_widgets.h"} {private global
 }
 
-decl {\#include "pixmaps.h"} {selected private local
+decl {\#include "pixmaps.h"} {private local
 }
 
 decl {\#include "factory.h"} {private local
@@ -550,8 +550,8 @@ Function {make_widgetbin()} {open
     callback {if (Fl::event()==FL_SHORTCUT && Fl::event_key()==FL_Escape)
   exit_cb((Fl_Widget*)o, v);
 else
-  toggle_widgetbin_cb((Fl_Widget*)o, v);}
-    xywh {421 218 600 102} type Single align 80 non_modal visible
+  toggle_widgetbin_cb((Fl_Widget*)o, v);} open
+    xywh {436 243 600 102} type Single align 80 non_modal visible
   } {
     Fl_Group {} {
       label Code open
@@ -561,55 +561,55 @@ else
         user_data {"Function"}
         callback type_make_cb
         tooltip Function xywh {5 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[7]);}
+        code0 {o->image(pixmap[Fl_Type::ID::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[12]);}
+        code0 {o->image(pixmap[Fl_Type::ID::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[46]);}
+        code0 {o->image(pixmap[Fl_Type::ID::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[8]);}
+        code0 {o->image(pixmap[Fl_Type::ID::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[9]);}
+        code0 {o->image(pixmap[Fl_Type::ID::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[48]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Widget_Class]);}
       }
       Fl_Button {} {
         user_data {"decl"}
         callback type_make_cb
         tooltip Declaration xywh {5 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[10]);}
+        code0 {o->image(pixmap[Fl_Type::ID::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[11]);}
+        code0 {o->image(pixmap[Fl_Type::ID::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[49]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Data]);}
       }
     }
     Fl_Group {} {
@@ -620,56 +620,56 @@ else
         user_data {"Fl_Window"}
         callback type_make_cb
         tooltip Window xywh {89 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[1]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Window]);}
         class 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[6]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Group]);}
         class 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[22]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Pack]);}
         class 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[13]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Tabs]);}
         class 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[19]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Scroll]);}
         class 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[56]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Flex]);}
         class 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[20]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Tile]);}
         class 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[21]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Wizard]);}
         class Widget_Bin_Button
       }
     }
@@ -681,42 +681,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[2]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Button]);}
         class 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[23]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Return_Button]);}
         class 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[24]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Light_Button]);}
         class 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[25]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Repeat_Button]);}
         class 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[3]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Check_Button]);}
         class 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[4]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Round_Button]);}
         class Widget_Bin_Button
       }
     }
@@ -728,70 +728,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[37]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Slider]);}
         class 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[38]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Scrollbar]);}
         class 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[39]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Value_Slider]);}
         class Widget_Bin_Button
       }
       Fl_Button {} {
         user_data {"Fl_Value_Output"}
-        callback type_make_cb
+        callback type_make_cb selected
         tooltip {Value Output} xywh {307 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[45]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Value_Output]);}
         class 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[40]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Adjuster]);}
         class 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[41]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Counter]);}
         class 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[42]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Dial]);}
         class 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[43]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Roller]);}
         class 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[47]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Spinner]);}
         class 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[44]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Value_Input]);}
         class Widget_Bin_Button
       }
     }
@@ -803,42 +803,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[14]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Input]);}
         class 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[27]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Output]);}
         class 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[29]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Text_Editor]);}
         class 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[28]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Text_Display]);}
         class 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[30]);}
+        code0 {o->image(pixmap[Fl_Type::ID::File_Input]);}
         class Widget_Bin_Button
       }
       Fl_Button {} {
         user_data {"Fl_Simple_Terminal"}
         callback type_make_cb
         tooltip {Simple Terminal} xywh {366 71 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[52]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Simple_Terminal]);}
         class Widget_Bin_Button
       }
     }
@@ -850,56 +850,56 @@ else
         user_data {"Fl_Input_Choice"}
         callback type_make_cb
         tooltip {Input Choice} xywh {400 21 24 24} box THIN_UP_BOX
-        code0 {o->image(pixmap[53]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Input_Choice]);}
         class 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[16]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Menu_Item]);}
         class 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[17]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Menu_Bar]);}
         class 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[26]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Menu_Button]);}
         class 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[54]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Checkbox_Menu_Item]);}
         class 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[18]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Submenu]);}
         class 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[15]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Choice]);}
         class 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[55]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Radio_Menu_Item]);}
         class Widget_Bin_Button
       }
     }
@@ -911,42 +911,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[31]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Browser]);}
         class 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[50]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Tree]);}
         class 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[32]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Check_Browser]);}
         class 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[35]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Help_View]);}
         class 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[33]);}
+        code0 {o->image(pixmap[Fl_Type::ID::File_Browser]);}
         class 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[51]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Table]);}
         class Widget_Bin_Button
       }
     }
@@ -958,21 +958,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[5]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Box]);}
         class 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[34]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Clock]);}
         class 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[36]);}
+        code0 {o->image(pixmap[Fl_Type::ID::Progress]);}
         class Widget_Bin_Button
       }
     }