From 4810d4b1b7a47701b8e6c45490fb2643ea425123 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 5 Apr 2013 23:13:56 +0000
Subject: rest of menu cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@4325 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Dbx_mmap_SA/src/commonheaders.h | 5 +++--
 plugins/Dbx_mmap_SA/src/dialogs.cpp     | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'plugins/Dbx_mmap_SA')

diff --git a/plugins/Dbx_mmap_SA/src/commonheaders.h b/plugins/Dbx_mmap_SA/src/commonheaders.h
index b454148bc7..87255bdc18 100644
--- a/plugins/Dbx_mmap_SA/src/commonheaders.h
+++ b/plugins/Dbx_mmap_SA/src/commonheaders.h
@@ -35,6 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 #include <m_system_cpp.h>
 #include <m_database.h>
+#include <m_genmenu.h>
 #include <m_langpack.h>
 #include <m_options.h>
 #include <m_skin.h>
@@ -48,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "version.h"
 
 extern HINSTANCE g_hInst;
-extern HANDLE hSetPwdMenu;
+extern HGENMENU hSetPwdMenu;
 
 #ifdef __GNUC__
 #define mir_i64(x) (x##LL)
@@ -80,7 +81,7 @@ INT_PTR CALLBACK DlgChangePass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam)
 INT_PTR CALLBACK DlgStdNewPass(HWND hDlg, UINT uMsg,WPARAM wParam,LPARAM lParam);
 INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 
-void xModifyMenu(HANDLE hMenu,long flags,const TCHAR* name, HICON hIcon);
+void xModifyMenu(HGENMENU hMenu,long flags,const TCHAR* name, HICON hIcon);
 
 extern DBSignature dbSignature, dbSignatureSecured, dbSignatureNonSecured;
 
diff --git a/plugins/Dbx_mmap_SA/src/dialogs.cpp b/plugins/Dbx_mmap_SA/src/dialogs.cpp
index 90c0fdbbab..c1b8e29d1f 100644
--- a/plugins/Dbx_mmap_SA/src/dialogs.cpp
+++ b/plugins/Dbx_mmap_SA/src/dialogs.cpp
@@ -8,7 +8,7 @@
 
 extern LIST<CryptoModule> arCryptors;
 
-HANDLE hSetPwdMenu;
+HGENMENU hSetPwdMenu;
 
 BOOL ShowDlgItem(HWND hwndDlg, int iIDCtrl, BOOL bShow)
 {
@@ -69,7 +69,7 @@ INT_PTR ChangePassword(void* obj, LPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-void xModifyMenu(HANDLE hMenu,long flags,const TCHAR* name, HICON hIcon)
+void xModifyMenu(HGENMENU hMenu,long flags,const TCHAR* name, HICON hIcon)
 {
 	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.flags = CMIM_FLAGS | CMIF_TCHAR;
@@ -78,7 +78,7 @@ void xModifyMenu(HANDLE hMenu,long flags,const TCHAR* name, HICON hIcon)
 	mi.flags |= flags;
 	mi.ptszName = (TCHAR*)name;
 	mi.hIcon = hIcon;
-	CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)hMenu,(LPARAM)&mi);
+	Menu_ModifyItem(hMenu, &mi);
 }
 
 static IconItem iconList[] = 
-- 
cgit v1.2.3