diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-25 15:22:06 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-25 15:22:06 +0000 |
| commit | 65e6aa9b5468f26485a236a46fcb18541e1acf1a (patch) | |
| tree | 61654d2c6f18523580372656d3bda6d7b93be845 /plugins/Clist_modern | |
| parent | 8501b9e4faa15257535e71b766f06f16b7971e39 (diff) | |
rest of genmenu api died
git-svn-id: http://svn.miranda-ng.org/main/trunk@14382 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern')
| -rw-r--r-- | plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp | 4 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp | 2 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clui.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp index 7f8f7269e1..94543dbc94 100644 --- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp @@ -2679,10 +2679,10 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam return FALSE;
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_USER + 100:
return 1;
diff --git a/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp index 35e6b95a7f..fc512f7ea9 100644 --- a/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp @@ -65,7 +65,7 @@ INT_PTR FrameMenuCheckService(WPARAM wParam, LPARAM) return FALSE;
TMO_MenuItem mi;
- if (CallService(MO_GETMENUITEM, (WPARAM)pcpp->MenuItemHandle, (LPARAM)&mi) == 0) {
+ if (Menu_GetItemInfo(pcpp->MenuItemHandle, mi) == 0) {
lpFrameMenuExecParam fmep = (lpFrameMenuExecParam)mi.ownerdata;
if (fmep != NULL) {
//pcpp->wParam - frameid
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 3e8532ba70..8ab38f6e47 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -2442,7 +2442,7 @@ LRESULT CLUI::OnContextMenu(UINT, WPARAM, LPARAM lParam) return FALSE;
}
-LRESULT CLUI::OnMeasureItem(UINT, WPARAM wParam, LPARAM lParam)
+LRESULT CLUI::OnMeasureItem(UINT, WPARAM, LPARAM lParam)
{
LPMEASUREITEMSTRUCT pmis = (LPMEASUREITEMSTRUCT)lParam;
switch (pmis->itemData) {
@@ -2461,10 +2461,10 @@ LRESULT CLUI::OnMeasureItem(UINT, WPARAM wParam, LPARAM lParam) ReleaseDC(m_hWnd, hdc);
return TRUE;
}
- return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+ return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
}
-LRESULT CLUI::OnDrawItem(UINT, WPARAM wParam, LPARAM lParam)
+LRESULT CLUI::OnDrawItem(UINT, WPARAM, LPARAM lParam)
{
ClcData *dat = (ClcData*)GetWindowLongPtr(pcli->hwndContactTree, 0);
LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam;
@@ -2539,7 +2539,7 @@ LRESULT CLUI::OnDrawItem(UINT, WPARAM wParam, LPARAM lParam) nMirMenuState = dis->itemState;
}
- return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+ return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
}
LRESULT CLUI::OnDestroy(UINT, WPARAM, LPARAM)
|