diff options
| author | Kim F. Storm <storm@cua.dk> | 2003-05-24 22:07:03 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2003-05-24 22:07:03 +0000 |
| commit | 90022f5a3e142d08696bd4d73ac26c308aa762fd (patch) | |
| tree | 9fabbb30a80273beb5fa8c0ebb1cd5325faa2dd9 /src/w32menu.c | |
| parent | 03e4639645519fba65b1413339f741705bb79078 (diff) | |
| download | emacs-90022f5a3e142d08696bd4d73ac26c308aa762fd.tar.gz | |
Make (few) trivial substitutions for renamed and
new macros in dispextern.h, frame.h and window.h.
Diffstat (limited to 'src/w32menu.c')
| -rw-r--r-- | src/w32menu.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index dbf14aaeeb8..872cb12e997 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -725,10 +725,8 @@ cached information about equivalent key sequences. */) 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 @@ set_frame_menubar (f, first_time, deep_p) /* 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; |