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

[Jan Dj�rv]

Index: emacs/src/w32fns.c
diff -c emacs/src/w32fns.c:1.246 emacs/src/w32fns.c:1.247
*** emacs/src/w32fns.c:1.246    Mon Jan  3 22:53:30 2005
--- emacs/src/w32fns.c  Sun Mar 20 22:28:54 2005
***************
*** 64,70 ****
  extern int w32_console_toggle_lock_key P_ ((int, Lisp_Object));
  extern void w32_menu_display_help P_ ((HWND, HMENU, UINT, UINT));
  extern void w32_free_menu_strings P_ ((HWND));
! extern XCharStruct *w32_per_char_metric P_ ((XFontStruct *, wchar_t *, int));
  
  extern int quit_char;
  
--- 64,71 ----
  extern int w32_console_toggle_lock_key P_ ((int, Lisp_Object));
  extern void w32_menu_display_help P_ ((HWND, HMENU, UINT, UINT));
  extern void w32_free_menu_strings P_ ((HWND));
! extern XCharStruct *w32_per_char_metric P_ ((FRAME_PTR f,
!                                              XFontStruct *, wchar_t *, int));
  
  extern int quit_char;
  
***************
*** 4602,4608 ****
        {
        wchar_t space = 32;
        XCharStruct* pcm;
!       pcm = w32_per_char_metric (font, &space, ANSI_FONT);
        if (pcm)
          fontp->space_width = pcm->width;
        else
--- 4603,4609 ----
        {
        wchar_t space = 32;
        XCharStruct* pcm;
!       pcm = w32_per_char_metric (f, font, &space, ANSI_FONT);
        if (pcm)
          fontp->space_width = pcm->width;
        else