From a7897cbffee951c0415fd0e9db722dcc6274be3e Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Sun, 1 Feb 1998 02:10:00 +0000 Subject: [PATCH] misc bug fixes & cleanup git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@474 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/Account.c | 3 --- src/FileIO.c | 2 +- src/RegWindow.c | 29 +++++------------------------ src/Transaction.c | 3 --- 4 files changed, 6 insertions(+), 31 deletions(-) diff --git a/src/Account.c b/src/Account.c index c727c46ea2..fd04f65f56 100644 --- a/src/Account.c +++ b/src/Account.c @@ -234,9 +234,6 @@ xaccInsertSplit ( Account *acc, Split *split ) acc->splits[acc->numSplits] = NULL; _free(oldsplits); - - /* hack alert -- quickfill belong in gui */ - /* qfInsertTransaction( acc->qfRoot, trans ); */ } diff --git a/src/FileIO.c b/src/FileIO.c index 7e3ca9c9d5..5e64668a05 100644 --- a/src/FileIO.c +++ b/src/FileIO.c @@ -576,7 +576,7 @@ readTransaction( int fd, Account *acc, int token ) * aren't reconciled until you get your bank statement, and * use the reconcile window to mark the transaction reconciled */ - if( YREC == trans->credit_split.reconciled == YREC ) { + if( YREC == trans->credit_split.reconciled ) { xaccTransSetReconcile (trans, CREC); } } diff --git a/src/RegWindow.c b/src/RegWindow.c index 67d479334a..587ad2e3e3 100644 --- a/src/RegWindow.c +++ b/src/RegWindow.c @@ -70,9 +70,6 @@ typedef struct _RegWindow { Widget reg; /* The matrix widget... */ Widget balance; /* The balance text field */ Widget record; /* the record transaction button */ - unsigned short changed; /* bitmask of fields that have changed in * - * transaction currEntry */ - unsigned short currEntry; /* to keep track of last edited transaction*/ short type; /* register display type, usually equal to * * account type */ @@ -97,22 +94,6 @@ static void cancelCB( Widget mw, XtPointer cd, XtPointer cb ); /** GLOBALS *********************************************************/ extern Widget toplevel; -#define MOD_NONE 0x00 -#define MOD_DATE 0x01 -#define MOD_NUM 0x02 -#define MOD_DESC 0x04 -#define MOD_RECN 0x08 -#define MOD_AMNT 0x10 -#define MOD_SHRS 0x20 -#define MOD_PRIC 0x40 -#define MOD_MEMO 0x80 -#define MOD_ACTN 0x100 -#define MOD_XFRM 0x200 -#define MOD_XTO 0x400 -#define MOD_NEW 0x800 -#define MOD_ALL 0xfff - - /********************************************************************\ * xaccDestroyRegWindow() * It is enought to call just XtDestroy Widget. Any allocated @@ -251,7 +232,7 @@ regWindowLedger( Widget parent, Account **acclist, int ledger_type ) * values are changed below. Be careful with which row is which. * \******************************************************************/ MenuItem reportMenu[] = { - { "Simple...", &xmPushButtonWidgetClass, 'S', NULL, NULL, True, + { SIMPLE_E_STR, &xmPushButtonWidgetClass, 'S', NULL, NULL, True, NULL, (XtPointer)0, (MenuItem *)NULL, 0 }, { NULL, NULL, 0, NULL, NULL, False, NULL, (XtPointer)0, (MenuItem *)NULL, 0 }, @@ -302,8 +283,6 @@ regWindowLedger( Widget parent, Account **acclist, int ledger_type ) setBusyCursor( parent ); regData = (RegWindow *)_malloc(sizeof(RegWindow)); - regData->changed = MOD_NONE; /* Nothing has changed yet! */ - regData->currEntry = 0; /* count the number of accounts we are supposed to display, * and then, store them. */ @@ -574,9 +553,11 @@ regWindowLedger( Widget parent, Account **acclist, int ledger_type ) void regRefresh (RegWindow * regData) { - xaccLoadRegister (regData->ledger, regData->blackacc[0]->splits); - + /* complete GUI initialization */ xaccLoadXferCell (regData->ledger->xfrmCell, regData->blackacc[0]->parent); + + xaccRecomputeBalance (regData->blackacc[0]); + xaccLoadRegister (regData->ledger, regData->blackacc[0]->splits); } /********************************************************************\ diff --git a/src/Transaction.c b/src/Transaction.c index 68ff85aecb..e399d77245 100644 --- a/src/Transaction.c +++ b/src/Transaction.c @@ -290,9 +290,6 @@ xaccTransAppendSplit (Transaction *trans, Split *split) trans->debit_splits[num+1] = NULL; if (oldarray) _free (oldarray); - - /* bring dollar amounts into synchrony */ - xaccTransRecomputeAmount (trans); } /********************************************************************\