From b6432457c35f22d5fd4377284e2e7d5d6736e6dc Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 5 Sep 2016 10:56:12 +0000
Subject: compilation fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@17254 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/HistoryPlusPlus/GlobalSearch.pas | 9 +++------
plugins/HistoryPlusPlus/HistoryForm.pas | 9 +++------
plugins/QuickSearch/sr_window.pas | 8 +++-----
3 files changed, 9 insertions(+), 17 deletions(-)
(limited to 'plugins')
diff --git a/plugins/HistoryPlusPlus/GlobalSearch.pas b/plugins/HistoryPlusPlus/GlobalSearch.pas
index a868423ead..44eb3283ea 100644
--- a/plugins/HistoryPlusPlus/GlobalSearch.pas
+++ b/plugins/HistoryPlusPlus/GlobalSearch.pas
@@ -1672,23 +1672,20 @@ begin
inherited;
if Message.Result <> 0 then
exit;
- Message.Result := CallService(MS_CLIST_MENUPROCESSCOMMAND,
- MAKEWPARAM(Message.WParamLo, MPCF_CONTACTMENU), UserMenuContact);
+ Message.Result := Clist_MenuProcessCommand(Message.WParamLo, MPCF_CONTACTMENU, UserMenuContact);
exit;
end;
WM_MEASUREITEM:
if Self.UserMenu <> 0 then
begin
- Message.Result := CallService(MS_CLIST_MENUMEASUREITEM, Message.wParam,
- Message.LParam);
+ Message.Result := Menu_MeasureItem(Message.LParam);
if Message.Result <> 0 then
exit;
end;
WM_DRAWITEM:
if Self.UserMenu <> 0 then
begin
- Message.Result := CallService(MS_CLIST_MENUDRAWITEM, Message.wParam,
- Message.LParam);
+ Message.Result := Menu_DrawItem(Message.LParam);
if Message.Result <> 0 then
exit;
end;
diff --git a/plugins/HistoryPlusPlus/HistoryForm.pas b/plugins/HistoryPlusPlus/HistoryForm.pas
index 5593f130f1..2eed1dd124 100644
--- a/plugins/HistoryPlusPlus/HistoryForm.pas
+++ b/plugins/HistoryPlusPlus/HistoryForm.pas
@@ -3626,23 +3626,20 @@ begin
inherited;
if Message.Result <> 0 then
Exit;
- Message.Result := CallService(MS_CLIST_MENUPROCESSCOMMAND,
- MAKEWPARAM(Message.WParamLo, MPCF_CONTACTMENU), hContact);
+ Message.Result := Clist_MenuProcessCommand(Message.WParamLo, MPCF_CONTACTMENU, hContact);
Exit;
end;
WM_MEASUREITEM:
if Self.UserMenu <> 0 then
begin
- Message.Result := CallService(MS_CLIST_MENUMEASUREITEM, Message.wParam,
- Message.lParam);
+ Message.Result := Menu_MeasureItem(Message.LParam);
if Message.Result <> 0 then
Exit;
end;
WM_DRAWITEM:
if Self.UserMenu <> 0 then
begin
- Message.Result := CallService(MS_CLIST_MENUDRAWITEM, Message.wParam,
- Message.lParam);
+ Message.Result := Menu_DrawItem(Message.LParam);
if Message.Result <> 0 then
Exit;
end;
diff --git a/plugins/QuickSearch/sr_window.pas b/plugins/QuickSearch/sr_window.pas
index 9521d9525e..a2f96e4098 100644
--- a/plugins/QuickSearch/sr_window.pas
+++ b/plugins/QuickSearch/sr_window.pas
@@ -2095,9 +2095,9 @@ begin
end;
WM_MEASUREITEM:
- CallService(MS_CLIST_MENUMEASUREITEM,wParam,lParam);
+ Menu_MeasureItem(lParam);
WM_DRAWITEM:
- CallService(MS_CLIST_MENUDRAWITEM,wParam,lParam);
+ Menu_DrawItem(lParam);
WM_MOUSEMOVE: begin
if TTInstalled then
@@ -2128,9 +2128,7 @@ begin
end;
WM_COMMAND: begin
- if CallService(MS_CLIST_MENUPROCESSCOMMAND,
- MAKEWPARAM(LOWORD(wParam),MPCF_CONTACTMENU),
- GetFocusedhContact)<>0 then
+ if Clist_MenuProcessCommand(LOWORD(wParam),MPCF_CONTACTMENU,GetFocusedhContact)<>0 then
begin
if (qsopt.flags and QSO_AUTOCLOSE)<>0 then
CloseSrWindow;
--
cgit v1.2.3