Index: src/ch/StatusDlg.cpp =================================================================== diff -u -N -rd4064fca634707dcae112e5a41ed37e04455dc2a -r4fe995b304ea342b50293f92d3c1992b43b820f7 --- src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision d4064fca634707dcae112e5a41ed37e04455dc2a) +++ src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision 4fe995b304ea342b50293f92d3c1992b43b820f7) @@ -28,6 +28,7 @@ #include "Structs.h" #include "../libchcore/TTaskStatsSnapshot.h" #include "../libchcore/TTaskManagerStatsSnapshot.h" +#include "CfgProperties.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -41,7 +42,7 @@ // CStatusDlg dialog CStatusDlg::CStatusDlg(chcore::TTaskManager* pTasks, CWnd* pParent /*=NULL*/) - : ictranslate::CLanguageDialog(CStatusDlg::IDD, pParent, &m_bLock), + : ictranslate::CLanguageDialog(IDD_STATUS_DIALOG, pParent, &m_bLock), m_spTaskMgrStats(new chcore::TTaskManagerStatsSnapshot), m_pTasks(pTasks) { @@ -1089,8 +1090,8 @@ // avg transfer CString strFmt; - strFmt.Format(_T("%s/s (%s%s/s); %.0f/s (%s%.0f/s)"), strSpeedText, strAvgWord, strAvgSpeedText, - dCountSpeed, strAvgWord, dAvgCountSpeed); + strFmt.Format(_T("%s/s (%s%s/s); %.0f/s (%s%.0f/s)"), (PCTSTR)strSpeedText, (PCTSTR)strAvgWord, (PCTSTR)strAvgSpeedText, + dCountSpeed, (PCTSTR)strAvgWord, dAvgCountSpeed); return strFmt; } @@ -1185,7 +1186,7 @@ CString strTime3 = FormatTimeMiliseconds(timeRemaining); CString strTime; - strTime.Format(_T("%s / %s (%s)"), strTime1, strTime2, strTime3); + strTime.Format(_T("%s / %s (%s)"), (PCTSTR)strTime1, (PCTSTR)strTime2, (PCTSTR)strTime3); GetDlgItem(IDC_TASKTIME_STATIC)->SetWindowText(strTime); // set progress