Mercurial > emacs
changeset 50390:2bdbce68ec9a
Fix build on Mac OS X with Carbon.
| author | Andrew Choi <akochoi@shaw.ca> |
|---|---|
| date | Tue, 01 Apr 2003 01:09:13 +0000 |
| parents | 782e36a6d47d |
| children | 722e80f17fb3 |
| files | src/ChangeLog src/frame.c src/macfns.c src/macterm.h |
| diffstat | 4 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Apr 01 01:06:19 2003 +0000 +++ b/src/ChangeLog Tue Apr 01 01:09:13 2003 +0000 @@ -1,3 +1,13 @@ +2003-03-31 Andrew Choi <akochoi@shaw.ca> + + * frame.c (x_report_frame_params) [HAVE_CARBON]: Do not report + parent window ID. + + * macfns.c (syms_of_macfns): Remove call to init_x_parm_symbols. + + * macterm.h (struct mac_output): Define x_pixels_diff and + y_pixels_diff. + 2003-04-01 Kim F. Storm <storm@cua.dk> * Makefile.in (frame.o): Add dependency on blockinput.h and files
--- a/src/frame.c Tue Apr 01 01:06:19 2003 +0000 +++ b/src/frame.c Tue Apr 01 01:09:13 2003 +0000 @@ -2967,11 +2967,14 @@ store_in_alist (alistptr, Qdisplay, XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element)); +#ifndef HAVE_CARBON +/* A Mac Window is identified by a struct, not an integer. */ if (FRAME_X_OUTPUT (f)->parent_desc == FRAME_X_DISPLAY_INFO (f)->root_window) tem = Qnil; else XSETFASTINT (tem, FRAME_X_OUTPUT (f)->parent_desc); store_in_alist (alistptr, Qparent_id, tem); +#endif }
--- a/src/macfns.c Tue Apr 01 01:06:19 2003 +0000 +++ b/src/macfns.c Tue Apr 01 01:09:13 2003 +0000 @@ -8803,8 +8803,6 @@ Fput (Qundefined_color, Qerror_message, build_string ("Undefined color")); - init_x_parm_symbols (); - DEFVAR_LISP ("x-bitmap-file-path", &Vx_bitmap_file_path, doc: /* List of directories to search for window system bitmap files. */); Vx_bitmap_file_path = decode_env_path ((char *) 0, "PATH");
--- a/src/macterm.h Tue Apr 01 01:06:19 2003 +0000 +++ b/src/macterm.h Tue Apr 01 01:09:13 2003 +0000 @@ -432,6 +432,14 @@ /* See enum below */ int want_fullscreen; + + /* This many pixels are the difference between the outer window (i.e. the + left of the window manager decoration) and FRAME_X_WINDOW. */ + int x_pixels_diff; + + /* This many pixels are the difference between the outer window (i.e. the + top of the window manager titlebar) and FRAME_X_WINDOW. */ + int y_pixels_diff; }; typedef struct mac_output mac_output;