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/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index a37f241b9d..4197ca245b 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -1509,7 +1509,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;
 
@@ -1517,7 +1517,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;
 
@@ -2121,7 +2121,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 					mis->itemWidth = 6;
 					return TRUE;
 				}
-				return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+				return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
 			}
 			mis->itemHeight = g_Settings.iNickListFontHeight;
 		}
@@ -2135,7 +2135,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 					DrawMenuItem(dis, (HICON)dis->itemData, 0);
 					return TRUE;
 				}
-				return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+				return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
 			}
 
 			if (dis->CtlID == IDC_LIST) {
diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 8af158731f..f863d29df0 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -1603,10 +1603,10 @@ static INT_PTR CALLBACK DlgProcContainer(HWND hwndDlg, UINT msg, WPARAM wParam,
 				return TRUE;

 			}

 		}

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case DM_QUERYCLIENTAREA:

 		{

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 1d5a3f4f60..452252e78d 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -2570,7 +2570,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				return TRUE;

 			}

 		}

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_NCHITTEST:

 		SendMessage(hwndContainer, WM_NCHITTEST, wParam, lParam);

diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index ad4936ee95..614a5aa83d 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -1407,7 +1407,7 @@ void TSAPI HandlePasteAndSend(const TWindowData *dat)
 // draw various elements of the message window, like avatar(s), info panel fields

 // and the color formatting menu

 

-int TSAPI MsgWindowDrawHandler(WPARAM wParam, LPARAM lParam, TWindowData *dat)

+int TSAPI MsgWindowDrawHandler(WPARAM, LPARAM lParam, TWindowData *dat)

 {

 	if (!dat)

 		return 0;

@@ -1604,7 +1604,7 @@ int TSAPI MsgWindowDrawHandler(WPARAM wParam, LPARAM lParam, TWindowData *dat)
 		return TRUE;

 	}

 

-	return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+	return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 }

 

 void TSAPI LoadThemeDefaults(TContainerData *pContainer)