diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-29 19:30:51 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-29 19:30:51 +0000 |
| commit | ee3100701b64a1a34e8e5b3069219c7c5a201d8a (patch) | |
| tree | 65ae99da9575d2611734482dcedec21bf7f186db /protocols/MRA/src/Mra_menus.cpp | |
| parent | cadd3f86302d30d6d6a2e4af63a7a50f0dd1f1cb (diff) | |
- unified menu creation using wrapper class CMenuItem;
- duplicated hLangpack field removed from TMO_IntMenuItem;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@14440 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA/src/Mra_menus.cpp')
| -rw-r--r-- | protocols/MRA/src/Mra_menus.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp index 41563e74bb..32c6eeda27 100644 --- a/protocols/MRA/src/Mra_menus.cpp +++ b/protocols/MRA/src/Mra_menus.cpp @@ -284,14 +284,14 @@ int CMraProto::MraRebuildStatusMenu(WPARAM, LPARAM) TCHAR szItem[MAX_PATH + 64];
mir_sntprintf(szItem, _countof(szItem), _T("%s Custom Status"), m_tszUserName);
- TMO_MenuItem mi = { 0 };
+ CMenuItem mi;
mi.root = Menu_GetProtocolRoot(m_szModuleName);
mi.name.t = szItem;
mi.position = 10001;
hRoot = Menu_AddStatusMenuItem(&mi);
}
- TMO_MenuItem mi = { 0 };
+ CMenuItem mi;
mi.position = 2000060000;
mi.root = hRoot;
mi.flags = CMIF_UNICODE;
@@ -332,9 +332,9 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI char szServiceFunction[MAX_PATH];
- TMO_MenuItem mi = { 0 };
+ CMenuItem mi;
- HGENMENU hRootMenu, (__stdcall *fnAddFunc)(TMO_MenuItem*, const char*, int);
+ HGENMENU hRootMenu, (__stdcall *fnAddFunc)(TMO_MenuItem*, const char*);
if (bIsMain) {
fnAddFunc = Menu_AddProtoMenuItem;
@@ -357,7 +357,7 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI mi.flags = 0;
mi.name.a = LPGEN("Services...");
mi.hIcolibItem = g_hMainIcon;
- hRootMenu = fnAddFunc(&mi, m_szModuleName, hLangpack);
+ hRootMenu = fnAddFunc(&mi, m_szModuleName);
mi.root = hRootMenu;
mi.pszService = szServiceFunction;
@@ -367,7 +367,7 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI mi.position = int(lPosition + i);
mi.hIcolibItem = pgdiItems[i].hIcolib;
mi.name.a = pgdiItems[i].szDescr;
- hResult[i] = fnAddFunc(&mi, m_szModuleName, hLangpack);
+ hResult[i] = fnAddFunc(&mi, m_szModuleName);
Menu_ConfigureItem(hResult[i], MCI_OPT_EXECPARAM, lPopupPosition);
}
|