diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:19:14 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:19:14 +0200 |
| commit | 01eb8253196672c969a39587e90b49321a182428 (patch) | |
| tree | 4a3b71d7913de519744466c9227fda6461c4f0b5 /ui/gui_status_handler.cpp | |
| parent | 5.0 (diff) | |
| download | FreeFileSync-01eb8253196672c969a39587e90b49321a182428.tar.gz FreeFileSync-01eb8253196672c969a39587e90b49321a182428.tar.bz2 FreeFileSync-01eb8253196672c969a39587e90b49321a182428.zip | |
5.1
Diffstat (limited to 'ui/gui_status_handler.cpp')
| -rw-r--r-- | ui/gui_status_handler.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ui/gui_status_handler.cpp b/ui/gui_status_handler.cpp index 42c50671..6e3c08a0 100644 --- a/ui/gui_status_handler.cpp +++ b/ui/gui_status_handler.cpp @@ -31,11 +31,12 @@ CompareStatusHandler::CompareStatusHandler(MainDialog& dlg) : //display status panel during compare mainDlg.auiMgr.GetPane(mainDlg.compareStatus->getAsWindow()).Show(); mainDlg.auiMgr.Update(); + mainDlg.compareStatus->updateStatusPanelNow(); //clear gui flicker: window must be visible to make this work! //register abort button - mainDlg.m_buttonAbort->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CompareStatusHandler::OnAbortCompare), NULL, this); + mainDlg.m_buttonAbort->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CompareStatusHandler::OnAbortCompare), nullptr, this); //register key event - mainDlg.Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(CompareStatusHandler::OnKeyPressed), NULL, this); + mainDlg.Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(CompareStatusHandler::OnKeyPressed), nullptr, this); } @@ -54,8 +55,8 @@ CompareStatusHandler::~CompareStatusHandler() mainDlg.pushStatusInformation(_("Operation aborted!")); //de-register keys - mainDlg.Disconnect(wxEVT_CHAR_HOOK, wxKeyEventHandler(CompareStatusHandler::OnKeyPressed), NULL, this); - mainDlg.m_buttonAbort->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CompareStatusHandler::OnAbortCompare), NULL, this); + mainDlg.Disconnect(wxEVT_CHAR_HOOK, wxKeyEventHandler(CompareStatusHandler::OnKeyPressed), nullptr, this); + mainDlg.m_buttonAbort->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CompareStatusHandler::OnAbortCompare), nullptr, this); } @@ -169,7 +170,7 @@ void CompareStatusHandler::reportFatalError(const std::wstring& errorMessage) forceUiRefresh(); showErrorDlg(ReturnErrorDlg::BUTTON_ABORT, - errorMessage, NULL); + errorMessage, nullptr); } @@ -233,7 +234,7 @@ SyncStatusHandler::SyncStatusHandler(MainDialog* parentDlg, SyncStatusHandler::~SyncStatusHandler() { - const int totalErrors = errorLog.typeCount(TYPE_ERROR | TYPE_FATAL_ERROR); //evaluate before finalizing log + const int totalErrors = errorLog.getItemCount(TYPE_ERROR | TYPE_FATAL_ERROR); //evaluate before finalizing log //finalize error log if (abortIsRequested()) |