4.30 beta

This commit is contained in:
Igor Pavlov
2005-11-18 00:00:00 +00:00
committed by Kornel Lesiński
parent bcd1db2f5a
commit e18587ba51
214 changed files with 5385 additions and 2712 deletions

View File

@@ -45,7 +45,7 @@ void COverwriteDialog::SetFileInfoControl(int textID, int iconID,
#ifdef LANG
0x02000982,
#endif
NumberToStringW(fileInfo.Size));
NumberToString(fileInfo.Size));
UString reducedName;
const int kLineSize = 88;
@@ -70,11 +70,12 @@ void COverwriteDialog::SetFileInfoControl(int textID, int iconID,
timeString = ConvertFileTimeToString(localFileTime);
fullString +=
#ifdef LANG
LangLoadStringW(IDS_FILE_MODIFIED, 0x02000983);
#ifdef LANG
LangString(IDS_FILE_MODIFIED, 0x02000983);
#else
MyLoadStringW(IDS_FILE_MODIFIED);
#endif
fullString += L" ";
fullString += timeString;
}

View File

@@ -25,8 +25,7 @@ class COverwriteDialog: public NWindows::NControl::CModalDialog
virtual bool OnInit();
bool OnButtonClicked(int buttonID, HWND buttonHWND);
public:
INT_PTR Create(HWND parent = 0)
{ return CModalDialog::Create(MAKEINTRESOURCE(IDD_DIALOG_OVERWRITE), parent); }
INT_PTR Create(HWND parent = 0) { return CModalDialog::Create(IDD_DIALOG_OVERWRITE, parent); }
NOverwriteDialog::CFileInfo OldFileInfo;
NOverwriteDialog::CFileInfo NewFileInfo;