From 68924bfc1a213e619563c2cffb6d44b5b5346f6d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 26 Jun 2015 18:21:10 +0000 Subject: next slice of cutting out unused menu features - popupPosition git-svn-id: http://svn.miranda-ng.org/main/trunk@14400 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HistoryStats/src/main.cpp | 9 +++------ plugins/HistoryStats/src/mu_common.cpp | 3 +-- plugins/HistoryStats/src/mu_common.h | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) (limited to 'plugins/HistoryStats') diff --git a/plugins/HistoryStats/src/main.cpp b/plugins/HistoryStats/src/main.cpp index fceb2edb9b..28536605e8 100644 --- a/plugins/HistoryStats/src/main.cpp +++ b/plugins/HistoryStats/src/main.cpp @@ -161,8 +161,7 @@ void AddMainMenu() 1910000000, IconLib::getIcon(IconLib::iiMenuCreateStatistics), con::SvcCreateStatistics, - bInPopup ? LPGENT("Statistics") : NULL, // MEMO: implicit translation - bInPopup ? 1910000000 : 0); + bInPopup ? LPGENT("Statistics") : NULL); g_hMenuShowStatistics = mu::clist::addMainMenuItem( LPGENT("Show statistics"), // MEMO: implicit translation @@ -170,8 +169,7 @@ void AddMainMenu() 1910000001, IconLib::getIcon(IconLib::iiMenuShowStatistics), con::SvcShowStatistics, - bInPopup ? LPGENT("Statistics") : NULL, // MEMO: implicit translation - bInPopup ? 1910000000 : 0); + bInPopup ? LPGENT("Statistics") : NULL); g_hMenuConfigure = mu::clist::addMainMenuItem( bInPopup ? LPGENT("Configure...") : LPGENT("Configure statistics..."), // MEMO: implicit translation @@ -179,8 +177,7 @@ void AddMainMenu() 1910000002, IconLib::getIcon(IconLib::iiMenuConfigure), con::SvcConfigure, - bInPopup ? LPGENT("Statistics") : NULL, // MEMO: implicit translation - bInPopup ? 1910000000 : 0); + bInPopup ? LPGENT("Statistics") : NULL); } /* diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp index 0edf3fa601..0446013c4d 100644 --- a/plugins/HistoryStats/src/mu_common.cpp +++ b/plugins/HistoryStats/src/mu_common.cpp @@ -12,7 +12,7 @@ namespace mu namespace clist { - HGENMENU addMainMenuItem(const TCHAR* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, const TCHAR* pszPopupName /* = NULL */, int popupPosition /* = 0 */) + HGENMENU addMainMenuItem(const TCHAR* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, const TCHAR* pszPopupName /* = NULL */) { // TODO: support for unicode-core with unicode-aware CList CLISTMENUITEM mi = { 0 }; @@ -22,7 +22,6 @@ namespace mu mi.hIcon = hIcon; mi.pszService = const_cast(pszService); mi.ptszPopupName = (TCHAR*)pszPopupName; - mi.popupPosition = popupPosition; return Menu_AddMainMenuItem(&mi); } diff --git a/plugins/HistoryStats/src/mu_common.h b/plugins/HistoryStats/src/mu_common.h index 080b0fb931..e05b36c078 100644 --- a/plugins/HistoryStats/src/mu_common.h +++ b/plugins/HistoryStats/src/mu_common.h @@ -13,7 +13,7 @@ namespace mu namespace clist { - HGENMENU addMainMenuItem(const TCHAR* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, const TCHAR* pszPopupName = NULL, int popupPosition = 0); + HGENMENU addMainMenuItem(const TCHAR* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, const TCHAR* pszPopupName = NULL); HGENMENU addContactMenuItem(const TCHAR* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, const char* pszContactOwner = NULL); const TCHAR* getContactDisplayName(MCONTACT hContact); const TCHAR* getStatusModeDescription(int nStatusMode); -- cgit v1.2.3