rest of genmenu api died

git-svn-id: http://svn.miranda-ng.org/main/trunk@14382 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 9 insertions, 9 deletions

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 00f1cf85da..a01119de72 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -856,7 +856,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 		{

 			MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam;

 			if (mis->CtlType == ODT_MENU)

-				return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+				return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 		}

 		return FALSE;

 

@@ -864,7 +864,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 		{

 			DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam;

 			if (dis->CtlType == ODT_MENU)

-				return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+				return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 		}

 		return FALSE;

 

@@ -1360,7 +1360,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 		if (!MeasureMenuItem(wParam, lParam)) {

 			MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam;

 			if (mis->CtlType == ODT_MENU)

-				return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+				return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 			int ih = GetTextPixelSize(_T("AQGgl'"), g_Settings.UserListFont, FALSE);

 			int ih2 = GetTextPixelSize(_T("AQGg'"), g_Settings.UserListHeadingsFont, FALSE);

@@ -1377,7 +1377,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 		if (!DrawMenuItem(wParam, lParam)) {

 			DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam;

 			if (dis->CtlType == ODT_MENU)

-				return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+				return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 			if (dis->CtlID == IDC_CHAT_LIST) {

 				int index = dis->itemID;

diff --git a/plugins/Scriver/src/infobar.cpp b/plugins/Scriver/src/infobar.cpp
index 1aa9bfcae4..027dc2dd47 100644
--- a/plugins/Scriver/src/infobar.cpp
+++ b/plugins/Scriver/src/infobar.cpp
@@ -263,7 +263,7 @@ static INT_PTR CALLBACK InfobarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 				return TRUE;

 			}

 		}

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 	

 	case WM_LBUTTONDOWN:

 		SendMessage(idat->mwd->hwnd, WM_LBUTTONDOWN, wParam, lParam);

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index e2b3448e1b..aa95a35a46 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -1504,7 +1504,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 	case WM_MEASUREITEM:

 		if (!MeasureMenuItem(wParam, lParam))

-			return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+			return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 		return TRUE;

 

 	case WM_DRAWITEM:

@@ -1552,7 +1552,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				return TRUE;

 			}

 		}

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_COMMAND:

 		if (!lParam && CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM)dat->hContact))

diff --git a/plugins/Scriver/src/msgwindow.cpp b/plugins/Scriver/src/msgwindow.cpp
index 6a88b6ea87..c95aa5b503 100644
--- a/plugins/Scriver/src/msgwindow.cpp
+++ b/plugins/Scriver/src/msgwindow.cpp
@@ -881,7 +881,7 @@ INT_PTR CALLBACK DlgProcParentWindow(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		return TRUE;

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

 		{

@@ -897,7 +897,7 @@ INT_PTR CALLBACK DlgProcParentWindow(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				return TRUE;

 			}

 		}

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case WM_COMMAND:

 		if (CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM)dat->hContact))