dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Jim Park's Unicode NSIS merging - Step 1 : switch to TCHARs where relevant.

Browse source 
Compiler output is identical before & after this step

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/branches/wizou@6036 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-03-24 17:22:56 +00:00
parent 4e48722b63
commit 752d7d239a
209 changed files with 9698 additions and 7658 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/DialogTemplate.cpp
View file

@ -280,8 +280,8 @@ int CDialogTemplate::RemoveItem(WORD wId) {
}
// Sets the font of the dialog
void CDialogTemplate::SetFont(char* szFaceName, WORD wFontSize) {
if (strcmp(szFaceName, "MS Shell Dlg")) {
void CDialogTemplate::SetFont(TCHAR* szFaceName, WORD wFontSize) {
if (_tcscmp(szFaceName, _T("MS Shell Dlg"))) {
// not MS Shell Dlg
m_dwStyle &= ~DS_SHELLFONT;
}
@ -364,7 +364,7 @@ void CDialogTemplate::DlgUnitsToPixels(short& x, short& y) {
}
// Returns the size of a string in the dialog (in dialog units)
SIZE CDialogTemplate::GetStringSize(WORD id, char *str) {
SIZE CDialogTemplate::GetStringSize(WORD id, TCHAR *str) {
HWND hDlg = CreateDummyDialog();
LOGFONT f;
@ -375,7 +375,7 @@ SIZE CDialogTemplate::GetStringSize(WORD id, char *str) {
SelectObject(memDC, font);
SIZE size;
GetTextExtentPoint32(memDC, str, strlen(str), &size);
GetTextExtentPoint32(memDC, str, _tcsclen(str), &size);
DestroyWindow(hDlg);
DeleteObject(font);
@ -387,7 +387,7 @@ SIZE CDialogTemplate::GetStringSize(WORD id, char *str) {
}
// Trims the right margins of a control to fit a given text string size.
void CDialogTemplate::RTrimToString(WORD id, char *str, int margins) {
void CDialogTemplate::RTrimToString(WORD id, TCHAR *str, int margins) {
DialogItemTemplate* item = GetItem(id);
if (!item) return;
@ -401,7 +401,7 @@ void CDialogTemplate::RTrimToString(WORD id, char *str, int margins) {
}
// Trims the left margins of a control to fit a given text string size.
void CDialogTemplate::LTrimToString(WORD id, char *str, int margins) {
void CDialogTemplate::LTrimToString(WORD id, TCHAR *str, int margins) {
DialogItemTemplate* item = GetItem(id);
if (!item) return;
@ -416,7 +416,7 @@ void CDialogTemplate::LTrimToString(WORD id, char *str, int margins) {
}
// Trims the left and right margins of a control to fit a given text string size.
void CDialogTemplate::CTrimToString(WORD id, char *str, int margins) {
void CDialogTemplate::CTrimToString(WORD id, TCHAR *str, int margins) {
DialogItemTemplate* item = GetItem(id);
if (!item) return;