diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-09-05 11:04:46 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-09-05 11:04:46 +0000 |
| commit | 18ee7073d76f02c5c78182c3aeee7427b469bd01 (patch) | |
| tree | 21c5b90169da0ed79d82d5dc07b5c888177b9260 /src/mir_app | |
| parent | b6432457c35f22d5fd4377284e2e7d5d6736e6dc (diff) | |
Menu_DrawItem & Menu_MeasureItem now simply receive LPARAM
git-svn-id: http://svn.miranda-ng.org/main/trunk@17255 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/clc.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/clui.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/menu_utils.cpp | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp index 872a099390..aa01ae56bb 100644 --- a/src/mir_app/src/clc.cpp +++ b/src/mir_app/src/clc.cpp @@ -1225,10 +1225,10 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam return 0;
case WM_MEASUREITEM:
- return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
+ return Menu_MeasureItem(lParam);
case WM_DRAWITEM:
- return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
+ return Menu_DrawItem(lParam);
case WM_COMMAND:
hit = cli.pfnGetRowByIndex(dat, dat->selection, &contact, NULL);
diff --git a/src/mir_app/src/clui.cpp b/src/mir_app/src/clui.cpp index 6c474e04cd..a182ab0f66 100644 --- a/src/mir_app/src/clui.cpp +++ b/src/mir_app/src/clui.cpp @@ -947,7 +947,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM ((LPMEASUREITEMSTRUCT)lParam)->itemHeight = 0;
return TRUE;
}
- return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
+ return Menu_MeasureItem(lParam);
case WM_DRAWITEM:
{
@@ -1006,7 +1006,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM IcoLib_ReleaseIcon(hIcon);
return TRUE;
}
- return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
+ return Menu_DrawItem(lParam);
}
}
return 0;
diff --git a/src/mir_app/src/menu_utils.cpp b/src/mir_app/src/menu_utils.cpp index b301b8cac0..30a2a02eec 100644 --- a/src/mir_app/src/menu_utils.cpp +++ b/src/mir_app/src/menu_utils.cpp @@ -107,11 +107,12 @@ TMO_IntMenuItem* MO_RecursiveWalkMenu(TMO_IntMenuItem *parent, pfnWalkFunc func, ///////////////////////////////////////////////////////////////////////////////
-MIR_APP_DLL(BOOL) Menu_MeasureItem(MEASUREITEMSTRUCT *mis)
+MIR_APP_DLL(BOOL) Menu_MeasureItem(LPARAM lParam)
{
if (!bIsGenMenuInited)
return FALSE;
+ MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT*)lParam;
if (mis == NULL)
return FALSE;
@@ -133,11 +134,12 @@ MIR_APP_DLL(BOOL) Menu_MeasureItem(MEASUREITEMSTRUCT *mis) ///////////////////////////////////////////////////////////////////////////////
-MIR_APP_DLL(BOOL) Menu_DrawItem(DRAWITEMSTRUCT *dis)
+MIR_APP_DLL(BOOL) Menu_DrawItem(LPARAM lParam)
{
if (!bIsGenMenuInited)
return FALSE;
+ DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT*)lParam;
if (dis == NULL)
return FALSE;
|