less TCHARs

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

1 files changed, 13 insertions, 13 deletions

diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp
index 1dd09bf864..aa47bb3580 100644
--- a/plugins/Weather/src/weather_mwin.cpp
+++ b/plugins/Weather/src/weather_mwin.cpp
@@ -158,15 +158,15 @@ static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 

 				{

 					FontIDT fntid = { 0 };

-					mir_tstrcpy(fntid.group, _A2W(WEATHERPROTONAME));

-					mir_tstrcpy(fntid.name, LPGENW("Frame Font"));

+					mir_wstrcpy(fntid.group, _A2W(WEATHERPROTONAME));

+					mir_wstrcpy(fntid.name, LPGENW("Frame Font"));

 					fntc = CallService(MS_FONT_GETT, (WPARAM)&fntid, (LPARAM)&lfnt);

 

-					mir_tstrcpy(fntid.name, LPGENW("Frame Title Font"));

+					mir_wstrcpy(fntid.name, LPGENW("Frame Title Font"));

 					fntc1 = CallService(MS_FONT_GETT, (WPARAM)&fntid, (LPARAM)&lfnt1);

 				}

 

-				ptrT tszInfo(db_get_tsa(data->hContact, WEATHERCONDITION, "WeatherInfo"));

+				ptrW tszInfo(db_get_tsa(data->hContact, WEATHERCONDITION, "WeatherInfo"));

 

 				GetClientRect(hwnd, &rc);

 

@@ -242,7 +242,7 @@ static void addWindow(MCONTACT hContact)
 		return;

 

 	wchar_t winname[512];

-	mir_sntprintf(winname, L"Weather: %s", dbv.ptszVal);

+	mir_snwprintf(winname, L"Weather: %s", dbv.ptszVal);

 	db_free(&dbv);

 

 	HWND hWnd = CreateWindow(L"WeatherFrame", L"", WS_CHILD | WS_VISIBLE,

@@ -328,8 +328,8 @@ void InitMwin(void)
 	colourid.cbSize = sizeof(ColourIDT);

 	mir_strcpy(colourid.dbSettingsGroup, WEATHERPROTONAME);

 	mir_strcpy(colourid.setting, "ColorMwinFrame");

-	mir_tstrcpy(colourid.name, LPGENW("Frame Background"));

-	mir_tstrcpy(colourid.group, _A2W(WEATHERPROTONAME));

+	mir_wstrcpy(colourid.name, LPGENW("Frame Background"));

+	mir_wstrcpy(colourid.group, _A2W(WEATHERPROTONAME));

 	colourid.defcolour = GetSysColor(COLOR_3DFACE);

 	ColourRegisterT(&colourid);

 

@@ -337,8 +337,8 @@ void InitMwin(void)
 	fontid.cbSize = sizeof(FontIDT);

 	fontid.flags = FIDF_ALLOWREREGISTER | FIDF_DEFAULTVALID;

 	mir_strcpy(fontid.dbSettingsGroup, WEATHERPROTONAME);

-	mir_tstrcpy(fontid.group, _A2W(WEATHERPROTONAME));

-	mir_tstrcpy(fontid.name, LPGENW("Frame Font"));

+	mir_wstrcpy(fontid.group, _A2W(WEATHERPROTONAME));

+	mir_wstrcpy(fontid.name, LPGENW("Frame Font"));

 	mir_strcpy(fontid.prefix, "fnt0");

 

 	HDC hdc = GetDC(NULL);

@@ -346,13 +346,13 @@ void InitMwin(void)
 	ReleaseDC(0, hdc);

 

 	fontid.deffontsettings.charset = DEFAULT_CHARSET;

-	mir_tstrcpy(fontid.deffontsettings.szFace, L"Verdana");

-	mir_tstrcpy(fontid.backgroundGroup, _A2W(WEATHERPROTONAME));

-	mir_tstrcpy(fontid.backgroundName, LPGENW("Frame Background"));

+	mir_wstrcpy(fontid.deffontsettings.szFace, L"Verdana");

+	mir_wstrcpy(fontid.backgroundGroup, _A2W(WEATHERPROTONAME));

+	mir_wstrcpy(fontid.backgroundName, LPGENW("Frame Background"));

 	FontRegisterT(&fontid);

 

 	fontid.deffontsettings.style = DBFONTF_BOLD;

-	mir_tstrcpy(fontid.name, LPGENW("Frame Title Font"));

+	mir_wstrcpy(fontid.name, LPGENW("Frame Title Font"));

 	mir_strcpy(fontid.prefix, "fnt1");

 	FontRegisterT(&fontid);