wip

1 files changed, 40 insertions, 40 deletions

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);