ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32/monthcal: Properly handle Goto Today popup menu (on RButton).

This commit is contained in:
Nikolay Sivov 2009-09-26 15:33:47 +04:00 committed by Alexandre Julliard
parent a95b63efcc
commit 818aab58f5
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/comctl32/monthcal.c
View File

@ -1294,22 +1294,24 @@ MONTHCAL_RButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam)
WCHAR buf[32]; WCHAR buf[32];
hMenu = CreatePopupMenu(); hMenu = CreatePopupMenu();
if (!LoadStringW(COMCTL32_hModule,IDM_GOTODAY,buf,countof(buf))) if (!LoadStringW(COMCTL32_hModule, IDM_GOTODAY, buf, countof(buf)))
{ {
WARN("Can't load resource\n"); WARN("Can't load resource\n");
strcpyW(buf, todayW); strcpyW(buf, todayW);
} }
AppendMenuW(hMenu, MF_STRING|MF_ENABLED,1, buf); AppendMenuW(hMenu, MF_STRING|MF_ENABLED, 1, buf);
menupoint.x=(short)LOWORD(lParam); menupoint.x = (short)LOWORD(lParam);
menupoint.y=(short)HIWORD(lParam); menupoint.y = (short)HIWORD(lParam);
ClientToScreen(infoPtr->hwndSelf, &menupoint); ClientToScreen(infoPtr->hwndSelf, &menupoint);
if( TrackPopupMenu(hMenu,TPM_RIGHTBUTTON| TPM_NONOTIFY|TPM_RETURNCMD, if( TrackPopupMenu(hMenu, TPM_RIGHTBUTTON | TPM_NONOTIFY | TPM_RETURNCMD,
menupoint.x, menupoint.y, 0, infoPtr->hwndSelf, NULL)) menupoint.x, menupoint.y, 0, infoPtr->hwndSelf, NULL))
{ {
infoPtr->curSel.wMonth = infoPtr->todaysDate.wMonth; infoPtr->curSel = infoPtr->todaysDate;
infoPtr->curSel.wYear = infoPtr->todaysDate.wYear; infoPtr->minSel = infoPtr->todaysDate;
infoPtr->maxSel = infoPtr->todaysDate;
InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE);
} }
return 0; return 0;
} }