From: <vo...@us...> - 2013-02-18 15:15:24
|
Revision: 3512 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3512&view=rev Author: vomikan Date: 2013-02-18 15:15:14 +0000 (Mon, 18 Feb 2013) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/mmcheckingpanel.cpp Modified: trunk/mmex/src/mmcheckingpanel.cpp =================================================================== --- trunk/mmex/src/mmcheckingpanel.cpp 2013-02-18 14:50:57 UTC (rev 3511) +++ trunk/mmex/src/mmcheckingpanel.cpp 2013-02-18 15:15:14 UTC (rev 3512) @@ -938,7 +938,7 @@ wxASSERT(pCurrency); pCurrency->loadCurrencySettings(); - header_text_->SetLabel(_("Account View : ") + pAccount->name_); + header_text_->SetLabel(wxString(_("Account View : %s"), pAccount->name_.c_str())); filteredBalance_ = 0.0; @@ -955,7 +955,7 @@ boost::shared_ptr<mmBankTransaction> pBankTransaction = core_->bTransactionList_.transactions_[i]; if (pBankTransaction->accountID_ != m_AccountID && (pBankTransaction->toAccountID_ != m_AccountID - || pBankTransaction->transType_ != wxT("Transfer"))) + || pBankTransaction->transType_ != TRANS_TYPE_TRANSFER_STR)) continue; pBankTransaction->updateAllData(core_, m_AccountID, pCurrency); @@ -1581,7 +1581,7 @@ bool ok = m_cp && idx < m_cp->m_trans.size(); mmBankTransaction *tr = ok ? m_cp->m_trans[idx] : 0; - bool in_the_future = tr && tr->date_ > wxDateTime::Now(); + bool in_the_future = tr && tr->date_ > wxDateTime::Now().GetDateOnly(); TransactionListCtrl &self = *const_cast<TransactionListCtrl*>(this); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |