[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/w32fns.c
From: |
Jason Rumney |
Subject: |
[Emacs-diffs] Changes to emacs/src/w32fns.c |
Date: |
Tue, 07 Sep 2004 17:53:35 -0400 |
Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.240 emacs/src/w32fns.c:1.241
*** emacs/src/w32fns.c:1.240 Tue Aug 31 22:48:41 2004
--- emacs/src/w32fns.c Tue Sep 7 21:48:37 2004
***************
*** 260,265 ****
--- 260,266 ----
TrackMouseEvent_Proc track_mouse_event_fn = NULL;
ClipboardSequence_Proc clipboard_sequence_fn = NULL;
+ extern AppendMenuW_Proc unicode_append_menu;
/* W95 mousewheel handler */
unsigned int msh_mousewheel = 0;
***************
*** 3457,3463 ****
pMis->itemHeight = GetSystemMetrics (SM_CYMENUSIZE);
if (title)
{
! GetTextExtentPoint32 (hdc, title, strlen (title), &size);
pMis->itemWidth = size.cx;
if (pMis->itemHeight < size.cy)
pMis->itemHeight = size.cy;
--- 3458,3470 ----
pMis->itemHeight = GetSystemMetrics (SM_CYMENUSIZE);
if (title)
{
! if (unicode_append_menu)
! GetTextExtentPoint32W (hdc, (WCHAR *) title,
! wcslen ((WCHAR *) title),
! &size);
! else
! GetTextExtentPoint32 (hdc, title, strlen (title), &size);
!
pMis->itemWidth = size.cx;
if (pMis->itemHeight < size.cy)
pMis->itemHeight = size.cy;
***************
*** 3495,3507 ****
menu_font = CreateFontIndirect (&menu_logfont);
old_font = SelectObject (hdc, menu_font);
! /* Always draw title as if not selected. */
! ExtTextOut (hdc,
! pDis->rcItem.left
! + GetSystemMetrics (SM_CXMENUCHECK),
! pDis->rcItem.top,
! ETO_OPAQUE, &pDis->rcItem,
! title, strlen (title), NULL);
SelectObject (hdc, old_font);
DeleteObject (menu_font);
--- 3502,3523 ----
menu_font = CreateFontIndirect (&menu_logfont);
old_font = SelectObject (hdc, menu_font);
! /* Always draw title as if not selected. */
! if (unicode_append_menu)
! ExtTextOutW (hdc,
! pDis->rcItem.left
! + GetSystemMetrics (SM_CXMENUCHECK),
! pDis->rcItem.top,
! ETO_OPAQUE, &pDis->rcItem,
! (WCHAR *) title,
! wcslen ((WCHAR *) title), NULL);
! else
! ExtTextOut (hdc,
! pDis->rcItem.left
! + GetSystemMetrics (SM_CXMENUCHECK),
! pDis->rcItem.top,
! ETO_OPAQUE, &pDis->rcItem,
! title, strlen (title), NULL);
SelectObject (hdc, old_font);
DeleteObject (menu_font);