From: <sie...@us...> - 2013-12-24 14:27:25
|
Revision: 5718 http://sourceforge.net/p/moneymanagerex/code/5718 Author: siena123 Date: 2013-12-24 14:27:20 +0000 (Tue, 24 Dec 2013) Log Message: ----------- apply fixes for mac compile from trunk to branch Modified Paths: -------------- branches/version_1.0.0.0/src/transdialog.cpp Modified: branches/version_1.0.0.0/src/transdialog.cpp =================================================================== --- branches/version_1.0.0.0/src/transdialog.cpp 2013-12-24 11:43:17 UTC (rev 5717) +++ branches/version_1.0.0.0/src/transdialog.cpp 2013-12-24 14:27:20 UTC (rev 5718) @@ -648,9 +648,11 @@ } // Get payee string from populated list to address issues with case compare differences between autocomplete and payee list +#if !defined (__WXMAC__) int payee_loc = cbPayee_->FindString(payee_name); if (payee_loc != wxNOT_FOUND) payee_name = cbPayee_->GetString(payee_loc); +#endif Model_Payee::Data* payee = Model_Payee::instance().get(payee_name); if (!payee) @@ -808,9 +810,11 @@ { // Get payee string from populated list to address issues with case compare differences between autocomplete and payee list wxString payee_str = cbPayee_->GetValue(); +#if !defined (__WXMAC__) int payee_loc = cbPayee_->FindString(payee_str); if (payee_loc != wxNOT_FOUND) payee_str = cbPayee_->GetString(payee_loc); +#endif bool transfer_transaction = transaction_type_->GetSelection() == Model_Checking::TRANSFER; if (!transfer_transaction) @@ -1024,7 +1028,7 @@ void mmTransDialog::OnCancel(wxCommandEvent& /*event*/) { #if defined (__WXMAC__) - Modal(wxID_CANCEL); + EndModal(wxID_CANCEL); #endif if (object_in_focus_ == bCategory_->GetId()) return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |