Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-07 05:05:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Show disables and selected menu items.

Browse source 
- User the caption font to display the window text.

svn path=/trunk/; revision=25982
This commit is contained in:
Eric Kohl 2007-03-04 18:41:47 +00:00
parent 78674981d1
commit 2f8a2c2ac1
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reactos/dll/cpl/desk/preview.c
View file

@ -186,14 +186,13 @@ OnCreate(HWND hwnd, PPREVIEW_DATA pPreviewData)
/* Load and modify the menu */
pPreviewData->hMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDR_PREVIEW_MENU));
EnableMenuItem(pPreviewData->hMenu, ID_MENU_DISABLED,
MF_BYCOMMAND | MF_DISABLED);
EnableMenuItem(pPreviewData->hMenu,
1, MF_BYPOSITION | MF_GRAYED);
HiliteMenuItem(hwnd, pPreviewData->hMenu,
ID_MENU_SELECTED, MF_BYCOMMAND | MF_HILITE);
2, MF_BYPOSITION | MF_HILITE);
// GetMenuItemRect(hwnd, pPreviewData->hMenu,
// ID_MENU_SELECTED, &pPreviewData->rcSelectedMenuItem);
// 2, &pPreviewData->rcSelectedMenuItem);
AllocAndLoadString(&pPreviewData->lpInAct, hApplet, IDS_INACTWIN);
AllocAndLoadString(&pPreviewData->lpAct, hApplet, IDS_ACTWIN);
@ -382,7 +381,7 @@ OnPaint(HWND hwnd, PPREVIEW_DATA pPreviewData)
rc.left += 4;
rc.top += 2;
SetTextColor(hdc, pPreviewData->clrWindowText);
hOldFont = SelectObject(hdc, pPreviewData->hMessageFont);
hOldFont = SelectObject(hdc, pPreviewData->hCaptionFont);
DrawText(hdc, pPreviewData->lpWinTxt, lstrlen(pPreviewData->lpWinTxt), &rc, DT_LEFT);
SelectObject(hdc, hOldFont);
@ -444,12 +443,12 @@ OnLButtonDown(HWND hwnd, int xPos, int yPos, PPREVIEW_DATA pPreviewData)
if (PtInRect(&pPreviewData->rcActiveCaptionButtons, pt))
type = IDX_CAPTION_BUTTON;
if (PtInRect(&pPreviewData->rcActiveMenuBar, pt))
type = IDX_MENU;
// if (PtInRect(&pPreviewData->rcSelectedMenuItem, pt))
// type = IDX_SELECTION;
if (PtInRect(&pPreviewData->rcActiveMenuBar, pt))
type = IDX_MENU;
if (PtInRect(&pPreviewData->rcActiveClient, pt))
type = IDX_WINDOW;