<tchar.h> removed from <m_system.h>

git-svn-id: http://svn.miranda-ng.org/main/trunk@17136 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

6 files changed, 22 insertions, 22 deletions

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 91d9be08c1..b2c4001665 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -48,7 +48,7 @@ wchar_t SkinsFolder[MAX_PATH];
 

 int ReloadSkinFolder(WPARAM, LPARAM)

 {

-	FoldersGetCustomPathT(hSkinFolder, SkinsFolder, _countof(SkinsFolder), _T(DEFAULT_SKIN_FOLDER));

+	FoldersGetCustomPathT(hSkinFolder, SkinsFolder, _countof(SkinsFolder), _A2W(DEFAULT_SKIN_FOLDER));

 	return 0;

 }

 

@@ -1558,8 +1558,8 @@ static int clcHookModulesLoaded(WPARAM, LPARAM)
 	HookEvent(ME_MODERNOPT_INITIALIZE, ModernSkinOptInit);

 

 	HookEvent(ME_FOLDERS_PATH_CHANGED, ReloadSkinFolder);

-	hSkinFolder = FoldersRegisterCustomPathT(LPGEN("Skins"), LPGEN("Modern contact list"), MIRANDA_PATHT L"\\" _T(DEFAULT_SKIN_FOLDER));

-	FoldersGetCustomPathT(hSkinFolder, SkinsFolder, _countof(SkinsFolder), _T(DEFAULT_SKIN_FOLDER));

+	hSkinFolder = FoldersRegisterCustomPathT(LPGEN("Skins"), LPGEN("Modern contact list"), MIRANDA_PATHT L"\\" _A2W(DEFAULT_SKIN_FOLDER));

+	FoldersGetCustomPathT(hSkinFolder, SkinsFolder, _countof(SkinsFolder), _A2W(DEFAULT_SKIN_FOLDER));

 

 	// Get icons

 	wchar_t szMyPath[MAX_PATH];

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 605112c0fc..4abc781b90 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -1006,7 +1006,7 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP
 			if (!db_get_ts(NULL, "CList", "TitleText", &dbv))

 				s = dbv.ptszVal;

 			else

-				s = _T(MIRANDANAME);

+				s = _A2W(MIRANDANAME);

 			SetDlgItemText(hwndDlg, IDC_TITLETEXT, s);

 			db_free(&dbv);

 

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index c0b4e9c106..9256ecf893 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -667,7 +667,7 @@ void CLUI_ChangeWindowMode()
 	wchar_t titleText[255] = { 0 };

 	DBVARIANT dbv;

 	if (db_get_ts(NULL, "CList", "TitleText", &dbv))

-		mir_tstrncpy(titleText, _T(MIRANDANAME), _countof(titleText));

+		mir_tstrncpy(titleText, _A2W(MIRANDANAME), _countof(titleText));

 	else {

 		mir_tstrncpy(titleText, dbv.ptszVal, _countof(titleText));

 		db_free(&dbv);

diff --git a/plugins/Clist_modern/src/modern_skinbutton.cpp b/plugins/Clist_modern/src/modern_skinbutton.cpp
index 55341cd073..f37a2a4715 100644
--- a/plugins/Clist_modern/src/modern_skinbutton.cpp
+++ b/plugins/Clist_modern/src/modern_skinbutton.cpp
@@ -71,7 +71,7 @@ int ModernSkinButtonLoadModule()
 	WNDCLASSEX wc;
 	memset(&wc, 0, sizeof(wc));
 	wc.cbSize = sizeof(wc);
-	wc.lpszClassName = _T(MODERNSKINBUTTONCLASS);
+	wc.lpszClassName = _A2W(MODERNSKINBUTTONCLASS);
 	wc.lpfnWndProc = ModernSkinButtonWndProc;
 	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
 	wc.cbWndExtra = sizeof(ModernSkinButtonCtrl*);
@@ -608,7 +608,7 @@ static HWND ModernSkinButtonCreateWindow(ModernSkinButtonCtrl * bct, HWND parent
 	if (bct == NULL) return FALSE;
 	{
 		wchar_t *UnicodeID = mir_a2u(bct->ID);
-		hwnd = CreateWindow(_T(MODERNSKINBUTTONCLASS), UnicodeID, WS_VISIBLE | WS_CHILD, bct->Left, bct->Top, bct->Right - bct->Left, bct->Bottom - bct->Top, parent, NULL, g_hInst, NULL);
+		hwnd = CreateWindow(_A2W(MODERNSKINBUTTONCLASS), UnicodeID, WS_VISIBLE | WS_CHILD, bct->Left, bct->Top, bct->Right - bct->Left, bct->Bottom - bct->Top, parent, NULL, g_hInst, NULL);
 		mir_free(UnicodeID);
 	}
 
diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp
index 6927134b57..1b2514e0f7 100644
--- a/plugins/Clist_modern/src/modern_skinopt.cpp
+++ b/plugins/Clist_modern/src/modern_skinopt.cpp
@@ -327,30 +327,30 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 
 int SearchSkinFiles(HWND hwndDlg, wchar_t * Folder)
 {
-	struct _tfinddata_t fd = { 0 };
+	struct _wfinddata_t fd = { 0 };
 	wchar_t mask[MAX_PATH];
 	long hFile;
 	mir_sntprintf(mask, L"%s\\*.msf", Folder);
 	//fd.attrib = _A_SUBDIR;
-	hFile = _tfindfirst(mask, &fd);
+	hFile = _wfindfirst(mask, &fd);
 	if (hFile != -1) {
 		do {
 			AddSkinToList(hwndDlg, Folder, fd.name);
-		} while (!_tfindnext(hFile, &fd));
+		} while (!_wfindnext(hFile, &fd));
 		_findclose(hFile);
 	}
 	mir_sntprintf(mask, L"%s\\*", Folder);
-	hFile = _tfindfirst(mask, &fd);
-	{
-		do {
-			if (fd.attrib&_A_SUBDIR && !(mir_tstrcmpi(fd.name, L".") == 0 || mir_tstrcmpi(fd.name, L"..") == 0)) {//Next level of subfolders
-				wchar_t path[MAX_PATH];
-				mir_sntprintf(path, L"%s\\%s", Folder, fd.name);
-				SearchSkinFiles(hwndDlg, path);
-			}
-		} while (!_tfindnext(hFile, &fd));
-		_findclose(hFile);
-	}
+	hFile = _wfindfirst(mask, &fd);
+
+	do {
+		if (fd.attrib&_A_SUBDIR && !(mir_tstrcmpi(fd.name, L".") == 0 || mir_tstrcmpi(fd.name, L"..") == 0)) {//Next level of subfolders
+			wchar_t path[MAX_PATH];
+			mir_sntprintf(path, L"%s\\%s", Folder, fd.name);
+			SearchSkinFiles(hwndDlg, path);
+		}
+	} while (!_wfindnext(hFile, &fd));
+	_findclose(hFile);
+
 	return 0;
 }
 
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 6ce7bd2965..8c4a49db88 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -1204,7 +1204,7 @@ void CreateViewModeFrame()
 	frame.TBtname = TranslateT("View modes");

 	frame.Flags = F_VISIBLE | F_SHOWTBTIP | F_NOBORDER | F_NO_SUBCONTAINER | F_TCHAR;

 	frame.align = alBottom;

-	frame.hWnd = CreateWindowEx(0, L"CLVMFrameWindow", _T(CLVM_MODULE), WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPCHILDREN, 0, 0, 20, 20, pcli->hwndContactList, (HMENU)0, g_hInst, NULL);

+	frame.hWnd = CreateWindowEx(0, L"CLVMFrameWindow", _A2W(CLVM_MODULE), WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPCHILDREN, 0, 0, 20, 20, pcli->hwndContactList, (HMENU)0, g_hInst, NULL);

 	g_hwndViewModeFrame = frame.hWnd;

 	hCLVMFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&frame, 0);

 	CallService(MS_CLIST_FRAMES_UPDATEFRAME, (WPARAM)hCLVMFrame, FU_FMPOS);