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

[Kim F. Storm]

Index: emacs/src/w32menu.c
diff -c emacs/src/w32menu.c:1.63 emacs/src/w32menu.c:1.64
*** emacs/src/w32menu.c:1.63    Tue Feb  4 09:03:15 2003
--- emacs/src/w32menu.c Sat May 24 18:05:49 2003
***************
*** 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,
***************
*** 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;
--- 1599,1605 ----
      /* 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;