wip

6 files changed, 123 insertions, 123 deletions

diff --git a/fluid/panels/widget_panel/Grid_Child_Tab.cxx b/fluid/panels/widget_panel/Grid_Child_Tab.cxx
index 674b17bd7..a1d72b9f6 100644
--- a/fluid/panels/widget_panel/Grid_Child_Tab.cxx
+++ b/fluid/panels/widget_panel/Grid_Child_Tab.cxx
@@ -6,11 +6,11 @@
 #include "nodes/Grid_Node.h"
 extern Grid_Child_Tab *widget_tab_grid_child;
 
-void Grid_Child_Tab::cb_widget_grid_row_input_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_row_input_i(Formula_Input* o, void* v) {
   grid_child_cb(o, v, 8);
     if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
-void Grid_Child_Tab::cb_widget_grid_row_input(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_row_input(Formula_Input* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()))->cb_widget_grid_row_input_i(o,v);
 }
 
@@ -34,11 +34,11 @@ void Grid_Child_Tab::cb_1(Fl_Button* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()->parent()))->cb_1_i(o,v);
 }
 
-void Grid_Child_Tab::cb_widget_grid_col_input_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_col_input_i(Formula_Input* o, void* v) {
   grid_child_cb(o, v, 9);
     if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
-void Grid_Child_Tab::cb_widget_grid_col_input(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_col_input(Formula_Input* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()))->cb_widget_grid_col_input_i(o,v);
 }
 
@@ -174,25 +174,25 @@ Fl_Menu_Item Grid_Child_Tab::menu_Vertical[] = {
  {0,0,0,0,0,0,0,0,0}
 };
 
-void Grid_Child_Tab::cb_Width_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_Width_i(Formula_Input* o, void* v) {
   grid_child_cb(o, v, 12);
 }
-void Grid_Child_Tab::cb_Width(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_Width(Formula_Input* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()))->cb_Width_i(o,v);
 }
 
-void Grid_Child_Tab::cb_Height_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_Height_i(Formula_Input* o, void* v) {
   grid_child_cb(o, v, 13);
 }
-void Grid_Child_Tab::cb_Height(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_Height(Formula_Input* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()))->cb_Height_i(o,v);
 }
 
-void Grid_Child_Tab::cb_widget_grid_rowspan_input_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_rowspan_input_i(Formula_Input* o, void* v) {
   grid_child_cb(o, v, 10);
     if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
-void Grid_Child_Tab::cb_widget_grid_rowspan_input(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_rowspan_input(Formula_Input* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()))->cb_widget_grid_rowspan_input_i(o,v);
 }
 
@@ -216,11 +216,11 @@ void Grid_Child_Tab::cb_5(Fl_Button* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()->parent()))->cb_5_i(o,v);
 }
 
-void Grid_Child_Tab::cb_widget_grid_colspan_input_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_colspan_input_i(Formula_Input* o, void* v) {
   grid_child_cb(o, v, 11);
     if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
-void Grid_Child_Tab::cb_widget_grid_colspan_input(fld::widget::Formula_Input* o, void* v) {
+void Grid_Child_Tab::cb_widget_grid_colspan_input(Formula_Input* o, void* v) {
   ((Grid_Child_Tab*)(o->parent()->parent()))->cb_widget_grid_colspan_input_i(o,v);
 }
 
@@ -255,7 +255,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
     o->labelsize(11);
     o->callback((Fl_Callback*)propagate_load);
     o->align(Fl_Align(FL_ALIGN_LEFT));
-    { widget_grid_row_input = new fld::widget::Formula_Input(85, 30, 40, 20, "Row:");
+    { widget_grid_row_input = new Formula_Input(85, 30, 40, 20, "Row:");
       widget_grid_row_input->box(FL_DOWN_BOX);
       widget_grid_row_input->color(FL_BACKGROUND2_COLOR);
       widget_grid_row_input->selection_color(FL_SELECTION_COLOR);
@@ -267,7 +267,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_row_input->callback((Fl_Callback*)cb_widget_grid_row_input);
       widget_grid_row_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_row_input->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_row_input
+    } // Formula_Input* widget_grid_row_input
     { Fl_Group* o = new Fl_Group(125, 30, 30, 20);
       { Fl_Button* o = new Fl_Button(125, 30, 15, 20, "-");
         o->compact(1);
@@ -283,7 +283,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       } // Fl_Button* o
       o->end();
     } // Fl_Group* o
-    { widget_grid_col_input = new fld::widget::Formula_Input(165, 30, 40, 20, "Column:");
+    { widget_grid_col_input = new Formula_Input(165, 30, 40, 20, "Column:");
       widget_grid_col_input->box(FL_DOWN_BOX);
       widget_grid_col_input->color(FL_BACKGROUND2_COLOR);
       widget_grid_col_input->selection_color(FL_SELECTION_COLOR);
@@ -295,7 +295,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_col_input->callback((Fl_Callback*)cb_widget_grid_col_input);
       widget_grid_col_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_col_input->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_col_input
+    } // Formula_Input* widget_grid_col_input
     { Fl_Group* o = new Fl_Group(205, 30, 30, 20);
       { Fl_Button* o = new Fl_Button(205, 30, 15, 20, "-");
         o->compact(1);
@@ -359,7 +359,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
     wp_gridc_size->labelsize(11);
     wp_gridc_size->callback((Fl_Callback*)propagate_load);
     wp_gridc_size->align(Fl_Align(FL_ALIGN_LEFT));
-    { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(85, 105, 55, 20, "Width:");
+    { Formula_Input* o = new Formula_Input(85, 105, 55, 20, "Width:");
       o->box(FL_DOWN_BOX);
       o->color(FL_BACKGROUND2_COLOR);
       o->selection_color(FL_SELECTION_COLOR);
@@ -371,8 +371,8 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       o->callback((Fl_Callback*)cb_Width);
       o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       o->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* o
-    { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(145, 105, 55, 20, "Height:");
+    } // Formula_Input* o
+    { Formula_Input* o = new Formula_Input(145, 105, 55, 20, "Height:");
       o->box(FL_DOWN_BOX);
       o->color(FL_BACKGROUND2_COLOR);
       o->selection_color(FL_SELECTION_COLOR);
@@ -384,7 +384,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       o->callback((Fl_Callback*)cb_Height);
       o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       o->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* o
+    } // Formula_Input* o
     { Fl_Box* o = new Fl_Box(385, 105, 1, 20);
       o->hide();
       Fl_Group::current()->resizable(o);
@@ -396,7 +396,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
     o->labelsize(11);
     o->callback((Fl_Callback*)propagate_load);
     o->align(Fl_Align(FL_ALIGN_LEFT));
-    { widget_grid_rowspan_input = new fld::widget::Formula_Input(85, 140, 40, 20, "Row Span:");
+    { widget_grid_rowspan_input = new Formula_Input(85, 140, 40, 20, "Row Span:");
       widget_grid_rowspan_input->box(FL_DOWN_BOX);
       widget_grid_rowspan_input->color(FL_BACKGROUND2_COLOR);
       widget_grid_rowspan_input->selection_color(FL_SELECTION_COLOR);
@@ -408,7 +408,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_rowspan_input->callback((Fl_Callback*)cb_widget_grid_rowspan_input);
       widget_grid_rowspan_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_rowspan_input->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_rowspan_input
+    } // Formula_Input* widget_grid_rowspan_input
     { Fl_Group* o = new Fl_Group(125, 140, 30, 20);
       { Fl_Button* o = new Fl_Button(125, 140, 15, 20, "-");
         o->compact(1);
@@ -424,7 +424,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       } // Fl_Button* o
       o->end();
     } // Fl_Group* o
-    { widget_grid_colspan_input = new fld::widget::Formula_Input(165, 140, 40, 20, "Col. Span:");
+    { widget_grid_colspan_input = new Formula_Input(165, 140, 40, 20, "Col. Span:");
       widget_grid_colspan_input->box(FL_DOWN_BOX);
       widget_grid_colspan_input->color(FL_BACKGROUND2_COLOR);
       widget_grid_colspan_input->selection_color(FL_SELECTION_COLOR);
@@ -436,7 +436,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_colspan_input->callback((Fl_Callback*)cb_widget_grid_colspan_input);
       widget_grid_colspan_input->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_colspan_input->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_colspan_input
+    } // Formula_Input* widget_grid_colspan_input
     { Fl_Group* o = new Fl_Group(205, 140, 30, 20);
       { Fl_Button* o = new Fl_Button(205, 140, 15, 20, "-");
         o->compact(1);
@@ -467,7 +467,7 @@ Grid_Child_Tab::Grid_Child_Tab(int X, int Y, int W, int H, const char *L) :
   resize(X, Y, W, H);
 }
 
-void Grid_Child_Tab::grid_child_cb(fld::widget::Formula_Input* i, void* v, int what) {
+void Grid_Child_Tab::grid_child_cb(Formula_Input* i, void* v, int what) {
   if (   !current_widget
         || !current_widget->parent
         || !current_widget->parent->is_a(FLD_NODE_TYPE_Grid))
diff --git a/fluid/panels/widget_panel/Grid_Child_Tab.fl b/fluid/panels/widget_panel/Grid_Child_Tab.fl
index 4bd3744d6..dc6b0a5e7 100644
--- a/fluid/panels/widget_panel/Grid_Child_Tab.fl
+++ b/fluid/panels/widget_panel/Grid_Child_Tab.fl
@@ -33,7 +33,7 @@ widget_class Grid_Child_Tab {
       callback {grid_child_cb(o, v, 8);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);}
       xywh {85 30 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {125 30 30 20}
@@ -62,7 +62,7 @@ widget_class Grid_Child_Tab {
       callback {grid_child_cb(o, v, 9);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);}
       xywh {165 30 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {205 30 30 20}
@@ -243,13 +243,13 @@ widget_class Grid_Child_Tab {
       label {Width:}
       callback {grid_child_cb(o, v, 12);}
       xywh {85 105 55 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Input {} {
       label {Height:}
       callback {grid_child_cb(o, v, 13);}
       xywh {145 105 55 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Box {} {
       xywh {385 105 1 20} hide resizable
@@ -265,7 +265,7 @@ widget_class Grid_Child_Tab {
       callback {grid_child_cb(o, v, 10);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);}
       xywh {85 140 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {125 140 30 20}
@@ -294,7 +294,7 @@ widget_class Grid_Child_Tab {
       callback {grid_child_cb(o, v, 11);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);}
       xywh {165 140 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {205 140 30 20}
@@ -325,7 +325,7 @@ widget_class Grid_Child_Tab {
   Fl_Box {} {
     xywh {85 320 300 5} labelsize 11 hide resizable
   }
-  Function {grid_child_cb(fld::widget::Formula_Input* i, void* v, int what)} {open return_type void
+  Function {grid_child_cb(Formula_Input* i, void* v, int what)} {open return_type void
   } {
     code {if (   !current_widget
       || !current_widget->parent
diff --git a/fluid/panels/widget_panel/Grid_Child_Tab.h b/fluid/panels/widget_panel/Grid_Child_Tab.h
index 93cfda78b..6970c69bd 100644
--- a/fluid/panels/widget_panel/Grid_Child_Tab.h
+++ b/fluid/panels/widget_panel/Grid_Child_Tab.h
@@ -13,19 +13,19 @@ extern void propagate_load(Fl_Group*, void*);
 class Grid_Child_Tab : public Fl_Group {
 public:
   Grid_Child_Tab(int X, int Y, int W, int H, const char *L = 0);
-  fld::widget::Formula_Input *widget_grid_row_input;
+  Formula_Input *widget_grid_row_input;
 private:
-  inline void cb_widget_grid_row_input_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_row_input(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_row_input_i(Formula_Input*, void*);
+  static void cb_widget_grid_row_input(Formula_Input*, void*);
   inline void cb__i(Fl_Button*, void*);
   static void cb_(Fl_Button*, void*);
   inline void cb_1_i(Fl_Button*, void*);
   static void cb_1(Fl_Button*, void*);
 public:
-  fld::widget::Formula_Input *widget_grid_col_input;
+  Formula_Input *widget_grid_col_input;
 private:
-  inline void cb_widget_grid_col_input_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_col_input(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_col_input_i(Formula_Input*, void*);
+  static void cb_widget_grid_col_input(Formula_Input*, void*);
   inline void cb_2_i(Fl_Button*, void*);
   static void cb_2(Fl_Button*, void*);
   inline void cb_3_i(Fl_Button*, void*);
@@ -51,29 +51,29 @@ private:
 public:
   Fl_Group *wp_gridc_size;
 private:
-  inline void cb_Width_i(fld::widget::Formula_Input*, void*);
-  static void cb_Width(fld::widget::Formula_Input*, void*);
-  inline void cb_Height_i(fld::widget::Formula_Input*, void*);
-  static void cb_Height(fld::widget::Formula_Input*, void*);
+  inline void cb_Width_i(Formula_Input*, void*);
+  static void cb_Width(Formula_Input*, void*);
+  inline void cb_Height_i(Formula_Input*, void*);
+  static void cb_Height(Formula_Input*, void*);
 public:
-  fld::widget::Formula_Input *widget_grid_rowspan_input;
+  Formula_Input *widget_grid_rowspan_input;
 private:
-  inline void cb_widget_grid_rowspan_input_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_rowspan_input(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_rowspan_input_i(Formula_Input*, void*);
+  static void cb_widget_grid_rowspan_input(Formula_Input*, void*);
   inline void cb_4_i(Fl_Button*, void*);
   static void cb_4(Fl_Button*, void*);
   inline void cb_5_i(Fl_Button*, void*);
   static void cb_5(Fl_Button*, void*);
 public:
-  fld::widget::Formula_Input *widget_grid_colspan_input;
+  Formula_Input *widget_grid_colspan_input;
 private:
-  inline void cb_widget_grid_colspan_input_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_colspan_input(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_colspan_input_i(Formula_Input*, void*);
+  static void cb_widget_grid_colspan_input(Formula_Input*, void*);
   inline void cb_6_i(Fl_Button*, void*);
   static void cb_6(Fl_Button*, void*);
   inline void cb_7_i(Fl_Button*, void*);
   static void cb_7(Fl_Button*, void*);
 public:
-  void grid_child_cb(fld::widget::Formula_Input* i, void* v, int what);
+  void grid_child_cb(Formula_Input* i, void* v, int what);
 };
 #endif
diff --git a/fluid/panels/widget_panel/Grid_Tab.cxx b/fluid/panels/widget_panel/Grid_Tab.cxx
index 4730f0789..2540d95a5 100644
--- a/fluid/panels/widget_panel/Grid_Tab.cxx
+++ b/fluid/panels/widget_panel/Grid_Tab.cxx
@@ -6,7 +6,7 @@
 #include "nodes/Grid_Node.h"
 extern Grid_Tab *widget_tab_grid;
 
-void Grid_Tab::cb_widget_grid_rows_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_rows_i(Formula_Input* o, void* v) {
   // grid_rows_cb
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
@@ -31,7 +31,7 @@ void Grid_Tab::cb_widget_grid_rows_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_widget_grid_rows(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_rows(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()))->cb_widget_grid_rows_i(o,v);
 }
 
@@ -55,7 +55,7 @@ void Grid_Tab::cb_1(Fl_Button* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_1_i(o,v);
 }
 
-void Grid_Tab::cb_widget_grid_cols_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_cols_i(Formula_Input* o, void* v) {
   // grid_rows_cb
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
@@ -80,7 +80,7 @@ void Grid_Tab::cb_widget_grid_cols_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_widget_grid_cols(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_cols(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()))->cb_widget_grid_cols_i(o,v);
 }
 
@@ -250,7 +250,7 @@ void Grid_Tab::cb_Row1(Fl_Group* o, void* v) {
   ((Grid_Tab*)(o->parent()))->cb_Row1_i(o,v);
 }
 
-void Grid_Tab::cb_widget_grid_curr_row_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_curr_row_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int r = o->value(), old_r = r;
@@ -263,7 +263,7 @@ void Grid_Tab::cb_widget_grid_curr_row_i(fld::widget::Formula_Input* o, void* v)
     widget_grid_curr_row_attributes->do_callback(widget_grid_curr_row_attributes, LOAD);
   }
 }
-void Grid_Tab::cb_widget_grid_curr_row(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_curr_row(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()))->cb_widget_grid_curr_row_i(o,v);
 }
 
@@ -287,7 +287,7 @@ void Grid_Tab::cb_5(Fl_Button* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_5_i(o,v);
 }
 
-void Grid_Tab::cb_Height_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Height_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int r = widget_grid_curr_row->value();
@@ -304,11 +304,11 @@ void Grid_Tab::cb_Height_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_Height(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Height(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_Height_i(o,v);
 }
 
-void Grid_Tab::cb_Weight_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Weight_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int r = widget_grid_curr_row->value();
@@ -325,11 +325,11 @@ void Grid_Tab::cb_Weight_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_Weight(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Weight(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_Weight_i(o,v);
 }
 
-void Grid_Tab::cb_Gap_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Gap_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int r = widget_grid_curr_row->value();
@@ -346,11 +346,11 @@ void Grid_Tab::cb_Gap_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_Gap(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Gap(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_Gap_i(o,v);
 }
 
-void Grid_Tab::cb_widget_grid_curr_col_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_curr_col_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int c = o->value(), old_c = c;
@@ -363,7 +363,7 @@ void Grid_Tab::cb_widget_grid_curr_col_i(fld::widget::Formula_Input* o, void* v)
     widget_grid_curr_col_attributes->do_callback(widget_grid_curr_col_attributes, LOAD);
   }
 }
-void Grid_Tab::cb_widget_grid_curr_col(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_widget_grid_curr_col(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()))->cb_widget_grid_curr_col_i(o,v);
 }
 
@@ -387,7 +387,7 @@ void Grid_Tab::cb_7(Fl_Button* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_7_i(o,v);
 }
 
-void Grid_Tab::cb_Width_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Width_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int c = widget_grid_curr_col->value();
@@ -404,11 +404,11 @@ void Grid_Tab::cb_Width_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_Width(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Width(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_Width_i(o,v);
 }
 
-void Grid_Tab::cb_Weight1_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Weight1_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int c = widget_grid_curr_col->value();
@@ -425,11 +425,11 @@ void Grid_Tab::cb_Weight1_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_Weight1(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Weight1(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_Weight1_i(o,v);
 }
 
-void Grid_Tab::cb_Gap1_i(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Gap1_i(Formula_Input* o, void* v) {
   Fl_Grid *grid = Grid_Node::selected();
   if (!grid) return;
   int c = widget_grid_curr_col->value();
@@ -446,7 +446,7 @@ void Grid_Tab::cb_Gap1_i(fld::widget::Formula_Input* o, void* v) {
     }
   }
 }
-void Grid_Tab::cb_Gap1(fld::widget::Formula_Input* o, void* v) {
+void Grid_Tab::cb_Gap1(Formula_Input* o, void* v) {
   ((Grid_Tab*)(o->parent()->parent()->parent()))->cb_Gap1_i(o,v);
 }
 
@@ -460,7 +460,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
     o->labelsize(11);
     o->callback((Fl_Callback*)propagate_load);
     o->align(Fl_Align(FL_ALIGN_LEFT));
-    { widget_grid_rows = new fld::widget::Formula_Input(85, 30, 40, 20, "Rows:");
+    { widget_grid_rows = new Formula_Input(85, 30, 40, 20, "Rows:");
       widget_grid_rows->tooltip("Number of horizontal rows in the Grid group");
       widget_grid_rows->box(FL_DOWN_BOX);
       widget_grid_rows->color(FL_BACKGROUND2_COLOR);
@@ -473,7 +473,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_rows->callback((Fl_Callback*)cb_widget_grid_rows);
       widget_grid_rows->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_rows->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_rows
+    } // Formula_Input* widget_grid_rows
     { Fl_Group* o = new Fl_Group(125, 30, 30, 20);
       { Fl_Button* o = new Fl_Button(125, 30, 15, 20, "-");
         o->compact(1);
@@ -489,7 +489,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
       } // Fl_Button* o
       o->end();
     } // Fl_Group* o
-    { widget_grid_cols = new fld::widget::Formula_Input(165, 30, 40, 20, "Columns:");
+    { widget_grid_cols = new Formula_Input(165, 30, 40, 20, "Columns:");
       widget_grid_cols->tooltip("Number of vertical columns in the Grid group");
       widget_grid_cols->box(FL_DOWN_BOX);
       widget_grid_cols->color(FL_BACKGROUND2_COLOR);
@@ -502,7 +502,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_cols->callback((Fl_Callback*)cb_widget_grid_cols);
       widget_grid_cols->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_cols->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_cols
+    } // Formula_Input* widget_grid_cols
     { Fl_Group* o = new Fl_Group(205, 30, 30, 20);
       { Fl_Button* o = new Fl_Button(205, 30, 15, 20, "-");
         o->compact(1);
@@ -602,7 +602,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
     o->labelsize(11);
     o->callback((Fl_Callback*)cb_Row1);
     o->align(Fl_Align(FL_ALIGN_LEFT));
-    { widget_grid_curr_row = new fld::widget::Formula_Input(85, 145, 40, 20, "Index");
+    { widget_grid_curr_row = new Formula_Input(85, 145, 40, 20, "Index");
       widget_grid_curr_row->box(FL_DOWN_BOX);
       widget_grid_curr_row->color(FL_BACKGROUND2_COLOR);
       widget_grid_curr_row->selection_color(FL_SELECTION_COLOR);
@@ -614,7 +614,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_curr_row->callback((Fl_Callback*)cb_widget_grid_curr_row);
       widget_grid_curr_row->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_curr_row->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_curr_row
+    } // Formula_Input* widget_grid_curr_row
     { Fl_Group* o = new Fl_Group(125, 145, 30, 20);
       o->callback((Fl_Callback*)propagate_load);
       { Fl_Button* o = new Fl_Button(125, 145, 15, 20, "-");
@@ -636,7 +636,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
     } // Fl_Box* o
     { widget_grid_curr_row_attributes = new Fl_Group(170, 145, 175, 20);
       widget_grid_curr_row_attributes->callback((Fl_Callback*)propagate_load);
-      { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(170, 145, 55, 20, "Height:");
+      { Formula_Input* o = new Formula_Input(170, 145, 55, 20, "Height:");
         o->box(FL_DOWN_BOX);
         o->color(FL_BACKGROUND2_COLOR);
         o->selection_color(FL_SELECTION_COLOR);
@@ -648,8 +648,8 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
         o->callback((Fl_Callback*)cb_Height);
         o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
         o->when(FL_WHEN_RELEASE);
-      } // fld::widget::Formula_Input* o
-      { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(230, 145, 55, 20, "Weight:");
+      } // Formula_Input* o
+      { Formula_Input* o = new Formula_Input(230, 145, 55, 20, "Weight:");
         o->box(FL_DOWN_BOX);
         o->color(FL_BACKGROUND2_COLOR);
         o->selection_color(FL_SELECTION_COLOR);
@@ -661,8 +661,8 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
         o->callback((Fl_Callback*)cb_Weight);
         o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
         o->when(FL_WHEN_RELEASE);
-      } // fld::widget::Formula_Input* o
-      { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(290, 145, 55, 20, "Gap:");
+      } // Formula_Input* o
+      { Formula_Input* o = new Formula_Input(290, 145, 55, 20, "Gap:");
         o->box(FL_DOWN_BOX);
         o->color(FL_BACKGROUND2_COLOR);
         o->selection_color(FL_SELECTION_COLOR);
@@ -674,7 +674,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
         o->callback((Fl_Callback*)cb_Gap);
         o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
         o->when(FL_WHEN_RELEASE);
-      } // fld::widget::Formula_Input* o
+      } // Formula_Input* o
       widget_grid_curr_row_attributes->end();
     } // Fl_Group* widget_grid_curr_row_attributes
     { Fl_Box* o = new Fl_Box(390, 145, 1, 20);
@@ -688,7 +688,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
     o->labelsize(11);
     o->callback((Fl_Callback*)propagate_load);
     o->align(Fl_Align(FL_ALIGN_LEFT));
-    { widget_grid_curr_col = new fld::widget::Formula_Input(85, 180, 40, 20, "Index");
+    { widget_grid_curr_col = new Formula_Input(85, 180, 40, 20, "Index");
       widget_grid_curr_col->box(FL_DOWN_BOX);
       widget_grid_curr_col->color(FL_BACKGROUND2_COLOR);
       widget_grid_curr_col->selection_color(FL_SELECTION_COLOR);
@@ -700,7 +700,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
       widget_grid_curr_col->callback((Fl_Callback*)cb_widget_grid_curr_col);
       widget_grid_curr_col->align(Fl_Align(FL_ALIGN_TOP_LEFT));
       widget_grid_curr_col->when(FL_WHEN_RELEASE);
-    } // fld::widget::Formula_Input* widget_grid_curr_col
+    } // Formula_Input* widget_grid_curr_col
     { Fl_Group* o = new Fl_Group(125, 180, 30, 20);
       { Fl_Button* o = new Fl_Button(125, 180, 15, 20, "-");
         o->compact(1);
@@ -721,7 +721,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
     } // Fl_Box* o
     { widget_grid_curr_col_attributes = new Fl_Group(170, 180, 175, 20);
       widget_grid_curr_col_attributes->callback((Fl_Callback*)propagate_load);
-      { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(170, 180, 55, 20, "Width:");
+      { Formula_Input* o = new Formula_Input(170, 180, 55, 20, "Width:");
         o->box(FL_DOWN_BOX);
         o->color(FL_BACKGROUND2_COLOR);
         o->selection_color(FL_SELECTION_COLOR);
@@ -733,8 +733,8 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
         o->callback((Fl_Callback*)cb_Width);
         o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
         o->when(FL_WHEN_RELEASE);
-      } // fld::widget::Formula_Input* o
-      { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(230, 180, 55, 20, "Weight:");
+      } // Formula_Input* o
+      { Formula_Input* o = new Formula_Input(230, 180, 55, 20, "Weight:");
         o->box(FL_DOWN_BOX);
         o->color(FL_BACKGROUND2_COLOR);
         o->selection_color(FL_SELECTION_COLOR);
@@ -746,8 +746,8 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
         o->callback((Fl_Callback*)cb_Weight1);
         o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
         o->when(FL_WHEN_RELEASE);
-      } // fld::widget::Formula_Input* o
-      { fld::widget::Formula_Input* o = new fld::widget::Formula_Input(290, 180, 55, 20, "Gap:");
+      } // Formula_Input* o
+      { Formula_Input* o = new Formula_Input(290, 180, 55, 20, "Gap:");
         o->box(FL_DOWN_BOX);
         o->color(FL_BACKGROUND2_COLOR);
         o->selection_color(FL_SELECTION_COLOR);
@@ -759,7 +759,7 @@ Grid_Tab::Grid_Tab(int X, int Y, int W, int H, const char *L) :
         o->callback((Fl_Callback*)cb_Gap1);
         o->align(Fl_Align(FL_ALIGN_TOP_LEFT));
         o->when(FL_WHEN_RELEASE);
-      } // fld::widget::Formula_Input* o
+      } // Formula_Input* o
       widget_grid_curr_col_attributes->end();
     } // Fl_Group* widget_grid_curr_col_attributes
     { Fl_Box* o = new Fl_Box(390, 180, 1, 20);
diff --git a/fluid/panels/widget_panel/Grid_Tab.fl b/fluid/panels/widget_panel/Grid_Tab.fl
index 422ddf789..231d67361 100644
--- a/fluid/panels/widget_panel/Grid_Tab.fl
+++ b/fluid/panels/widget_panel/Grid_Tab.fl
@@ -54,7 +54,7 @@ if (v == LOAD) {
   }
 }}
       tooltip {Number of horizontal rows in the Grid group} xywh {85 30 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {125 30 30 20}
@@ -104,7 +104,7 @@ if (v == LOAD) {
   }
 }}
       tooltip {Number of vertical columns in the Grid group} xywh {165 30 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {205 30 30 20}
@@ -296,7 +296,7 @@ if (v == LOAD) {
   widget_grid_curr_row_attributes->do_callback(widget_grid_curr_row_attributes, LOAD);
 }}
       xywh {85 145 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {
       callback propagate_load open
@@ -347,7 +347,7 @@ if (v == LOAD) {
   }
 }}
         xywh {170 145 55 20} labelsize 11 align 5 textsize 11
-        class {fld::widget::Formula_Input}
+        class {Formula_Input}
       }
       Fl_Input {} {
         label {Weight:}
@@ -367,7 +367,7 @@ if (v == LOAD) {
   }
 }}
         xywh {230 145 55 20} labelsize 11 align 5 textsize 11
-        class {fld::widget::Formula_Input}
+        class {Formula_Input}
       }
       Fl_Input {} {
         label {Gap:}
@@ -387,7 +387,7 @@ if (v == LOAD) {
   }
 }}
         xywh {290 145 55 20} labelsize 11 align 5 textsize 11
-        class {fld::widget::Formula_Input}
+        class {Formula_Input}
       }
     }
     Fl_Box {} {
@@ -413,7 +413,7 @@ if (v == LOAD) {
   widget_grid_curr_col_attributes->do_callback(widget_grid_curr_col_attributes, LOAD);
 }}
       xywh {85 180 40 20} labelsize 11 align 5 textsize 11
-      class {fld::widget::Formula_Input}
+      class {Formula_Input}
     }
     Fl_Group {} {open
       xywh {125 180 30 20}
@@ -463,7 +463,7 @@ if (v == LOAD) {
   }
 }}
         xywh {170 180 55 20} labelsize 11 align 5 textsize 11
-        class {fld::widget::Formula_Input}
+        class {Formula_Input}
       }
       Fl_Input {} {
         label {Weight:}
@@ -483,7 +483,7 @@ if (v == LOAD) {
   }
 }}
         xywh {230 180 55 20} labelsize 11 align 5 textsize 11
-        class {fld::widget::Formula_Input}
+        class {Formula_Input}
       }
       Fl_Input {} {
         label {Gap:}
@@ -503,7 +503,7 @@ if (v == LOAD) {
   }
 }}
         xywh {290 180 55 20} labelsize 11 align 5 textsize 11
-        class {fld::widget::Formula_Input}
+        class {Formula_Input}
       }
     }
     Fl_Box {} {
diff --git a/fluid/panels/widget_panel/Grid_Tab.h b/fluid/panels/widget_panel/Grid_Tab.h
index 4b06a9e43..c562f345a 100644
--- a/fluid/panels/widget_panel/Grid_Tab.h
+++ b/fluid/panels/widget_panel/Grid_Tab.h
@@ -13,19 +13,19 @@ extern void propagate_load(Fl_Group*, void*);
 class Grid_Tab : public Fl_Group {
 public:
   Grid_Tab(int X, int Y, int W, int H, const char *L = 0);
-  fld::widget::Formula_Input *widget_grid_rows;
+  Formula_Input *widget_grid_rows;
 private:
-  inline void cb_widget_grid_rows_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_rows(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_rows_i(Formula_Input*, void*);
+  static void cb_widget_grid_rows(Formula_Input*, void*);
   inline void cb__i(Fl_Button*, void*);
   static void cb_(Fl_Button*, void*);
   inline void cb_1_i(Fl_Button*, void*);
   static void cb_1(Fl_Button*, void*);
 public:
-  fld::widget::Formula_Input *widget_grid_cols;
+  Formula_Input *widget_grid_cols;
 private:
-  inline void cb_widget_grid_cols_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_cols(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_cols_i(Formula_Input*, void*);
+  static void cb_widget_grid_cols(Formula_Input*, void*);
   inline void cb_2_i(Fl_Button*, void*);
   static void cb_2(Fl_Button*, void*);
   inline void cb_3_i(Fl_Button*, void*);
@@ -51,10 +51,10 @@ private:
   inline void cb_Row1_i(Fl_Group*, void*);
   static void cb_Row1(Fl_Group*, void*);
 public:
-  fld::widget::Formula_Input *widget_grid_curr_row;
+  Formula_Input *widget_grid_curr_row;
 private:
-  inline void cb_widget_grid_curr_row_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_curr_row(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_curr_row_i(Formula_Input*, void*);
+  static void cb_widget_grid_curr_row(Formula_Input*, void*);
   inline void cb_4_i(Fl_Button*, void*);
   static void cb_4(Fl_Button*, void*);
   inline void cb_5_i(Fl_Button*, void*);
@@ -62,17 +62,17 @@ private:
 public:
   Fl_Group *widget_grid_curr_row_attributes;
 private:
-  inline void cb_Height_i(fld::widget::Formula_Input*, void*);
-  static void cb_Height(fld::widget::Formula_Input*, void*);
-  inline void cb_Weight_i(fld::widget::Formula_Input*, void*);
-  static void cb_Weight(fld::widget::Formula_Input*, void*);
-  inline void cb_Gap_i(fld::widget::Formula_Input*, void*);
-  static void cb_Gap(fld::widget::Formula_Input*, void*);
+  inline void cb_Height_i(Formula_Input*, void*);
+  static void cb_Height(Formula_Input*, void*);
+  inline void cb_Weight_i(Formula_Input*, void*);
+  static void cb_Weight(Formula_Input*, void*);
+  inline void cb_Gap_i(Formula_Input*, void*);
+  static void cb_Gap(Formula_Input*, void*);
 public:
-  fld::widget::Formula_Input *widget_grid_curr_col;
+  Formula_Input *widget_grid_curr_col;
 private:
-  inline void cb_widget_grid_curr_col_i(fld::widget::Formula_Input*, void*);
-  static void cb_widget_grid_curr_col(fld::widget::Formula_Input*, void*);
+  inline void cb_widget_grid_curr_col_i(Formula_Input*, void*);
+  static void cb_widget_grid_curr_col(Formula_Input*, void*);
   inline void cb_6_i(Fl_Button*, void*);
   static void cb_6(Fl_Button*, void*);
   inline void cb_7_i(Fl_Button*, void*);
@@ -80,11 +80,11 @@ private:
 public:
   Fl_Group *widget_grid_curr_col_attributes;
 private:
-  inline void cb_Width_i(fld::widget::Formula_Input*, void*);
-  static void cb_Width(fld::widget::Formula_Input*, void*);
-  inline void cb_Weight1_i(fld::widget::Formula_Input*, void*);
-  static void cb_Weight1(fld::widget::Formula_Input*, void*);
-  inline void cb_Gap1_i(fld::widget::Formula_Input*, void*);
-  static void cb_Gap1(fld::widget::Formula_Input*, void*);
+  inline void cb_Width_i(Formula_Input*, void*);
+  static void cb_Width(Formula_Input*, void*);
+  inline void cb_Weight1_i(Formula_Input*, void*);
+  static void cb_Weight1(Formula_Input*, void*);
+  inline void cb_Gap1_i(Formula_Input*, void*);
+  static void cb_Gap1(Formula_Input*, void*);
 };
 #endif