summaryrefslogtreecommitdiff
path: root/plugins/MirOTR
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-06-25 15:22:06 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-06-25 15:22:06 +0000
commit65e6aa9b5468f26485a236a46fcb18541e1acf1a (patch)
tree61654d2c6f18523580372656d3bda6d7b93be845 /plugins/MirOTR
parent8501b9e4faa15257535e71b766f06f16b7971e39 (diff)
rest of genmenu api died
git-svn-id: http://svn.miranda-ng.org/main/trunk@14382 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirOTR')
-rw-r--r--plugins/MirOTR/src/mirotrmenu.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/src/mirotrmenu.cpp
index 38a1623905..377afc4547 100644
--- a/plugins/MirOTR/src/mirotrmenu.cpp
+++ b/plugins/MirOTR/src/mirotrmenu.cpp
@@ -57,7 +57,7 @@ INT_PTR MirOTRMenuCheckService(WPARAM wParam, LPARAM)
TrustLevel level = (TrustLevel)otr_context_get_trust(context);
TMO_MenuItem mi;
- if (CallService(MO_GETMENUITEM, (WPARAM)pcpp->MenuItemHandle, (LPARAM)&mi) == 0) {
+ if (Menu_GetItemInfo(pcpp->MenuItemHandle, mi) == 0) {
if (mi.flags & CMIF_HIDDEN) return FALSE;
if (mi.flags & CMIF_NOTPRIVATE && level == TRUST_PRIVATE) return FALSE;
if (mi.flags & CMIF_NOTFINISHED && level == TRUST_FINISHED) return FALSE;
@@ -111,7 +111,7 @@ INT_PTR OnAddMenuItemMirOTRMenu(WPARAM wParam, LPARAM lParam)
return 0;
TMO_MenuItem mi;
- if (CallService(MO_GETMENUITEM, (WPARAM)lParam, (LPARAM)&mi) == 0) {
+ if (Menu_GetItemInfo((HGENMENU)lParam, mi) == 0) {
if (mi.flags & CMIF_DISABLED) {
mii->fMask |= MIIM_STATE;
mii->fState |= MF_DISABLED;
@@ -124,10 +124,10 @@ LRESULT CALLBACK PopupMenuWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM
{
switch (message) {
case WM_MEASUREITEM:
- if (CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam)) return TRUE;
+ if (Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam)) return TRUE;
break;
case WM_DRAWITEM:
- if (CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam)) return TRUE;
+ if (Menu_DrawItem((LPDRAWITEMSTRUCT)lParam)) return TRUE;
break;
case WM_COMMAND:
if (Menu_ProcessCommandById(wParam, GetWindowLongPtr(hwnd, GWLP_USERDATA)))