From ab4abbb7a60f941acab8f0566c6b619f68f1b489 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 27 Jun 2015 11:09:19 +0000 Subject: - CLISTMENUITEM::pszContactOwner removed, because it's supported only by contact's menu; - Menu_AddContactMenuItem now receives parameter szProto; - Menu_Add* helpers are converted into real functions; git-svn-id: http://svn.miranda-ng.org/main/trunk@14409 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HistoryStats/src/mu_common.cpp | 11 +++++------ plugins/HistoryStats/src/mu_common.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'plugins/HistoryStats') diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp index 7c344b2738..077bdc8c1d 100644 --- a/plugins/HistoryStats/src/mu_common.cpp +++ b/plugins/HistoryStats/src/mu_common.cpp @@ -16,25 +16,24 @@ namespace mu { // TODO: support for unicode-core with unicode-aware CList CLISTMENUITEM mi = { 0 }; - mi.ptszName = (TCHAR*)pszName; + mi.name.t = (TCHAR*)pszName; mi.flags = flags | CMIF_TCHAR; mi.position = position; - mi.hIcon = hIcon; + mi.icolibItem = hIcon; mi.pszService = const_cast(pszService); mi.hParentMenu = hRoot; return Menu_AddMainMenuItem(&mi); } - HGENMENU addContactMenuItem(const TCHAR* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, const char* pszContactOwner /* = NULL */) + HGENMENU addContactMenuItem(const TCHAR* pszName, DWORD flags, int position, HICON hIcon, const char* pszService) { // TODO: support for unicode-core with unicode-aware CList CLISTMENUITEM mi = { 0 }; - mi.ptszName = (TCHAR*)pszName; + mi.name.t = (TCHAR*)pszName; mi.flags = flags | CMIF_TCHAR; mi.position = position; - mi.hIcon = hIcon; + mi.icolibItem = hIcon; mi.pszService = const_cast(pszService); - mi.pszContactOwner = const_cast(pszContactOwner); return Menu_AddContactMenuItem(&mi); } diff --git a/plugins/HistoryStats/src/mu_common.h b/plugins/HistoryStats/src/mu_common.h index 9e1bf12eae..0f760cfcfe 100644 --- a/plugins/HistoryStats/src/mu_common.h +++ b/plugins/HistoryStats/src/mu_common.h @@ -14,7 +14,7 @@ namespace mu namespace clist { HGENMENU addMainMenuItem(const TCHAR* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, HGENMENU hRoot = 0); - HGENMENU addContactMenuItem(const TCHAR* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, const char* pszContactOwner = NULL); + HGENMENU addContactMenuItem(const TCHAR* pszName, DWORD flags, int position, HICON hIcon, const char* pszService); const TCHAR* getContactDisplayName(MCONTACT hContact); const TCHAR* getStatusModeDescription(int nStatusMode); } -- cgit v1.2.3