From 4810d4b1b7a47701b8e6c45490fb2643ea425123 Mon Sep 17 00:00:00 2001 From: George Hazan 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/BossKeyPlus/src/BossKey.cpp | 8 ++++---- plugins/BossKeyPlus/src/Options.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/BossKeyPlus/src') diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index f760da383e..23a52f1ef7 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -31,7 +31,8 @@ // unique to this DLL, not to be shared HINSTANCE g_hInstance; CLIST_INTERFACE *pcli; -HANDLE g_hMenuItem, g_hHideService, g_hIsHiddenService; +HGENMENU g_hMenuItem; +HANDLE g_hHideService, g_hIsHiddenService; HWINEVENTHOOK g_hWinHook; HWND g_hListenWindow, hDlg, g_hDlgPass, hOldForegroundWindow; HWND_ITEM *g_pMirWnds; // a pretty simple linked list @@ -602,8 +603,7 @@ static IconItem iconList[] = static int GenMenuInit(WPARAM wParam, LPARAM lParam) // Modify menu item text before to show the main menu { - if (g_hMenuItem) - { + if (g_hMenuItem) { TCHAR buf[128] = {0}; mir_sntprintf(buf, SIZEOF(buf), _T("%s [%s]"), TranslateT("Hide"), GetBossKeyText()); @@ -611,7 +611,7 @@ static int GenMenuInit(WPARAM wParam, LPARAM lParam) // Modify menu item text be mi.flags = CMIM_FLAGS | CMIF_TCHAR | CMIM_NAME; mi.ptszName = buf; - CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)g_hMenuItem,(LPARAM)&mi); + Menu_ModifyItem(g_hMenuItem, &mi); } return 0; } diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp index 01b0b073ae..dc0f1d5636 100644 --- a/plugins/BossKeyPlus/src/Options.cpp +++ b/plugins/BossKeyPlus/src/Options.cpp @@ -21,7 +21,7 @@ bool g_fOptionsOpen; bool g_fReqRass; -extern HANDLE g_hMenuItem; +extern HGENMENU g_hMenuItem; //void Disable_ChildWindows(HWND hwndParent) //{ -- cgit v1.2.3