rest of genmenu api died

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

6 files changed, 16 insertions, 16 deletions

diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp
index d480705827..bb9dbffbd3 100644
--- a/src/core/stdchat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
@@ -1060,7 +1060,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;

 

@@ -1068,7 +1068,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;

 

@@ -1786,7 +1786,7 @@ END_REMOVETAB:
 		{

 			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);

@@ -1805,7 +1805,7 @@ END_REMOVETAB:
 		{

 			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_LIST) {

 				int index = dis->itemID;

diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp
index 591cf78834..09c19b331b 100644
--- a/src/core/stdfile/src/filerecvdlg.cpp
+++ b/src/core/stdfile/src/filerecvdlg.cpp
@@ -293,7 +293,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		return TRUE;

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

 		{

@@ -309,7 +309,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				}

 			}

 		}

-		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))

diff --git a/src/core/stdfile/src/filesenddlg.cpp b/src/core/stdfile/src/filesenddlg.cpp
index aa9cbee487..56aaf3bb88 100644
--- a/src/core/stdfile/src/filesenddlg.cpp
+++ b/src/core/stdfile/src/filesenddlg.cpp
@@ -276,7 +276,7 @@ INT_PTR CALLBACK DlgProcSendFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		return TRUE;

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

 		{

@@ -292,7 +292,7 @@ INT_PTR CALLBACK DlgProcSendFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				}

 			}

 		}

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case M_FILECHOOSEDONE:

 		if (lParam != 0) {

diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp
index a256f7316e..1db269962e 100644
--- a/src/core/stdfile/src/filexferdlg.cpp
+++ b/src/core/stdfile/src/filexferdlg.cpp
@@ -328,10 +328,10 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		break;
 
 	case WM_MEASUREITEM:
-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
 
 	case WM_DRAWITEM:
-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
 
 	case WM_FT_CLEANUP:
 		if (!dat->fs) {
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 583f6acd8d..acb7c0049d 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1320,7 +1320,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		{

 			LPMEASUREITEMSTRUCT mis = (LPMEASUREITEMSTRUCT)lParam;

 			if (mis->CtlType == ODT_MENU)

-				return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+				return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 		}

 		break;

 

@@ -1328,7 +1328,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		{

 			LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam;

 			if (dis->CtlType == ODT_MENU)

-				return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+				return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 			if (dis->hwndItem == dat->hwndStatus) {

 				DrawStatusIcons(dat->hContact, dis->hDC, dis->rcItem, 2);

 				return TRUE;

diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp
index 3fb66a7e25..0d781abc76 100644
--- a/src/core/stdurl/urldialogs.cpp
+++ b/src/core/stdurl/urldialogs.cpp
@@ -128,7 +128,7 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		return TRUE;

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

 		{

@@ -144,7 +144,7 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				}

 			}

 		}

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case DM_UPDATETITLE:

 		sttUpdateTitle(hwndDlg, dat->hContact);

@@ -502,7 +502,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		break;

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

 		{

@@ -518,7 +518,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				}

 			}

 		}

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case DM_UPDATETITLE:

 		sttUpdateTitle(hwndDlg, dat->hContact);