From 88790eed4ffd9ca555c8f9b73cb014a93b57a34f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 22 Jun 2015 20:38:56 +0000 Subject: Menu_ModifyItem unbound from CLISTMENUITEM structure git-svn-id: http://svn.miranda-ng.org/main/trunk@14334 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/WhatsApp/src/proto.h | 3 +-- protocols/WhatsApp/src/theme.cpp | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'protocols/WhatsApp') diff --git a/protocols/WhatsApp/src/proto.h b/protocols/WhatsApp/src/proto.h index 2c7cf2e97e..cc6d787b7f 100644 --- a/protocols/WhatsApp/src/proto.h +++ b/protocols/WhatsApp/src/proto.h @@ -141,8 +141,7 @@ private: // Private data ////////////////////////////////////////////////////////////////////// - HGENMENU m_hMenuRoot; - HANDLE m_hMenuCreateGroup; + HGENMENU m_hMenuRoot, m_hMenuCreateGroup; HANDLE update_loop_lock_; diff --git a/protocols/WhatsApp/src/theme.cpp b/protocols/WhatsApp/src/theme.cpp index 913d7b5aab..ac5f6ff3ff 100644 --- a/protocols/WhatsApp/src/theme.cpp +++ b/protocols/WhatsApp/src/theme.cpp @@ -84,9 +84,7 @@ int WhatsAppProto::OnBuildStatusMenu(WPARAM wParam, LPARAM lParam) void WhatsAppProto::ToggleStatusMenuItems(BOOL bEnable) { - CLISTMENUITEM clmi = { 0 }; - clmi.flags = CMIM_FLAGS | ((bEnable) ? 0 : CMIF_GRAYED); - - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)m_hMenuRoot, (LPARAM)&clmi); - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)m_hMenuCreateGroup, (LPARAM)&clmi); + int flags = (bEnable) ? 0 : CMIF_GRAYED; + Menu_ModifyItem(m_hMenuRoot, NULL, INVALID_HANDLE_VALUE, flags); + Menu_ModifyItem(m_hMenuCreateGroup, NULL, INVALID_HANDLE_VALUE, flags); } -- cgit v1.2.3