diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-27 21:50:25 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-27 21:50:25 +0000 |
| commit | 24415c15d859a94a34a2b575af74336a9aff5f45 (patch) | |
| tree | ecca2fa440ba5064a60bc90aa3f6843b1feb46f2 /plugins/TabSRMM/src | |
| parent | 944634aed3d3f7849a207b5007c6f8c4d6c2c975 (diff) | |
- clist menus went to functions
- m_clist.h cleaning & reordering
git-svn-id: http://svn.miranda-ng.org/main/trunk@14422 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src')
| -rw-r--r-- | plugins/TabSRMM/src/container.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/controls.cpp | 7 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/generic_msghandlers.cpp | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp index f863d29df0..eee8436feb 100644 --- a/plugins/TabSRMM/src/container.cpp +++ b/plugins/TabSRMM/src/container.cpp @@ -757,7 +757,7 @@ static INT_PTR CALLBACK DlgProcContainer(HWND hwndDlg, UINT msg, WPARAM wParam, SendMessage(pContainer->hwndActive, DM_QUERYHCONTACT, 0, (LPARAM)&hContact);
if (hContact) {
int iSel = 0;
- HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDCONTACT, hContact, 0);
+ HMENU hMenu = Menu_BuildContactMenu(hContact);
iSel = TrackPopupMenu(hMenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL);
if (iSel)
CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(iSel), MPCF_CONTACTMENU), hContact);
diff --git a/plugins/TabSRMM/src/controls.cpp b/plugins/TabSRMM/src/controls.cpp index 7afb2db8dd..0d84f4381b 100644 --- a/plugins/TabSRMM/src/controls.cpp +++ b/plugins/TabSRMM/src/controls.cpp @@ -389,15 +389,14 @@ void CMenuBar::invoke(const int id) MCONTACT hContact = dat ? dat->hContact : 0;
if (index == 3 && hContact != 0) {
- hMenu = reinterpret_cast<HMENU>(::CallService(MS_CLIST_MENUBUILDCONTACT, hContact, 0));
+ hMenu = Menu_BuildContactMenu(hContact);
m_isContactMenu = true;
}
else if (index == 0) {
- hMenu = reinterpret_cast<HMENU>(::CallService(MS_CLIST_MENUBUILDMAIN, 0, 0));
+ hMenu = Menu_BuildMainMenu();
m_isMainMenu = true;
}
- else
- hMenu = reinterpret_cast<HMENU>(m_TbButtons[index].dwData);
+ else hMenu = reinterpret_cast<HMENU>(m_TbButtons[index].dwData);
RECT rcButton;
POINT pt;
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index 5075eaef36..1f647c7d5a 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -559,7 +559,7 @@ LRESULT TSAPI DM_MsgWindowCmdHandler(HWND hwndDlg, TContainerData *m_pContainer, break; case IDC_PROTOCOL: - submenu = (HMENU)CallService(MS_CLIST_MENUBUILDCONTACT, dat->hContact, 0); + submenu = Menu_BuildContactMenu(dat->hContact); if (lParam == 0) GetWindowRect(GetDlgItem(hwndDlg, IDC_PROTOCOL), &rc); else |