From 559026cf81630cbb01c88e64af894dce5ab398cb Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Thu, 20 Aug 1998 05:46:14 +0000 Subject: [PATCH] make stuff work right git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1007 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/register/Makefile.in | 2 +- src/register/register.c | 2 ++ src/register/register.h | 4 ++++ src/register/splitreg.c | 17 ++++++++++++----- src/register/splitreg.h | 34 +++++++++++++++++++--------------- 5 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/register/Makefile.in b/src/register/Makefile.in index b9f6cfd639..189c4f7942 100644 --- a/src/register/Makefile.in +++ b/src/register/Makefile.in @@ -39,7 +39,7 @@ CFLAGS := @CFLAGS@ @X_CFLAGS@ -DCELL_WIDGETS=1 ${INCLPATH} # See Makefile.common for information about these variables. COMMON_SRCS := basiccell.c cellblock.c \ datecell.c pricecell.c QuickFill.c quickfillcell.c \ - recncell.c register.c splitreg.c \ + recncell.c splitreg.c \ table-allgui.c table-html.c textcell.c MOTIF_SRCS := table-motif.c combocell-motif.c GNOME_SRCS := table-gtk.c combocell-gtk.c diff --git a/src/register/register.c b/src/register/register.c index d3aad84114..0512e045d9 100644 --- a/src/register/register.c +++ b/src/register/register.c @@ -23,6 +23,7 @@ THIS FILE IS OBSOLETEED BY SPLITREG.C * Copyright (c) 1998 Linas Vepstas */ +#ifdef OBSOLETE /********************************************************************\ * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License as * @@ -495,4 +496,5 @@ xaccBasicRegisterGetChangeFlag (BasicRegister *reg) return changed; } +#endif OBSLETE /* ============ END OF FILE ===================== */ diff --git a/src/register/register.h b/src/register/register.h index 911f72a9fc..e60ae28c8f 100644 --- a/src/register/register.h +++ b/src/register/register.h @@ -1,3 +1,6 @@ + +#ifdef OBSOLETE + /* * FILE: * register.h @@ -142,4 +145,5 @@ unsigned int xaccBasicRegisterGetChangeFlag (BasicRegister *); #endif /* __XACC_REGISTER_H__ */ +#endif /* OBSOLETE */ /* ============ END OF FILE ===================== */ diff --git a/src/register/splitreg.c b/src/register/splitreg.c index 5a8a2b6339..cecdf87447 100644 --- a/src/register/splitreg.c +++ b/src/register/splitreg.c @@ -159,6 +159,8 @@ configLayout (SplitRegister *reg) int show_recs = (reg->type) & REG_SHOW_RECS; int show_tdetail = (reg->type) & REG_SHOW_TDETAIL; +/* hack alert -------------------- kill this */ +show_tdetail = 1; /* perform a bsic layout that's valid for most * of the ledgers; then customize with case * statements. */ @@ -656,14 +658,19 @@ xaccSplitRegisterGetChangeFlag (SplitRegister *reg) changed |= MOD_NUM & reg->numCell->changed; changed |= MOD_DESC & reg->descCell->cell.changed; changed |= MOD_RECN & reg->recnCell->changed; - changed |= MOD_AMNT & reg->creditCell->cell.changed; - changed |= MOD_AMNT & reg->debitCell->cell.changed; - changed |= MOD_SHRS & reg->shrsCell->cell.changed; - changed |= MOD_PRIC & reg->priceCell->cell.changed; - changed |= MOD_MEMO & reg->memoCell->changed; + changed |= MOD_TAMNT & reg->creditTransCell->cell.changed; + changed |= MOD_TAMNT & reg->debitTransCell->cell.changed; + changed |= MOD_TPRIC & reg->priceTransCell->cell.changed; + changed |= MOD_TVALU & reg->valueTransCell->cell.changed; + changed |= MOD_ACTN & reg->actionCell->cell.changed; changed |= MOD_XFRM & reg->xfrmCell->cell.changed; changed |= MOD_XTO & reg->xtoCell->cell.changed; + changed |= MOD_MEMO & reg->memoCell->changed; + changed |= MOD_AMNT & reg->creditCell->cell.changed; + changed |= MOD_AMNT & reg->debitCell->cell.changed; + changed |= MOD_PRIC & reg->priceCell->cell.changed; + changed |= MOD_VALU & reg->valueCell->cell.changed; return changed; } diff --git a/src/register/splitreg.h b/src/register/splitreg.h index 00584483cd..5e9f97964f 100644 --- a/src/register/splitreg.h +++ b/src/register/splitreg.h @@ -69,20 +69,24 @@ /* modified flags -- indicate how values have been modified */ -#define MOD_NONE 0x000 -#define MOD_DATE 0x001 -#define MOD_NUM 0x002 -#define MOD_DESC 0x004 -#define MOD_RECN 0x008 -#define MOD_AMNT 0x010 -#define MOD_SHRS 0x020 -#define MOD_PRIC 0x040 -#define MOD_MEMO 0x080 -#define MOD_ACTN 0x100 -#define MOD_XFRM 0x200 -#define MOD_XTO 0x400 -#define MOD_NEW 0x800 -#define MOD_ALL 0xfff +#define MOD_NONE 0x0000 +#define MOD_DATE 0x0001 +#define MOD_NUM 0x0002 +#define MOD_DESC 0x0004 +#define MOD_RECN 0x0008 +#define MOD_TAMNT 0x0010 +#define MOD_TPRIC 0x0020 +#define MOD_TVALU 0x0040 + +#define MOD_ACTN 0x0080 +#define MOD_XFRM 0x0100 +#define MOD_XTO 0x0200 +#define MOD_MEMO 0x0400 +#define MOD_AMNT 0x0800 +#define MOD_PRIC 0x1000 +#define MOD_VALU 0x2000 +#define MOD_NEW 0x4000 +#define MOD_ALL 0x7fff /* The value of NUM_CELLS should be larger than the number of * cells defined in the structure below! @@ -154,7 +158,7 @@ void xaccInitSplitRegister (SplitRegister *, int type); void xaccDestroySplitRegister (SplitRegister *); /* returns non-zero value if updates have been made to data */ -unsigned int xaccGetChangeFlag (SplitRegister *); +unsigned int xaccSplitRegisterGetChangeFlag (SplitRegister *); #endif /* __XACC_SPLITREG_H__ */