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

[Miles Bader]

Index: emacs/src/w32menu.c
diff -c emacs/src/w32menu.c:1.55.4.1 emacs/src/w32menu.c:1.55.4.2
*** emacs/src/w32menu.c:1.55.4.1        Fri Apr  4 01:21:04 2003
--- emacs/src/w32menu.c Tue Oct 14 19:22:48 2003
***************
*** 1,5 ****
  /* Menu support for GNU Emacs on the Microsoft W32 API.
!    Copyright (C) 1986, 88, 93, 94, 96, 98, 1999 Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  
--- 1,5 ----
  /* Menu support for GNU Emacs on the Microsoft W32 API.
!    Copyright (C) 1986,88,93,94,96,98,1999,2003  Free Software Foundation, Inc.
  
  This file is part of GNU Emacs.
  
***************
*** 725,734 ****
          CHECK_LIVE_WINDOW (window);
          f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
  
!         xpos = (FONT_WIDTH (FRAME_FONT (f))
!                 * XFASTINT (XWINDOW (window)->left));
!         ypos = (FRAME_LINE_HEIGHT (f)
!                 * XFASTINT (XWINDOW (window)->top));
        }
        else
        /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
--- 725,732 ----
          CHECK_LIVE_WINDOW (window);
          f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
  
!         xpos = WINDOW_LEFT_EDGE_X (XWINDOW (window));
!         ypos = WINDOW_TOP_EDGE_Y (XWINDOW (window));
        }
        else
        /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
***************
*** 1037,1042 ****
--- 1035,1041 ----
              int j;
              struct input_event buf;
              Lisp_Object frame;
+             EVENT_INIT (buf);
  
              XSETFRAME (frame, f);
              buf.kind = MENU_BAR_EVENT;
***************
*** 1601,1607 ****
      /* Force the window size to be recomputed so that the frame's text
         area remains the same, if menubar has just been created.  */
      if (old_widget == NULL)
!       x_set_window_size (f, 0, FRAME_WIDTH (f), FRAME_HEIGHT (f));
    }
  
    UNBLOCK_INPUT;
--- 1600,1606 ----
      /* Force the window size to be recomputed so that the frame's text
         area remains the same, if menubar has just been created.  */
      if (old_widget == NULL)
!       x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f));
    }
  
    UNBLOCK_INPUT;
***************
*** 2417,2419 ****
--- 2416,2421 ----
    get_menu_item_info = (GetMenuItemInfoA_Proc) GetProcAddress (user32, 
"GetMenuItemInfoA");
    set_menu_item_info = (SetMenuItemInfoA_Proc) GetProcAddress (user32, 
"SetMenuItemInfoA");
  }
+ 
+ /* arch-tag: 0eaed431-bb4e-4aac-a527-95a1b4f1fed0
+    (do not change this comment) */