From 378f689c0e7756fb504109604ab095ffad5faadb Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 19 Jan 2013 19:18:18 +0000 Subject: - Another portion of _T replacement (patch from person) git-svn-id: http://svn.miranda-ng.org/main/trunk@3176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/src/chat/services.cpp | 2 +- plugins/Scriver/src/chat/window.cpp | 24 ++++++++++++------------ plugins/Scriver/src/globals.cpp | 30 +++++++++++++++--------------- plugins/Scriver/src/input.cpp | 28 ++++++++++++++-------------- plugins/Scriver/src/msgdialog.cpp | 14 +++++++------- plugins/Scriver/src/msglog.cpp | 16 ++++++++-------- 6 files changed, 57 insertions(+), 57 deletions(-) (limited to 'plugins/Scriver/src') diff --git a/plugins/Scriver/src/chat/services.cpp b/plugins/Scriver/src/chat/services.cpp index f5538861b8..c332375871 100644 --- a/plugins/Scriver/src/chat/services.cpp +++ b/plugins/Scriver/src/chat/services.cpp @@ -244,7 +244,7 @@ static INT_PTR Service_NewChat(WPARAM wParam, LPARAM lParam) si->bBGSet = TRUE; } if (si->iType == GCW_SERVER) - mir_sntprintf(szTemp, SIZEOF(szTemp), _T("Server: %s"), si->ptszName); + mir_sntprintf(szTemp, SIZEOF(szTemp), LPGENT("Server: %s"), si->ptszName); else mir_sntprintf(szTemp, SIZEOF(szTemp), _T("%s"), si->ptszName); si->windowData.hContact = CList_AddRoom( gcw->pszModule, ptszID, szTemp, si->iType); diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp index 2e60fa30da..ccc59410b8 100644 --- a/plugins/Scriver/src/chat/window.cpp +++ b/plugins/Scriver/src/chat/window.cpp @@ -44,18 +44,18 @@ static WNDPROC OldFilterButtonProc; static WNDPROC OldLogProc; static ToolbarButton toolbarButtons[] = { - {_T("Bold"), IDC_CHAT_BOLD, 0, 4, 24}, - {_T("Italic"), IDC_CHAT_ITALICS, 0, 0, 24}, - {_T("Underline"), IDC_CHAT_UNDERLINE, 0, 0, 24}, - {_T("Text color"), IDC_CHAT_COLOR, 0, 0, 24}, - {_T("Background color"), IDC_CHAT_BKGCOLOR, 0, 0, 24}, -// {_T("Font size"), IDC_CHAT_FONTSIZE, 0, 0, 48}, - {_T("Smiley"), IDC_CHAT_SMILEY, 0, 8, 24}, - {_T("History"), IDC_CHAT_HISTORY, 1, 0, 24}, - {_T("Filter"), IDC_CHAT_FILTER, 1, 0, 24}, - {_T("Manager"), IDC_CHAT_CHANMGR, 1, 0, 24}, - {_T("Nick list"), IDC_CHAT_SHOWNICKLIST, 1, 0, 24}, - {_T("Send"), IDOK, 1, 0, 38}, + {LPGENT("Bold"), IDC_CHAT_BOLD, 0, 4, 24}, + {LPGENT("Italic"), IDC_CHAT_ITALICS, 0, 0, 24}, + {LPGENT("Underline"), IDC_CHAT_UNDERLINE, 0, 0, 24}, + {LPGENT("Text color"), IDC_CHAT_COLOR, 0, 0, 24}, + {LPGENT("Background color"), IDC_CHAT_BKGCOLOR, 0, 0, 24}, +// {LPGENT("Font size"), IDC_CHAT_FONTSIZE, 0, 0, 48}, + {LPGENT("Smiley"), IDC_CHAT_SMILEY, 0, 8, 24}, + {LPGENT("History"), IDC_CHAT_HISTORY, 1, 0, 24}, + {LPGENT("Filter"), IDC_CHAT_FILTER, 1, 0, 24}, + {LPGENT("Manager"), IDC_CHAT_CHANMGR, 1, 0, 24}, + {LPGENT("Nick list"), IDC_CHAT_SHOWNICKLIST, 1, 0, 24}, + {LPGENT("Send"), IDOK, 1, 0, 38}, }; typedef struct diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp index 50dcdb68c2..7c1f15c2e8 100644 --- a/plugins/Scriver/src/globals.cpp +++ b/plugins/Scriver/src/globals.cpp @@ -210,21 +210,21 @@ static BOOL CALLBACK LangAddCallback(CHAR * str) { int i, count; UINT cp; static struct { UINT cpId; const TCHAR *cpName; } cpTable[] = { - { 874, _T("Thai") }, // - { 932, _T("Japanese") }, // - { 936, _T("Simplified Chinese") }, // - { 949, _T("Korean") }, // - { 950, _T("Traditional Chinese") }, // - { 1250, _T("Central European") }, // - { 1251, _T("Cyrillic") }, // - { 1252, _T("Latin I") }, // - { 1253, _T("Greek") }, // - { 1254, _T("Turkish") }, // - { 1255, _T("Hebrew") }, // - { 1256, _T("Arabic") }, // - { 1257, _T("Baltic") }, // - { 1258, _T("Vietnamese") }, // - { 1361, _T("Korean (Johab)") } + { 874, LPGENT("Thai") }, // + { 932, LPGENT("Japanese") }, // + { 936, LPGENT("Simplified Chinese") }, // + { 949, LPGENT("Korean") }, // + { 950, LPGENT("Traditional Chinese") }, // + { 1250, LPGENT("Central European") }, // + { 1251, LPGENT("Cyrillic") }, // + { 1252, LPGENT("Latin I") }, // + { 1253, LPGENT("Greek") }, // + { 1254, LPGENT("Turkish") }, // + { 1255, LPGENT("Hebrew") }, // + { 1256, LPGENT("Arabic") }, // + { 1257, LPGENT("Baltic") }, // + { 1258, LPGENT("Vietnamese") }, // + { 1361, LPGENT("Korean (Johab)") } }; cp = atoi(str); count = sizeof(cpTable)/sizeof(cpTable[0]); diff --git a/plugins/Scriver/src/input.cpp b/plugins/Scriver/src/input.cpp index 79dce58fdc..8539f8f3af 100644 --- a/plugins/Scriver/src/input.cpp +++ b/plugins/Scriver/src/input.cpp @@ -293,9 +293,9 @@ void RegisterKeyBindings() { HOTKEYDESC desc; ZeroMemory(&desc, sizeof(desc)); desc.cbSize = sizeof(desc); - desc.pszSection = "Messaging"; + desc.pszSection = LPGEN("Messaging"); desc.pszName = "Scriver/Nav/Previous Tab"; - desc.pszDescription = "Navigate: Previous Tab"; + desc.pszDescription = LPGEN("Navigate: Previous Tab"); desc.lParam = KB_PREV_TAB; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, VK_TAB); Hotkey_Register( &desc); @@ -305,7 +305,7 @@ void RegisterKeyBindings() { Hotkey_Register( &desc); desc.pszName = "Scriver/Nav/Next Tab"; - desc.pszDescription = "Navigate: Next Tab"; + desc.pszDescription = LPGEN("Navigate: Next Tab"); desc.lParam = KB_NEXT_TAB; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, VK_TAB); Hotkey_Register( &desc); @@ -317,50 +317,50 @@ void RegisterKeyBindings() { desc.pszDescription = strDesc; for (i = 0; i < 9; i++) { mir_snprintf(strName, SIZEOF(strName), "Scriver/Nav/Tab %d", i + 1); - mir_snprintf(strDesc, SIZEOF(strDesc), "Navigate: Tab %d", i + 1); + mir_snprintf(strDesc, SIZEOF(strDesc), LPGEN("Navigate: Tab %d"), i + 1); desc.lParam = KB_TAB1 + i; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, '1' + i); Hotkey_Register( &desc); } desc.pszName = "Scriver/Wnd/Toggle Statusbar"; - desc.pszDescription = "Window: Toggle Statusbar"; + desc.pszDescription = LPGEN("Window: Toggle Statusbar"); desc.lParam = KB_SWITCHSTATUSBAR; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'S'); Hotkey_Register( &desc); desc.pszName = "Scriver/Wnd/Toggle Titlebar"; - desc.pszDescription = "Window: Toggle Titlebar"; + desc.pszDescription = LPGEN("Window: Toggle Titlebar"); desc.lParam = KB_SWITCHTITLEBAR; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'M'); Hotkey_Register( &desc); desc.pszName = "Scriver/Wnd/Toggle Toolbar"; - desc.pszDescription = "Window: Toggle Toolbar"; + desc.pszDescription = LPGEN("Window: Toggle Toolbar"); desc.lParam = KB_SWITCHTOOLBAR; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'T'); Hotkey_Register( &desc); desc.pszName = "Scriver/Wnd/Toggle Infobar"; - desc.pszDescription = "Window: Toggle Infobar"; + desc.pszDescription = LPGEN("Window: Toggle Infobar"); desc.lParam = KB_SWITCHINFOBAR; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'N'); Hotkey_Register( &desc); desc.pszName = "Scriver/Wnd/Clear Log"; - desc.pszDescription = "Window: Clear Log"; + desc.pszDescription = LPGEN("Window: Clear Log"); desc.lParam = KB_CLEAR_LOG; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'L'); Hotkey_Register( &desc); desc.pszName = "Scriver/Wnd/Minimize"; - desc.pszDescription = "Window: Minimize"; + desc.pszDescription = LPGEN("Window: Minimize"); desc.lParam = KB_MINIMIZE; desc.DefHotKey = HOTKEYCODE(HOTKEYF_SHIFT, VK_ESCAPE); Hotkey_Register( &desc); desc.pszName = "Scriver/Wnd/Close Tab"; - desc.pszDescription = "Window: Close Tab"; + desc.pszDescription = LPGEN("Window: Close Tab"); desc.lParam = KB_CLOSE; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, VK_F4); Hotkey_Register( &desc); @@ -368,19 +368,19 @@ void RegisterKeyBindings() { Hotkey_Register( &desc); desc.pszName = "Scriver/Action/Quote"; - desc.pszDescription = "Action: Quote"; + desc.pszDescription = LPGEN("Action: Quote"); desc.lParam = KB_QUOTE; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'Q'); Hotkey_Register( &desc); desc.pszName = "Scriver/Action/Send All"; - desc.pszDescription = "Action: Send to All"; + desc.pszDescription = LPGEN("Action: Send to All"); desc.lParam = KB_SEND_ALL; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, VK_RETURN); Hotkey_Register( &desc); desc.pszName = "Scriver/Action/PasteSend"; - desc.pszDescription = "Action: Paste & Send"; + desc.pszDescription = LPGEN("Action: Paste & Send"); desc.lParam = KB_PASTESEND; desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, VK_INSERT); Hotkey_Register( &desc); diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 757f74aaa5..9b90c24636 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -43,13 +43,13 @@ static void UpdateReadChars(HWND hwndDlg, struct SrmmWindowData * dat); static WNDPROC OldMessageEditProc, OldLogEditProc; static ToolbarButton toolbarButtons[] = { - {_T("Quote"), IDC_QUOTE, 0, 4, 24}, - {_T("Smiley"), IDC_SMILEYS, 0, 10, 24}, - {_T("Add Contact"), IDC_ADD, 0, 10, 24}, - {_T("User Menu"), IDC_USERMENU, 1, 0, 24}, - {_T("User Details"), IDC_DETAILS, 1, 0, 24}, - {_T("History"), IDC_HISTORY, 1, 0, 24}, - {_T("Send"), IDOK, 1, 0, 38} + {LPGENT("Quote"), IDC_QUOTE, 0, 4, 24}, + {LPGENT("Smiley"), IDC_SMILEYS, 0, 10, 24}, + {LPGENT("Add Contact"), IDC_ADD, 0, 10, 24}, + {LPGENT("User Menu"), IDC_USERMENU, 1, 0, 24}, + {LPGENT("User Details"), IDC_DETAILS, 1, 0, 24}, + {LPGENT("History"), IDC_HISTORY, 1, 0, 24}, + {LPGENT("Send"), IDOK, 1, 0, 38} }; static DWORD CALLBACK StreamOutCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG * pcb) diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp index 6c610bd0cd..d197809415 100644 --- a/plugins/Scriver/src/msglog.cpp +++ b/plugins/Scriver/src/msglog.cpp @@ -243,21 +243,21 @@ static EventData *GetTestEvents() { EventData *event, *firstEvent, *prevEvent; firstEvent = prevEvent = event = GetTestEvent(IEEDF_SENT); - event->pszNickT = mir_tstrdup(_T("Me")); - event->pszTextT = mir_tstrdup(_T("O Lord, bless this Thy hand grenade that with it Thou mayest blow Thine enemies")); + event->pszNickT = mir_tstrdup(LPGENT("Me")); + event->pszTextT = mir_tstrdup(LPGENT("O Lord, bless this Thy hand grenade that with it Thou mayest blow Thine enemies")); event = GetTestEvent(IEEDF_SENT); - event->pszNickT = mir_tstrdup(_T("Me")); - event->pszTextT = mir_tstrdup(_T("to tiny bits, in Thy mercy")); + event->pszNickT = mir_tstrdup(LPGENT("Me")); + event->pszTextT = mir_tstrdup(LPGENT("to tiny bits, in Thy mercy")); prevEvent->next = event; prevEvent = event; event = GetTestEvent(0); - event->pszNickT = mir_tstrdup(_T("My Contact")); - event->pszTextT = mir_tstrdup(_T("Lorem ipsum dolor sit amet,")); + event->pszNickT = mir_tstrdup(LPGENT("My Contact")); + event->pszTextT = mir_tstrdup(LPGENT("Lorem ipsum dolor sit amet,")); prevEvent->next = event; prevEvent = event; event = GetTestEvent(0); - event->pszNickT = mir_tstrdup(_T("My Contact")); - event->pszTextT = mir_tstrdup(_T("consectetur adipisicing elit")); + event->pszNickT = mir_tstrdup(LPGENT("My Contact")); + event->pszTextT = mir_tstrdup(LPGENT("consectetur adipisicing elit")); prevEvent->next = event; prevEvent = event; return firstEvent; -- cgit v1.2.3