From 81fe4a0a34e8e07305381e18e449246fef822673 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 18 Jun 2012 11:47:05 +0000
Subject: sync

git-svn-id: http://svn.miranda-ng.org/main/trunk@469 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/chat/tools.cpp    | 2 +-
 plugins/TabSRMM/chat/window.cpp   | 4 ++--
 plugins/TabSRMM/src/globals.cpp   | 6 +++---
 plugins/TabSRMM/src/msgdialog.cpp | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/TabSRMM')

diff --git a/plugins/TabSRMM/chat/tools.cpp b/plugins/TabSRMM/chat/tools.cpp
index 30aa3eba9e..3d8d54b381 100644
--- a/plugins/TabSRMM/chat/tools.cpp
+++ b/plugins/TabSRMM/chat/tools.cpp
@@ -943,7 +943,7 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO
 	int pos;
 
 	*hMenu = GetSubMenu(g_hMenu, iIndex);
-	CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) *hMenu, 0);
+	TranslateMenu(*hMenu);
 	gcmi.pszID = si->ptszID;
 	gcmi.pszModule = si->pszModule;
 	gcmi.pszUID = pszUID;
diff --git a/plugins/TabSRMM/chat/window.cpp b/plugins/TabSRMM/chat/window.cpp
index eba669e62d..175dc95d35 100644
--- a/plugins/TabSRMM/chat/window.cpp
+++ b/plugins/TabSRMM/chat/window.cpp
@@ -616,7 +616,7 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 			RemoveMenu(hSubMenu, 8, MF_BYPOSITION);
 			RemoveMenu(hSubMenu, 4, MF_BYPOSITION);
 			EnableMenuItem(hSubMenu, IDM_PASTEFORMATTED, MF_BYCOMMAND | ((mi && mi->bBold) ? MF_ENABLED : MF_GRAYED));
-			CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0);
+			TranslateMenu(hSubMenu);
 
 			SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM) & sel);
 			if (sel.cpMin == sel.cpMax) {
@@ -2944,7 +2944,7 @@ LABEL_SHOWWINDOW:
 										POINT pt;
 
 										hSubMenu = GetSubMenu(g_hMenu, 2);
-										CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0);
+										TranslateMenu(hSubMenu);
 										pt.x = (short) LOWORD(((ENLINK *) lParam)->lParam);
 										pt.y = (short) HIWORD(((ENLINK *) lParam)->lParam);
 										ClientToScreen(((NMHDR *) lParam)->hwndFrom, &pt);
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index c924b06675..07a4462386 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -150,7 +150,7 @@ void CGlobals::reloadSystemStartup()
 	dwThreadID = 						GetCurrentThreadId();
 
 	PluginConfig.g_hMenuContext = 		LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_TABCONTEXT));
-	CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM)g_hMenuContext, 0);
+	TranslateMenu(g_hMenuContext);
 
 	SkinAddNewSoundEx("RecvMsgActive", "Instant messages", "Incoming (Focused Window)");
 	SkinAddNewSoundEx("RecvMsgInactive", "Instant messages", "Incoming (Unfocused Window)");
@@ -315,7 +315,7 @@ void CGlobals::reloadSettings(bool fReloadSkins)
 	m_FlashOnMTN = 						M->GetByte(SRMSGMOD, SRMSGSET_SHOWTYPINGWINFLASH, SRMSGDEFSET_SHOWTYPINGWINFLASH);
 	if(m_MenuBar == 0) {
 		m_MenuBar = ::LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_MENUBAR));
-		CallService(MS_LANGPACK_TRANSLATEMENU, WPARAM(m_MenuBar), 0);
+		TranslateMenu(m_MenuBar);
 	}
 
 	m_ipBackgroundGradient = 			M->GetDword(FONTMODULE, "ipfieldsbg", 0x62caff);
@@ -364,7 +364,7 @@ const HMENU CGlobals::getMenuBar()
 {
 	if(m_MenuBar == 0) {
 		m_MenuBar = ::LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_MENUBAR));
-		CallService(MS_LANGPACK_TRANSLATEMENU, WPARAM(m_MenuBar), 0);
+		TranslateMenu(m_MenuBar);
 	}
 	return(m_MenuBar);
 }
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 9d70e9079e..1116c4139e 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -135,7 +135,7 @@ static void ShowPopupMenu(TWindowData *dat, int idFrom, HWND hwndFrom, POINT pt)
 		CheckMenuItem(hSubMenu, ID_EDITOR_SHOWMESSAGELENGTHINDICATOR, MF_BYCOMMAND | (PluginConfig.m_visualMessageSizeIndicator ? MF_CHECKED : MF_UNCHECKED));
 		EnableMenuItem(hSubMenu, ID_EDITOR_SHOWMESSAGELENGTHINDICATOR, MF_BYCOMMAND | (dat->pContainer->hwndStatus ? MF_ENABLED : MF_GRAYED));
 	}
-	CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0);
+	TranslateMenu(hSubMenu);
 	SendMessage(hwndFrom, EM_EXGETSEL, 0, (LPARAM) & sel);
 	if (sel.cpMin == sel.cpMax) {
 		EnableMenuItem(hSubMenu, IDM_COPY, MF_BYCOMMAND | MF_GRAYED);
@@ -2320,7 +2320,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 
 											hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_CONTEXT));
 											hSubMenu = GetSubMenu(hMenu, 1);
-											CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM) hSubMenu, 0);
+											TranslateMenu(hSubMenu);
 											pt.x = (short) LOWORD(((ENLINK *) lParam)->lParam);
 											pt.y = (short) HIWORD(((ENLINK *) lParam)->lParam);
 											ClientToScreen(((NMHDR *) lParam)->hwndFrom, &pt);
-- 
cgit v1.2.3