FLUID: Merging changes from generated cxx file back to fl file

2 files changed, 19 insertions, 19 deletions

diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx
index 2d35b1362..ee6e539fe 100644
--- a/fluid/widget_panel.cxx
+++ b/fluid/widget_panel.cxx
@@ -272,7 +272,7 @@ static void cb_Left(Fl_Value_Input* o, void* v) {
     o->value(m);
   } else {
     int m = (int)o->value(), old_m;
-    grid->margin(&old_m, NULL, NULL, NULL);
+    grid->margin(&old_m, NULL, NULL, NULL); 
     if (m != old_m) {
       grid->margin(m, -1, -1, -1); 
       grid->need_layout(true);
@@ -290,7 +290,7 @@ static void cb_Top(Fl_Value_Input* o, void* v) {
     o->value(m);
   } else {
     int m = (int)o->value(), old_m;
-    grid->margin(NULL, &old_m, NULL, NULL);
+    grid->margin(NULL, &old_m, NULL, NULL); 
     if (m != old_m) {
       grid->margin(-1, m, -1, -1); 
       grid->need_layout(true);
@@ -308,7 +308,7 @@ static void cb_Right(Fl_Value_Input* o, void* v) {
     o->value(m);
   } else {
     int m = (int)o->value(), old_m;
-    grid->margin(NULL, NULL, &old_m, NULL);
+    grid->margin(NULL, NULL, &old_m, NULL); 
     if (m != old_m) {
       grid->margin(-1, -1, m, -1); 
       grid->need_layout(true);
@@ -343,8 +343,8 @@ static void cb_Row(Fl_Value_Input* o, void* v) {
     grid->gap(&m, NULL);
     o->value(m);
   } else {
-    int m = (int)o->value(), old_m;
-    grid->gap(&old_m, NULL);
+    int m = (int)o->value(), old_m, m2;
+    grid->gap(&old_m, &m2);
     if (m != old_m) {
       grid->gap(m, m2);
       grid->need_layout(true);
@@ -361,8 +361,8 @@ static void cb_Col(Fl_Value_Input* o, void* v) {
     grid->gap(NULL, &m);
     o->value(m);
   } else {
-    int m = (int)o->value(), old_m;
-    grid->gap(NULL, &old_m);
+    int m = (int)o->value(), old_m, m2;
+    grid->gap(&m2, &old_m);
     if (m != old_m) {
       grid->gap(m2, m);
       grid->need_layout(true);
@@ -1449,7 +1449,6 @@ access the Widget pointer and \'v\' to access the user value.");
       { widget_tab_grid_child = new Fl_Group(10, 30, 400, 330, "Grid Child");
         widget_tab_grid_child->labelsize(11);
         widget_tab_grid_child->callback((Fl_Callback*)propagate_load);
-        widget_tab_grid_child->hide();
         { Fl_Group* o = new Fl_Group(95, 60, 315, 20, "Location:");
           o->labelfont(1);
           o->labelsize(11);
@@ -1650,6 +1649,7 @@ access the Widget pointer and \'v\' to access the user value.");
       { widget_tab_grid = new Fl_Group(10, 30, 400, 330, "Grid");
         widget_tab_grid->labelsize(11);
         widget_tab_grid->callback((Fl_Callback*)propagate_load);
+        widget_tab_grid->hide();
         { Fl_Group* o = new Fl_Group(95, 60, 315, 20, "Grid Layout:");
           o->labelfont(1);
           o->labelsize(11);
diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl
index dede14fa1..847150b8b 100644
--- a/fluid/widget_panel.fl
+++ b/fluid/widget_panel.fl
@@ -78,7 +78,7 @@ Function {make_widget_panel()} {
 } {
   Fl_Window {} {
     comment {Use a Double Window to avoid flickering.} open
-    xywh {413 247 420 400} type Double labelsize 11 align 80 resizable hotspot
+    xywh {430 248 420 400} type Double labelsize 11 align 80 resizable hotspot
     code0 {o->size_range(o->w(), o->h());} size_range {420 400 0 0} visible
   } {
     Fl_Tabs widget_tabs {
@@ -865,7 +865,7 @@ wCallback->do_callback(wCallback, v);} open
       Fl_Group widget_tab_grid_child {
         label {Grid Child}
         callback propagate_load open
-        xywh {10 30 400 330} labelsize 11 hide
+        xywh {10 30 400 330} labelsize 11
       } {
         Fl_Group {} {
           label {Location:}
@@ -896,7 +896,7 @@ wCallback->do_callback(wCallback, v);} open
           }
           Fl_Input widget_grid_col_input {
             label {Column:}
-            callback grid_set_col_cb
+            callback grid_set_col_cb selected
             xywh {175 60 40 20} labelsize 11 align 5 textsize 11
             class Fluid_Coord_Input
           }
@@ -1075,7 +1075,7 @@ wCallback->do_callback(wCallback, v);} open
       Fl_Group widget_tab_grid {
         label Grid
         callback propagate_load open
-        xywh {10 30 400 330} labelsize 11
+        xywh {10 30 400 330} labelsize 11 hide
       } {
         Fl_Group {} {
           label {Grid Layout:}
@@ -1200,14 +1200,14 @@ if (v == LOAD) {
   grid->margin(&m, NULL, NULL, NULL); 
   o->value(m);
 } else {
-  int m = o->value(), old_m;
+  int m = (int)o->value(), old_m;
   grid->margin(&old_m, NULL, NULL, NULL); 
   if (m != old_m) {
     grid->margin(m, -1, -1, -1); 
     grid->need_layout(true);
     set_modflag(1);
   }
-}} selected
+}}
             tooltip {Left margin in group.} xywh {95 100 55 20} labelsize 11 align 5 maximum 1000 step 1 textsize 11
           }
           Fl_Value_Input {} {
@@ -1219,7 +1219,7 @@ if (v == LOAD) {
   grid->margin(NULL, &m, NULL, NULL); 
   o->value(m);
 } else {
-  int m = o->value(), old_m;
+  int m = (int)o->value(), old_m;
   grid->margin(NULL, &old_m, NULL, NULL); 
   if (m != old_m) {
     grid->margin(-1, m, -1, -1); 
@@ -1238,7 +1238,7 @@ if (v == LOAD) {
   grid->margin(NULL, NULL, &m, NULL); 
   o->value(m);
 } else {
-  int m = o->value(), old_m;
+  int m = (int)o->value(), old_m;
   grid->margin(NULL, NULL, &old_m, NULL); 
   if (m != old_m) {
     grid->margin(-1, -1, m, -1); 
@@ -1257,7 +1257,7 @@ if (v == LOAD) {
   grid->margin(NULL, NULL, NULL, &m);
   o->value(m);
 } else {
-  int m = o->value(), old_m;
+  int m = (int)o->value(), old_m;
   grid->margin(NULL, NULL, NULL, &old_m);
   if (m != old_m) {
     grid->margin(-1, -1, -1, m);
@@ -1285,7 +1285,7 @@ if (v == LOAD) {
   grid->gap(&m, NULL);
   o->value(m);
 } else {
-  int m = o->value(), old_m, m2;
+  int m = (int)o->value(), old_m, m2;
   grid->gap(&old_m, &m2);
   if (m != old_m) {
     grid->gap(m, m2);
@@ -1304,7 +1304,7 @@ if (v == LOAD) {
   grid->gap(NULL, &m);
   o->value(m);
 } else {
-  int m = o->value(), old_m, m2;
+  int m = (int)o->value(), old_m, m2;
   grid->gap(&m2, &old_m);
   if (m != old_m) {
     grid->gap(m2, m);