diff options
author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:11:33 +0200 |
---|---|---|
committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:11:33 +0200 |
commit | 6fcfe73ca751f068978ce201094b17cf2dfe4d20 (patch) | |
tree | e7d85e8f9057430b480cd0e2f5ccb43c9d2ef8f8 /ui/small_dlgs.cpp | |
parent | 3.15 (diff) | |
download | FreeFileSync-6fcfe73ca751f068978ce201094b17cf2dfe4d20.tar.gz FreeFileSync-6fcfe73ca751f068978ce201094b17cf2dfe4d20.tar.bz2 FreeFileSync-6fcfe73ca751f068978ce201094b17cf2dfe4d20.zip |
3.16
Diffstat (limited to 'ui/small_dlgs.cpp')
-rw-r--r-- | ui/small_dlgs.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/ui/small_dlgs.cpp b/ui/small_dlgs.cpp index 598580e3..58eac33f 100644 --- a/ui/small_dlgs.cpp +++ b/ui/small_dlgs.cpp @@ -334,8 +334,7 @@ public: const std::vector<ffs3::FileSystemObject*>& rowsOnLeft, const std::vector<ffs3::FileSystemObject*>& rowsOnRight, bool& deleteOnBothSides, - bool& useRecycleBin, - int& totalDeleteCount); + bool& useRecycleBin); enum { @@ -356,7 +355,6 @@ private: const std::vector<ffs3::FileSystemObject*>& rowsToDeleteOnRight; bool& m_deleteOnBothSides; bool& m_useRecycleBin; - int& totalDelCount; }; @@ -364,14 +362,12 @@ DeleteDialog::DeleteDialog(wxWindow* main, const std::vector<FileSystemObject*>& rowsOnLeft, const std::vector<FileSystemObject*>& rowsOnRight, bool& deleteOnBothSides, - bool& useRecycleBin, - int& totalDeleteCount) : + bool& useRecycleBin) : DeleteDlgGenerated(main), rowsToDeleteOnLeft(rowsOnLeft), rowsToDeleteOnRight(rowsOnRight), m_deleteOnBothSides(deleteOnBothSides), - m_useRecycleBin(useRecycleBin), - totalDelCount(totalDeleteCount) + m_useRecycleBin(useRecycleBin) { #ifdef FFS_WIN new MouseMoveWindow(*this, //allow moving main dialog by clicking (nearly) anywhere... @@ -405,7 +401,11 @@ void DeleteDialog::updateTexts() m_checkBoxDeleteBothSides->GetValue()); const wxString filesToDelete = delInfo.first; - totalDelCount = delInfo.second; + + #ifndef _MSC_VER + #warning do something with this number: ("Do you really want to delete the following %x object(s)?")); + //totalDelCount = delInfo.second; + #endif m_textCtrlMessage->SetValue(filesToDelete); @@ -444,8 +444,7 @@ void DeleteDialog::OnUseRecycler(wxCommandEvent& event) DefaultReturnCode::Response ffs3::showDeleteDialog(const std::vector<ffs3::FileSystemObject*>& rowsOnLeft, const std::vector<ffs3::FileSystemObject*>& rowsOnRight, bool& deleteOnBothSides, - bool& useRecycleBin, - int& totalDeleteCount) + bool& useRecycleBin) { DefaultReturnCode::Response rv = DefaultReturnCode::BUTTON_CANCEL; @@ -453,8 +452,7 @@ DefaultReturnCode::Response ffs3::showDeleteDialog(const std::vector<ffs3::FileS rowsOnLeft, rowsOnRight, deleteOnBothSides, - useRecycleBin, - totalDeleteCount); + useRecycleBin); if (confirmDeletion.ShowModal() == DeleteDialog::BUTTON_OKAY) rv = DefaultReturnCode::BUTTON_OKAY; return rv; |