[Emacs-diffs] Changes to emacs/src/w32fns.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.219.2.9 emacs/src/w32fns.c:1.219.2.10
*** emacs/src/w32fns.c:1.219.2.9        Sat Sep  4 09:14:27 2004
--- emacs/src/w32fns.c  Thu Sep  9 09:36:35 2004
***************
*** 261,266 ****
--- 261,267 ----
  
  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;
***************
*** 3458,3464 ****
                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;
--- 3459,3471 ----
                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;
***************
*** 3496,3508 ****
                    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);
--- 3503,3524 ----
                    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);