From 2f8a2c2ac1bd4d55a0d21bab566c02c1029f8080 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 4 Mar 2007 18:41:47 +0000 Subject: [PATCH] - Show disables and selected menu items. - User the caption font to display the window text. svn path=/trunk/; revision=25982 --- reactos/dll/cpl/desk/preview.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/reactos/dll/cpl/desk/preview.c b/reactos/dll/cpl/desk/preview.c index d7f5945ce40..a151e2b2f4c 100644 --- a/reactos/dll/cpl/desk/preview.c +++ b/reactos/dll/cpl/desk/preview.c @@ -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;