diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/clcutils.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/clistgroups.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/clui.cpp | 2 | ||||
| -rw-r--r-- | src/mir_core/src/CCtrlListView.cpp | 1 | ||||
| -rw-r--r-- | src/mir_core/src/CCtrlTreeView.cpp | 1 | ||||
| -rw-r--r-- | src/mir_core/src/CDlgBase.cpp | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp index 8edb3231bd..9147c6e75a 100644 --- a/src/mir_app/src/clcutils.cpp +++ b/src/mir_app/src/clcutils.cpp @@ -445,7 +445,7 @@ MIR_APP_DLL(void) Clist_DeleteFromContactList(HWND hwnd, ClcData *dat) Clist_GroupDelete(contact->groupId);
break;
case CLCIT_CONTACT:
- CallService("CList/DeleteContactCommand", (WPARAM)contact->hContact, (LPARAM)hwnd);
+ CallService(MS_CLIST_DELETECONTACT, (WPARAM)contact->hContact, (LPARAM)hwnd);
break;
}
}
diff --git a/src/mir_app/src/clistgroups.cpp b/src/mir_app/src/clistgroups.cpp index efba13cccb..22dc25f11a 100644 --- a/src/mir_app/src/clistgroups.cpp +++ b/src/mir_app/src/clistgroups.cpp @@ -448,13 +448,11 @@ MIR_APP_DLL(void) Clist_SetGroup(MCONTACT hContact, const wchar_t *pwszName) /////////////////////////////////////////////////////////////////////////////////////////
-MIR_APP_DLL(HMENU) Clist_GroupBuildMenu()
+MIR_APP_DLL(HMENU) Clist_GroupBuildMenu(int nextMenuId)
{
if (arByIds.getCount() == 0)
return nullptr;
- int nextMenuId = 100;
-
HMENU hRootMenu = CreateMenu();
for (int i = 0; i < arByIds.getCount(); i++) {
const wchar_t *pNextField = arByIds[i]->groupName + 1;
diff --git a/src/mir_app/src/clui.cpp b/src/mir_app/src/clui.cpp index 0aabd2f7f1..d7a78df9f3 100644 --- a/src/mir_app/src/clui.cpp +++ b/src/mir_app/src/clui.cpp @@ -340,7 +340,7 @@ int LoadCLUIModule(void) mi.position = 2000070000;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);
mi.name.a = LPGEN("De&lete");
- mi.pszService = "CList/DeleteContactCommand";
+ mi.pszService = MS_CLIST_DELETECONTACT;
Menu_AddContactMenuItem(&mi);
CreateServiceFunction(mi.pszService, MenuItem_DeleteContact);
diff --git a/src/mir_core/src/CCtrlListView.cpp b/src/mir_core/src/CCtrlListView.cpp index 9ef8687bc6..5ac8f4d32e 100644 --- a/src/mir_core/src/CCtrlListView.cpp +++ b/src/mir_core/src/CCtrlListView.cpp @@ -36,6 +36,7 @@ BOOL CCtrlListView::OnNotify(int, NMHDR *pnmh) switch (pnmh->code) { case NM_CLICK: OnClick(&evt); return TRUE; case NM_DBLCLK: OnDoubleClick(&evt); return TRUE; + case NM_CUSTOMDRAW: OnCustomDraw(&evt); return TRUE; case LVN_BEGINDRAG: OnBeginDrag(&evt); return TRUE; case LVN_BEGINLABELEDIT: OnBeginLabelEdit(&evt); return TRUE; case LVN_BEGINRDRAG: OnBeginRDrag(&evt); return TRUE; diff --git a/src/mir_core/src/CCtrlTreeView.cpp b/src/mir_core/src/CCtrlTreeView.cpp index 056f149588..0522bfee03 100644 --- a/src/mir_core/src/CCtrlTreeView.cpp +++ b/src/mir_core/src/CCtrlTreeView.cpp @@ -285,6 +285,7 @@ BOOL CCtrlTreeView::OnNotify(int, NMHDR *pnmh) switch (pnmh->code) { case NM_RCLICK: OnRightClick(&evt); return TRUE; + case NM_CUSTOMDRAW: OnCustomDraw(&evt); return TRUE; case TVN_BEGINLABELEDIT: OnBeginLabelEdit(&evt); return TRUE; case TVN_BEGINRDRAG: OnBeginRDrag(&evt); return TRUE; case TVN_DELETEITEM: OnDeleteItem(&evt); return TRUE; diff --git a/src/mir_core/src/CDlgBase.cpp b/src/mir_core/src/CDlgBase.cpp index de23eec3d9..bc051554de 100644 --- a/src/mir_core/src/CDlgBase.cpp +++ b/src/mir_core/src/CDlgBase.cpp @@ -245,7 +245,7 @@ INT_PTR CDlgBase::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) break; case WM_MEASUREITEM: - { + if (!Menu_MeasureItem(lParam)) { MEASUREITEMSTRUCT *param = (MEASUREITEMSTRUCT *)lParam; if (param && param->CtlID) if (CCtrlBase *ctrl = FindControl(param->CtlID)) @@ -254,7 +254,7 @@ INT_PTR CDlgBase::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) return FALSE; case WM_DRAWITEM: - { + if (!Menu_DrawItem(lParam)) { DRAWITEMSTRUCT *param = (DRAWITEMSTRUCT *)lParam; if (param && param->CtlID) if (CCtrlBase *ctrl = FindControl(param->CtlID)) |