FLUID: Adds transient cells to Fl_Grid

This allows multiple widgets to occupy a single cell which is
needed when moving cells across the grid interactively.

1 files changed, 17 insertions, 4 deletions

diff --git a/FL/Fl_Grid.H b/FL/Fl_Grid.H
index b240ca95b..403c6c0f3 100644
--- a/FL/Fl_Grid.H
+++ b/FL/Fl_Grid.H
@@ -159,10 +159,10 @@ public:
 
   public:
 
-    Cell(int row, int col) {
+    void Cell_() {
       next_ = NULL;
-      row_ = row;
-      col_ = col;
+      row_ = 0;
+      col_ = 0;
       rowspan_ = 1;
       colspan_ = 1;
       widget_ = NULL;
@@ -171,6 +171,19 @@ public:
       align_ = 0;
     }
 
+    Cell(int row, int col) {
+      Cell_();
+      row_ = row;
+      col_ = col;
+    }
+
+    Cell(Fl_Widget *w, int row, int col) {
+      Cell_();
+      widget_ = w;
+      row_ = row;
+      col_ = col;
+    }
+
     ~Cell() {}
 
     Fl_Widget *widget() { return widget_; }
@@ -211,7 +224,7 @@ protected:
   Fl_Color grid_color;        // color for drawing the grid lines (design helper)
   bool draw_grid_;            // draw the grid for testing / design
 
-private:
+protected:
   void init();
   Cell *add_cell(int row, int col);
   void remove_cell(int row, int col);