Mercurial > dwindows
changeset 2468:f5fd34dfb9c7
OS/2: Include the row data in the container context signal.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Wed, 14 Apr 2021 23:59:22 +0000 |
parents | 4d1f370bf65e |
children | 4aadd15e3a59 |
files | os2/dw.c |
diffstat | 1 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/os2/dw.c Wed Apr 14 22:40:46 2021 +0000 +++ b/os2/dw.c Wed Apr 14 23:59:22 2021 +0000 @@ -3215,16 +3215,6 @@ void *user = NULL; LONG x,y; - if(mp2) - { - PCNRITEM pci; - - pci = (PCNRITEM)mp2; - - text = (char *)pci->rc.pszIcon; - user = pci->user; - } - dw_pointer_query_pos(&x, &y); if(tmp->window == notifyhwnd) @@ -3233,6 +3223,10 @@ if(mp2) { + PCNRITEM pci = (PCNRITEM)mp2; + + text = (char *)pci->rc.pszIcon; + if(!container) { NOTIFYRECORDEMPHASIS pre; @@ -3243,14 +3237,18 @@ pre.hwndCnr = tmp->window; _run_event(hWnd, WM_CONTROL, MPFROM2SHORT(0, CN_EMPHASIS), (MPARAM)&pre); pre.pRecord->flRecordAttr |= CRA_CURSORED; + user = pci->user; } else { + PRECORDCORE rc = (PRECORDCORE)mp2; + if(pCoreEmph) _clear_emphasis(); hwndEmph = tmp->window; pCoreEmph = mp2; WinSendMsg(tmp->window, CM_SETRECORDEMPHASIS, mp2, MPFROM2SHORT(TRUE, CRA_SOURCE)); + user = rc->pszText; } } result = containercontextfunc(tmp->window, text, x, y, tmp->data, user);