Make the Table resize automatically. Remove cruft.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3028 57a11ea4-9604-0410-9ed3-97b8803252fd

src/MultiLedger.c

@@ -304,9 +304,11 @@ xaccGUIDCopy (gpointer _to, gconstpointer _from)
   const GUID *from = _from;
 
   g_return_if_fail(to != NULL);
-  g_return_if_fail(from != NULL);
 
-  *to = *from;
+  if (from == NULL)
+    *to = *xaccGUIDNULL();
+  else
+    *to = *from;
 }
 
 /********************************************************************\

src/SplitLedger.c

@@ -3302,7 +3302,6 @@ xaccSRCountRows (SplitRegister *reg,
      save_cursor_virt_row = 1;
 
    /* finally, record the values */
-   reg->num_virt_rows = num_virt_rows;
    reg->cursor_virt_row = save_cursor_virt_row;
 
    if (ext_found_trans != NULL)
@@ -3327,7 +3326,6 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist,
    SplitRegisterBuffer *reg_buffer;
    CellBlock *lead_cursor;
    Transaction *find_trans;
-   Split *last_split = NULL;
    Split *find_trans_split;
    Split *find_split;
    Split *split;
@@ -3343,7 +3341,6 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist,
    gboolean dynamic;
 
    VirtualCellLocation vcell_loc;
-   VirtualLocation virt_loc;
 
    SplitRegisterType type;
    SplitRegisterStyle style;
@@ -3355,7 +3352,8 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist,
    xaccSplitRegisterConfigColors (reg);
 
    /* make sure we have a blank split */
-   if (blank_split == NULL) {
+   if (blank_split == NULL)
+   {
      Transaction *trans;
 
      trans = xaccMallocTransaction ();
@@ -3377,7 +3375,7 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist,
    style = reg->style;
    multi_line  = (REG_MULTI_LINE == style);
    dynamic = ((REG_SINGLE_DYNAMIC == style) || (REG_DOUBLE_DYNAMIC == style));
-   if ((REG_SINGLE_LINE == style) ||
+   if ((REG_SINGLE_LINE    == style) ||
        (REG_SINGLE_DYNAMIC == style))
       lead_cursor = reg->single_cursor;
    else
@@ -3412,32 +3410,32 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist,
    /* disable move callback -- we don't want the cascade of 
     * callbacks while we are fiddling with loading the register */
    table->move_cursor = NULL;
-   virt_loc.vcell_loc.virt_row = -1;
-   virt_loc.vcell_loc.virt_col = -1;
-   virt_loc.phys_row_offset = -1;
-   virt_loc.phys_col_offset = -1;
-   gnc_table_move_cursor_gui (table, virt_loc);
 
-   /* resize the table to the sizes we just counted above */
-   /* num_virt_cols is always one. */
-   gnc_table_set_size (table, reg->num_virt_rows, 1);
+   /* invalidate the cursor */
+   {
+     VirtualLocation virt_loc;
+
+     virt_loc.vcell_loc.virt_row = -1;
+     virt_loc.vcell_loc.virt_col = -1;
+     virt_loc.phys_row_offset = -1;
+     virt_loc.phys_col_offset = -1;
+     gnc_table_move_cursor_gui (table, virt_loc);
+   }
 
    /* make sure that the header is loaded */
    vcell_loc.virt_row = 0;
    vcell_loc.virt_col = 0;
-   gnc_table_set_cursor (table, reg->header, vcell_loc);
+   gnc_table_set_vcell (table, reg->header, NULL, vcell_loc);
+   vcell_loc.virt_row++;
 
    /* populate the table */
-   i = 0;
-   vcell_loc.virt_row = 1;  /* header is vrow zero */
-
    if (slist)
      split = slist[0]; 
    else
      split = NULL;
 
-   while (split) {
-
+   for (i = 0; split; i++, split = slist[i])
+   {
      if (pending_trans == xaccSplitGetParent (split))
        found_pending = TRUE;
 
@@ -3488,10 +3486,9 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist,
             Split * secondary;
             int j = 0;
 
-            gnc_table_set_cursor (table, reg->trans_cursor, vcell_loc);
-            gnc_table_set_virt_cell_data (table, vcell_loc,
-                                          xaccSplitGetGUID (split));
-            vcell_loc.virt_row ++;
+            gnc_table_set_vcell (table, reg->trans_cursor,
+                                 xaccSplitGetGUID (split), vcell_loc);
+            vcell_loc.virt_row++;
 
             /* loop over all of the splits in the transaction. The
              * do..while will automatically put a blank (null) split
@@ -3501,28 +3498,22 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist,
                secondary = xaccTransGetSplit (trans, j);
 
                if (secondary != split) {
-                  gnc_table_set_cursor (table, reg->split_cursor, vcell_loc);
-                  gnc_table_set_virt_cell_data (table, vcell_loc,
-                                                xaccSplitGetGUID (secondary));
-                  vcell_loc.virt_row ++;
+                  gnc_table_set_vcell (table, reg->split_cursor,
+                                       xaccSplitGetGUID (secondary),
+                                       vcell_loc);
+                  vcell_loc.virt_row++;
                }
 
                j++;
             } while (secondary);
-
          }
          else {
            /* the simple case ... */
-           gnc_table_set_cursor (table, lead_cursor, vcell_loc);
-           gnc_table_set_virt_cell_data (table, vcell_loc,
-                                          xaccSplitGetGUID (split));
-           vcell_loc.virt_row ++;
+           gnc_table_set_vcell (table, lead_cursor,
+                                xaccSplitGetGUID (split), vcell_loc);
+           vcell_loc.virt_row++;
          }
       }
-
-      last_split = split;
-      i++; 
-      split = slist[i];
    }
 
    /* add the blank split at the end. */
@@ -3532,8 +3523,8 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist,
 
    if (multi_line || (dynamic && info->blank_split_edited)) {
       /* do the transaction row of the blank split */
-      gnc_table_set_cursor (table, reg->trans_cursor, vcell_loc);
-      gnc_table_set_virt_cell_data (table, vcell_loc, xaccSplitGetGUID (split));
+      gnc_table_set_vcell (table, reg->trans_cursor,
+                           xaccSplitGetGUID (split), vcell_loc);
       vcell_loc.virt_row ++;
 
       if (multi_line || (dynamic && on_blank_split)) {
@@ -3547,9 +3538,8 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist,
           secondary = xaccTransGetSplit (trans, j);
 
           if (secondary != split) {
-            gnc_table_set_cursor (table, reg->split_cursor, vcell_loc);
-            gnc_table_set_virt_cell_data (table, vcell_loc,
-                                          xaccSplitGetGUID (secondary));
+            gnc_table_set_vcell (table, reg->split_cursor,
+                                 xaccSplitGetGUID (secondary), vcell_loc);
             vcell_loc.virt_row ++;
           }
 
@@ -3558,11 +3548,15 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist,
       }
    }
    else {
-     gnc_table_set_cursor (table, lead_cursor, vcell_loc);
-     gnc_table_set_virt_cell_data (table, vcell_loc, xaccSplitGetGUID (split));
+     gnc_table_set_vcell (table, lead_cursor,
+                          xaccSplitGetGUID (split), vcell_loc);
      vcell_loc.virt_row ++;
    }
 
+   /* resize the table to the sizes we just counted above */
+   /* num_virt_cols is always one. */
+   gnc_table_set_size (table, vcell_loc.virt_row, 1);
+
    /* restore the cursor to its rightful position */
    {
      VirtualLocation v_loc;

src/register/splitreg.c

@@ -904,32 +904,28 @@ xaccInitSplitRegister (SplitRegister *reg,
   /* add menu items for the action cell */
   configAction (reg);
 
-  reg->cursor_virt_row = 1;
-  reg->num_virt_rows = 2;  /* one header, one single_cursor */
-
   table = gnc_table_new (entry_handler, fg_color_handler, reg,
                          allocator, deallocator, copy);
 
-  gnc_table_set_size (table, reg->num_virt_rows, 1);
-
   /* Set up header */
   {
     VirtualCellLocation vcell_loc = { 0, 0 };
 
-    gnc_table_set_cursor (table, header, vcell_loc);
+    gnc_table_set_vcell (table, header, NULL, vcell_loc);
   }
 
   /* Set up first and only initial row */
   {
     VirtualLocation vloc;
 
-    vloc.vcell_loc.virt_row = reg->cursor_virt_row;
+    vloc.vcell_loc.virt_row = 1;
     vloc.vcell_loc.virt_col = 0;
     vloc.phys_row_offset = 0;
     vloc.phys_col_offset = 0;
 
-    gnc_table_set_cursor (table, reg->single_cursor, vloc.vcell_loc);
+    gnc_table_set_vcell (table, reg->single_cursor, NULL, vloc.vcell_loc);
     gnc_table_move_cursor (table, vloc);
+    reg->cursor_virt_row = 1;
   }
 
   reg->table = table;

src/register/splitreg.h

@@ -185,8 +185,6 @@ struct _SplitRegister
    SplitRegisterStyle style;
 
    /* some private data; outsiders should not access this */
-   int num_virt_rows;
-
    int cursor_virt_row;
 
    BasicCell *header_cells[CELL_TYPE_COUNT];

src/register/table-allgui.c

@@ -437,20 +437,34 @@ gnc_table_resize (Table * table, int new_virt_rows, int new_virt_cols)
 /* ==================================================== */
 
 void
-gnc_table_set_cursor (Table *table, CellBlock *curs,
-                      VirtualCellLocation vcell_loc)
+gnc_table_set_vcell (Table *table,
+                     CellBlock *cursor,
+                     gconstpointer vcell_data,
+                     VirtualCellLocation vcell_loc)
 {
   VirtualCell *vcell;
 
-  if ((table == NULL) || (curs == NULL))
+  if ((table == NULL) || (cursor == NULL))
     return;
 
+  if ((vcell_loc.virt_row >= table->num_virt_rows) ||
+      (vcell_loc.virt_col >= table->num_virt_cols))
+    gnc_table_resize (table,
+                      MAX (table->num_virt_rows, vcell_loc.virt_row + 1),
+                      MAX (table->num_virt_cols, vcell_loc.virt_col + 1));
+
   vcell = gnc_table_get_virtual_cell (table, vcell_loc);
   if (vcell == NULL)
     return;
 
   /* this cursor is the handler for this block */
-  vcell->cellblock = curs;
+  vcell->cellblock = cursor;
+
+  /* copy the vcell user data */
+  if (table->vcell_data_copy)
+    table->vcell_data_copy (vcell->vcell_data, vcell_data);
+  else
+    vcell->vcell_data = (gpointer) vcell_data;
 }
 
 /* ==================================================== */

src/register/table-allgui.h

@@ -251,8 +251,9 @@ void        gnc_table_set_size (Table * table, int virt_rows, int virt_cols);
 void        gnc_table_create_cursor (Table *table, CellBlock *cursor);
 
 /* Indicate what handler should be used for a given virtual block */
-void        gnc_table_set_cursor (Table *table, CellBlock *curs,
-                                  VirtualCellLocation vcell_loc);
+void        gnc_table_set_vcell (Table *table, CellBlock *cursor,
+                                 gconstpointer vcell_data,
+                                 VirtualCellLocation vcell_loc);
 
 /* Set the virtual cell data for a particular location. */
 void        gnc_table_set_virt_cell_data (Table *table,