Mercurial > emacs
diff src/w32menu.c @ 51206:22a5614b558f
Make (few) trivial substitutions for renamed and
new macros in dispextern.h, frame.h and window.h.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Sat, 24 May 2003 22:07:03 +0000 |
| parents | 23a1cea22d13 |
| children | 861a49cd70cf |
line wrap: on
line diff
--- a/src/w32menu.c Sat May 24 22:06:40 2003 +0000 +++ b/src/w32menu.c Sat May 24 22:07:03 2003 +0000 @@ -725,10 +725,8 @@ 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)); + 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,7 +1599,7 @@ /* 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)); + x_set_window_size (f, 0, FRAME_COLS (f), FRAME_LINES (f)); } UNBLOCK_INPUT;