no more TCHARs

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

4 files changed, 18 insertions, 18 deletions

diff --git a/plugins/NotesAndReminders/src/hotkeys.cpp b/plugins/NotesAndReminders/src/hotkeys.cpp
index 2e96dd1608..4084e6752b 100644
--- a/plugins/NotesAndReminders/src/hotkeys.cpp
+++ b/plugins/NotesAndReminders/src/hotkeys.cpp
@@ -15,32 +15,32 @@ void RegisterKeyBindings()
 

 	memset(&desc, 0, sizeof(desc));

 	desc.cbSize = sizeof(desc);

-	desc.ptszSection = _A2W(SECTIONNAME);

-	desc.dwFlags = HKD_TCHAR;

+	desc.pwszSection = _A2W(SECTIONNAME);

+	desc.dwFlags = HKD_UNICODE;

 

 	desc.pszName = MODULENAME"/NewNote";

-	desc.ptszDescription = LPGENW("New Note");

+	desc.pwszDescription = LPGENW("New Note");

 	desc.lParam = KB_NEW_NOTE;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, VK_INSERT);

 	desc.pszService = MODULENAME"/MenuCommandAddNew";

 	Hotkey_Register(&desc);

 

 	desc.pszName = MODULENAME"/ToggleNotesVis";

-	desc.ptszDescription = LPGENW("Toggle Notes Visibility");

+	desc.pwszDescription = LPGENW("Toggle Notes Visibility");

 	desc.lParam = KB_TOGGLE_NOTES;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, VK_ADD);

 	desc.pszService = MODULENAME"/MenuCommandShowHide";

 	Hotkey_Register(&desc);

 

 	desc.pszName = MODULENAME"/BringNotesFront";

-	desc.ptszDescription = LPGENW("Bring All Notes to Front");

+	desc.pwszDescription = LPGENW("Bring All Notes to Front");

 	desc.lParam = KB_TOGGLE_NOTES;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, VK_HOME);

 	desc.pszService = MODULENAME"/MenuCommandBringAllFront";

 	Hotkey_Register(&desc);

 

 	desc.pszName = MODULENAME"/NewReminder";

-	desc.ptszDescription = LPGENW("New Reminder");

+	desc.pwszDescription = LPGENW("New Reminder");

 	desc.lParam = KB_NEW_REMINDER;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, VK_SUBTRACT);

 	desc.pszService = MODULENAME"/MenuCommandNewReminder";

diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp
index ca2511778d..487a632113 100644
--- a/plugins/NotesAndReminders/src/main.cpp
+++ b/plugins/NotesAndReminders/src/main.cpp
@@ -123,7 +123,7 @@ int OnOptInitialise(WPARAM w, LPARAM L)
 	odp.pszTitle = SECTIONNAME;

 	odp.pszGroup = LPGEN("Plugins");

 	odp.pfnDlgProc = DlgProcOptions;

-	odp.flags = ODPF_TCHAR;

+	odp.flags = ODPF_UNICODE;

 	Options_AddPage(w, &odp);

 	return 0;

 }

@@ -198,7 +198,7 @@ int OnModulesLoaded(WPARAM wparam, LPARAM lparam)
 	CMenuItem mi;

 	mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("Notes && Reminders"), 1600000000);

 	Menu_ConfigureItem(mi.root, MCI_OPT_UID, "A5E140BC-D697-4689-B75B-8ECFB6FE5931");

-	mi.flags = CMIF_TCHAR;

+	mi.flags = CMIF_UNICODE;

 

 	mi.position = 1600000000;

 	mi.hIcolibItem = iconList[2].hIcolib;

diff --git a/plugins/NotesAndReminders/src/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp
index dc506b5420..0708bbfcaf 100644
--- a/plugins/NotesAndReminders/src/notes.cpp
+++ b/plugins/NotesAndReminders/src/notes.cpp
@@ -1025,10 +1025,10 @@ static BOOL DoContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam)
 		HMENU hFg = GetSubMenu(hSub, FindMenuItem(hSub, "Text Color"));
 
 		for (i=0; i<_countof(clrPresets); i++)
-			InsertMenu(hBg, i, MF_BYPOSITION|MF_OWNERDRAW, IDM_COLORPRESET_BG+i, TranslateTS(clrPresets[i].szName));
+			InsertMenu(hBg, i, MF_BYPOSITION|MF_OWNERDRAW, IDM_COLORPRESET_BG+i, Translate(clrPresets[i].szName));
 
 		for (i=0; i<_countof(clrPresets); i++)
-			InsertMenu(hFg, i, MF_BYPOSITION|MF_OWNERDRAW, IDM_COLORPRESET_FG+i, TranslateTS(clrPresets[i].szName));
+			InsertMenu(hFg, i, MF_BYPOSITION|MF_OWNERDRAW, IDM_COLORPRESET_FG+i, Translate(clrPresets[i].szName));
 	}
 
 	TranslateMenu(FhMenu);
@@ -1040,7 +1040,7 @@ static BOOL DoContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam)
 static void MeasureColorPresetMenuItem(HWND hdlg, LPMEASUREITEMSTRUCT lpMeasureItem, struct ColorPreset *clrPresets)
 {
 	HDC hdc = GetDC(hdlg);
-	LPSTR lpsz = TranslateTS(clrPresets->szName);
+	LPSTR lpsz = Translate(clrPresets->szName);
 	SIZE sz;
 	GetTextExtentPoint32(hdc, lpsz, (int)mir_strlen(lpsz), &sz);
 	ReleaseDC(hdlg, hdc);
diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp
index 5095c216f2..fea1ee5f5c 100644
--- a/plugins/NotesAndReminders/src/options.cpp
+++ b/plugins/NotesAndReminders/src/options.cpp
@@ -228,7 +228,7 @@ void RegisterFontServiceFonts()
 	char szTemp[100];

 

 	FontID fontid = { 0 };

-	fontid.cbSize = sizeof(FontIDT);

+	fontid.cbSize = sizeof(FontIDW);

 

 	strncpy(fontid.group, SECTIONNAME, _countof(fontid.group));

 	strncpy(fontid.backgroundGroup, SECTIONNAME, _countof(fontid.backgroundGroup));

@@ -254,11 +254,11 @@ void RegisterFontServiceFonts()
 		strncpy(fontid.deffontsettings.szFace, fontOptionsList[i].szDefFace, _countof(fontid.deffontsettings.szFace));

 		strncpy(fontid.backgroundName, fontOptionsList[i].szBkgName, _countof(fontid.backgroundName));

 

-		FontRegisterT(&fontid);

+		FontRegister(&fontid);

 	}

 

-	ColourIDT colorid = { 0 };

-	colorid.cbSize = sizeof(ColourIDT);

+	ColourID colorid = { 0 };

+	colorid.cbSize = sizeof(ColourIDW);

 

 	strncpy(colorid.group, SECTIONNAME, _countof(colorid.group));

 	strncpy(colorid.dbSettingsGroup, MODULENAME, _countof(fontid.dbSettingsGroup));

@@ -270,7 +270,7 @@ void RegisterFontServiceFonts()
 		colorid.defcolour = colourOptionsList[i].defColour;

 		strncpy(colorid.setting, colourOptionsList[i].szSettingName, _countof(colorid.setting));

 

-		ColourRegisterT(&colorid);

+		ColourRegister(&colorid);

 	}

 

 	hkFontChange = HookEvent(ME_FONT_RELOAD, FS_FontsChanged);

@@ -279,13 +279,13 @@ void RegisterFontServiceFonts()
 

 void LoadNRFont(int i, LOGFONT *lf, COLORREF *colour)

 {

-	FontIDT fontid = { 0 };

+	FontID fontid = { 0 };

 

 	fontid.cbSize = sizeof(fontid);

 	strncpy(fontid.group, LPGEN(SECTIONNAME), _countof(fontid.group));

 	strncpy(fontid.name, fontOptionsList[i].szDescr, _countof(fontid.name));

 

-	COLORREF col = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)lf);

+	COLORREF col = CallService(MS_FONT_GETW, (WPARAM)&fontid, (LPARAM)lf);

 	if (colour)

 		*colour = col;

 }