diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-05-30 13:23:02 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-05-30 13:23:02 +0300 |
| commit | 6573793a5488ed95e9acd6673a9f1335727802d4 (patch) | |
| tree | a251c156bc17686b933a92c145b33bd50184f26e /src | |
| parent | fa4668dc4544ef59ec97bcbe7899c1f1d0cbcf83 (diff) | |
Chat_CreateMenu: no need to execute the menu inside this function
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/chat_tools.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/menu_groups.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_base.cpp | 3 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_log_rtf.cpp | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/mir_app/src/chat_tools.cpp b/src/mir_app/src/chat_tools.cpp index e2b4865e12..4d532fa871 100644 --- a/src/mir_app/src/chat_tools.cpp +++ b/src/mir_app/src/chat_tools.cpp @@ -812,7 +812,7 @@ MIR_APP_DLL(void) Chat_AddMenuItems(HMENU hMenu, int nItems, const gc_item *Item /////////////////////////////////////////////////////////////////////////////////////////
-MIR_APP_DLL(UINT) Chat_CreateMenu(HWND hwnd, HMENU hMenu, POINT pt, SESSION_INFO *si, const wchar_t *pszUID)
+MIR_APP_DLL(void) Chat_CreateMenu(HMENU hMenu, SESSION_INFO *si, const wchar_t *pszUID)
{
if (si) {
GCMENUITEMS gcmi = {};
@@ -823,8 +823,6 @@ MIR_APP_DLL(UINT) Chat_CreateMenu(HWND hwnd, HMENU hMenu, POINT pt, SESSION_INFO gcmi.Type = (pszUID == nullptr) ? MENU_ON_LOG : MENU_ON_NICKLIST;
NotifyEventHooks(hevBuildMenuEvent, 0, (WPARAM)&gcmi);
}
-
- return TrackPopupMenu(hMenu, TPM_RETURNCMD | TPM_RIGHTBUTTON, pt.x, pt.y, 0, hwnd, nullptr);
}
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/mir_app/src/menu_groups.cpp b/src/mir_app/src/menu_groups.cpp index 7485114051..78bf39c3a3 100644 --- a/src/mir_app/src/menu_groups.cpp +++ b/src/mir_app/src/menu_groups.cpp @@ -76,7 +76,7 @@ MIR_APP_DLL(HGENMENU) Menu_AddGroupMenuItem(TMO_MenuItem *pmi, GroupMenuParam *g // called with:
// wparam - ownerdata
// lparam - lparam from winproc
-INT_PTR GroupMenuExecService(WPARAM wParam, LPARAM lParam)
+INT_PTR GroupMenuExecService(WPARAM wParam, LPARAM)
{
if (wParam != 0) {
GroupMenuExecParam *mmep = (GroupMenuExecParam *)wParam;
diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index 92015295b7..bc77a2227e 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -97,7 +97,8 @@ void CSrmmBaseDialog::RunUserMenu(HWND hwndOwner, USERINFO *ui, const POINT &pt) mir_wstrncpy(szTemp + 40, L"...", 4);
ModifyMenu(hMenu, 0, MF_STRING | MF_BYPOSITION, IDM_SENDMESSAGE, szTemp);
- UINT uID = Chat_CreateMenu(hwndOwner, hSubMenu, pt, m_si, uinew.pszUID);
+ Chat_CreateMenu(hSubMenu, m_si, uinew.pszUID);
+ UINT uID = TrackPopupMenu(hMenu, TPM_RETURNCMD | TPM_RIGHTBUTTON, pt.x, pt.y, 0, hwndOwner, nullptr);
switch (uID) {
case 0:
break;
diff --git a/src/mir_app/src/srmm_log_rtf.cpp b/src/mir_app/src/srmm_log_rtf.cpp index 7c40253003..b77d94ee69 100644 --- a/src/mir_app/src/srmm_log_rtf.cpp +++ b/src/mir_app/src/srmm_log_rtf.cpp @@ -504,7 +504,8 @@ INT_PTR CRtfLogWindow::WndProc(UINT msg, WPARAM wParam, LPARAM lParam) }
else ModifyMenu(hSubMenu, 4, MF_STRING | MF_GRAYED | MF_BYPOSITION, 4, TranslateT("No word to look up"));
- UINT uID = Chat_CreateMenu(m_rtf.GetHwnd(), hSubMenu, pt, m_pDlg.m_si, nullptr);
+ Chat_CreateMenu(hSubMenu, m_pDlg.m_si, nullptr);
+ UINT uID = TrackPopupMenu(hSubMenu, TPM_RETURNCMD | TPM_RIGHTBUTTON, pt.x, pt.y, 0, m_rtf.GetHwnd(), nullptr);
m_pDlg.m_bInMenu = false;
DestroyMenu(hMenu);
|