X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fimport%2FfrmImportResults.cpp;h=328050357b2e99432ace1109a8392b1d964568a5;hb=54ca9b53d5c442288b8104086348e5b0035625e9;hp=3dc09d49d00bbf2e5a6a72cb262f7ef6e5470600;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git diff --git a/source/import/frmImportResults.cpp b/source/import/frmImportResults.cpp index 3dc09d4..3280503 100644 --- a/source/import/frmImportResults.cpp +++ b/source/import/frmImportResults.cpp @@ -20,9 +20,11 @@ void frmImportResults::CopyClipboard( wxCommandEvent& event ) wxTextDataObject ResultData; ResultData.SetText(txtResults->GetValue()); - - wxTheClipboard->SetData(&ResultData); + + wxTheClipboard->Clear(); + wxTheClipboard->AddData(&ResultData); wxTheClipboard->Close(); + wxTheClipboard->Flush(); wxMessageBox(_("The results have been copied to the clipboard."), _("Results copied to clipboard")); @@ -39,7 +41,7 @@ void frmImportResults::CloseWindow( wxCommandEvent& event ) this->Close(); } -void frmImportResults::LoadData(std::map *ResultDataInc) +void frmImportResults::LoadData(std::map *ResultDataInc, int ImportCount, int ImportErrorCount) { wxString ResultDataText; @@ -50,5 +52,11 @@ void frmImportResults::LoadData(std::map *ResultDataInc) ResultDataText.Append(iter->second + wxT("\n")); } + + // Display the results in the form. + + txtResults->SetValue(ResultDataText); + lblText->SetLabel(wxString::Format(_("%i contacts imported. %i contacts had errors and could not be imported."), ImportCount, ImportErrorCount)); + +} -} \ No newline at end of file