From 7e08eb7004be7b1ece1f049eed99abaca575084c Mon Sep 17 00:00:00 2001 From: Dave Peticolas Date: Tue, 25 Jul 2000 07:07:16 +0000 Subject: [PATCH] basiccell: Use 'gboolean' for use_fg_color and 'use_bg_color'. basiccell, splitreg, SplitLedger: Use 'guint32' for the 'changed' member. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2617 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/SplitLedger.c | 22 +++++++++++----------- src/register/basiccell.h | 15 ++++++++++----- src/register/splitreg.c | 5 ++--- src/register/splitreg.h | 2 +- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/SplitLedger.c b/src/SplitLedger.c index 7abff826d2..7d6b864255 100644 --- a/src/SplitLedger.c +++ b/src/SplitLedger.c @@ -807,9 +807,9 @@ LedgerAutoCompletion(SplitRegister *reg, gncTableTraversalDir dir, Split *blank_split = xaccSplitLookup(&info->blank_split_guid); Transaction *pending_trans = xaccTransLookup(&info->pending_trans_guid); CursorType cursor_type; - unsigned int changed; CellType cell_type; Transaction *trans; + guint32 changed; double amount; Split *split; int new_row; @@ -1046,8 +1046,8 @@ LedgerTraverse (Table *table, int phys_row = *p_new_phys_row; int phys_col = *p_new_phys_col; int virt_row, virt_col; - unsigned int changed; GNCVerifyResult result; + guint32 changed; Split *split; info->exact_traversal = (dir == GNC_TABLE_TRAVERSE_POINTER); @@ -1520,10 +1520,10 @@ xaccSRDuplicateCurrent (SplitRegister *reg) SRInfo *info = xaccSRGetInfo(reg); Split *blank_split = xaccSplitLookup(&info->blank_split_guid); CursorType cursor_type; - unsigned int changed; Transaction *trans; Split *return_split; Split *trans_split; + guint32 changed; Split *split; split = xaccSRGetCurrentSplit(reg); @@ -1645,8 +1645,8 @@ xaccSRCopyCurrent (SplitRegister *reg) SRInfo *info = xaccSRGetInfo(reg); Split *blank_split = xaccSplitLookup(&info->blank_split_guid); CursorType cursor_type; - unsigned int changed; Transaction *trans; + guint32 changed; Split *split; SCM new_item; @@ -1734,8 +1734,8 @@ xaccSRCutCurrent (SplitRegister *reg) SRInfo *info = xaccSRGetInfo(reg); Split *blank_split = xaccSplitLookup(&info->blank_split_guid); CursorType cursor_type; - unsigned int changed; Transaction *trans; + guint32 changed; Split *split; split = xaccSRGetCurrentSplit(reg); @@ -2075,7 +2075,7 @@ void xaccSRCancelCursorSplitChanges (SplitRegister *reg) { Split * split; - unsigned int changed; + guint32 changed; int row = reg->table->current_cursor_phys_row; int col = reg->table->current_cursor_phys_col; @@ -2159,7 +2159,7 @@ static gncBoolean xaccSRSaveRegEntryToSCM (SplitRegister *reg, SCM trans_scm, SCM split_scm) { Transaction *trans; - unsigned int changed; + guint32 changed; /* use the changed flag to avoid heavy-weight updates * of the split & transaction fields. This will help @@ -2321,8 +2321,8 @@ xaccSRSaveRegEntry (SplitRegister *reg, gncBoolean do_commit) Split *blank_split = xaccSplitLookup(&info->blank_split_guid); Transaction *pending_trans = xaccTransLookup(&info->pending_trans_guid); Transaction *blank_trans = xaccSplitGetParent(blank_split); - unsigned int changed; Transaction *trans; + guint32 changed; Split *split; /* get the handle to the current split and transaction */ @@ -2462,7 +2462,7 @@ static GList * xaccSRSaveChangedCells (SplitRegister *reg, Transaction *trans, Split *split) { GList *refresh_accounts = NULL; - unsigned int changed; + guint32 changed; changed = xaccSplitRegisterGetChangeFlag (reg); @@ -3299,7 +3299,7 @@ xaccSRLoadRegister (SplitRegister *reg, Split **slist, SplitRegisterType type; SplitRegisterStyle style; - unsigned int changed; + guint32 changed; int save_phys_col; int phys_row; int vrow; @@ -3688,7 +3688,7 @@ xaccSRHasPendingChanges (SplitRegister *reg) { SRInfo *info = xaccSRGetInfo(reg); Transaction *pending_trans = xaccTransLookup(&info->pending_trans_guid); - unsigned int changed; + guint32 changed; if (reg == NULL) return GNC_F; diff --git a/src/register/basiccell.h b/src/register/basiccell.h index a45c429f11..d2662ced2d 100644 --- a/src/register/basiccell.h +++ b/src/register/basiccell.h @@ -62,7 +62,12 @@ * XACC_CELL_ALLOW_INPUT accept keyboard & mouse * input from the user. * XACC_CELL_ALLOW_SHADOW copy ("shadow") the contents - * of register cells. + * of register cells. + * XACC_CELL_ALLOW_EXACT_ONLY the cell may only be + * entered by 'exact' selection, i.e., not by + * indirect selection by, for example, tabbing. + * Currently, the only exact method of entering + * a cell is via the mouse pointer. * * If ALLOW_INPUT is not set, the cell is supposed to * to only display values, but not accept user input. If @@ -209,17 +214,17 @@ struct _BasicCell { /* hack alert -- may want to redesign color to use named color strings. */ guint32 bg_color; /* background color, ARGB format */ guint32 fg_color; /* forground (text) color ARGB format */ - short use_fg_color; /* if 0, above is ignored */ - short use_bg_color; /* if 0, above is ignored */ + gboolean use_fg_color; /* if 0, above is ignored */ + gboolean use_bg_color; /* if 0, above is ignored */ /* hack alert -- add support for e.g. bold fonts !?!?! italic fonts ?? */ /* ==================================================== */ char * value; /* current value */ char *blank_help; /* help when value is blank */ - unsigned int changed; /* 2^32-1 if value modified */ + guint32 changed; /* 2^32-1 if value modified */ - char input_output; /* zero if output-only */ + char input_output; /* zero if output-only */ /* "virtual", overloaded set-value method */ void (*set_value) (BasicCell *, diff --git a/src/register/splitreg.c b/src/register/splitreg.c index 0413daed3e..2b4ce3f7a4 100644 --- a/src/register/splitreg.c +++ b/src/register/splitreg.c @@ -1264,11 +1264,10 @@ xaccDestroySplitRegister (SplitRegister *reg) /* ============================================== */ -unsigned int +guint32 xaccSplitRegisterGetChangeFlag (SplitRegister *reg) { - - unsigned int changed = 0; + guint32 changed = 0; /* be careful to use bitwise ands and ors to assemble bit flag */ changed |= MOD_DATE & reg->dateCell->cell.changed; diff --git a/src/register/splitreg.h b/src/register/splitreg.h index f8ea06262d..801bce2c6d 100644 --- a/src/register/splitreg.h +++ b/src/register/splitreg.h @@ -264,7 +264,7 @@ void xaccSetSplitRegisterColors (SplitRegisterColors reg_colors); void xaccSplitRegisterConfigColors (SplitRegister *reg); /* returns non-zero value if updates have been made to data */ -unsigned int xaccSplitRegisterGetChangeFlag (SplitRegister *reg); +guint32 xaccSplitRegisterGetChangeFlag (SplitRegister *reg); /* Clears all change flags in the register. Does not alter values */ void xaccSplitRegisterClearChangeFlag (SplitRegister *reg);