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

@@ -3,49 +3,14 @@
#include "StdAfx.h"
#include "FormatUtils.h"
#include "Windows/ResourceString.h"
#include "Common/IntToString.h"
#include "Common/StringConvert.h"
#include "Windows/ResourceString.h"
#ifdef LANG
#include "LangUtils.h"
#endif
/*
CSysString MyFormat(const CSysString &format, const CSysString &argument)
{
CSysString result;
_stprintf(result.GetBuffer(format.Length() + argument.Length() + 2),
format, argument);
result.ReleaseBuffer();
return result;
}
CSysString MyFormat(UINT32 resourceID,
#ifdef LANG
UINT32 aLangID,
#endif
const CSysString &argument)
{
return MyFormat(
#ifdef LANG
LangLoadString(resourceID, aLangID),
#else
NWindows::MyLoadString(resourceID),
#endif
argument);
}
*/
CSysString NumberToString(UINT64 number)
{
TCHAR temp[32];
ConvertUInt64ToString(number, temp);
return temp;
}
UString NumberToStringW(UINT64 number)
UString NumberToString(UInt64 number)
{
wchar_t numberString[32];
ConvertUInt64ToString(number, numberString);
@@ -59,16 +24,15 @@ UString MyFormatNew(const UString &format, const UString &argument)
return result;
}
UString MyFormatNew(UINT32 resourceID,
UString MyFormatNew(UINT resourceID,
#ifdef LANG
UINT32 aLangID,
UInt32 langID,
#endif
const UString &argument)
{
return MyFormatNew(
#ifdef LANG
LangLoadStringW(resourceID, aLangID),
LangString(resourceID, langID),
#else
NWindows::MyLoadStringW(resourceID),
#endif