Fix build on Mac OS X with Carbon.

diff --git a/src/ChangeLog b/src/ChangeLog
index d67b14666b3ea73adbbe144ac22e63425eec3830..1140b1f49ba21ac750de3ee282bbc69a004aa2f4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/frame.c b/src/frame.c
index 69651ad81ff2c2b3c5783756d09f3085e07ba4e6..697c2b8aabe41d98428610d490ae6433ee6b28ad 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -2967,11 +2967,14 @@ x_report_frame_params (f, alistptr)
   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
 }
 
 

diff --git a/src/macfns.c b/src/macfns.c
index 5a3651a9dfa2f7cb5e7a8e7fda0cf7aaa8d74882..ebaf2ee49e19d1886e2e4ca6c2e80d0a48309224 100644 (file)
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -8803,8 +8803,6 @@ syms_of_macfns ()
   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");

diff --git a/src/macterm.h b/src/macterm.h
index ba6d725b94cd633681627e512402b2dc89363c04..f57008b8b7aabf20ccc43d268ce41fed00f5319d 100644 (file)
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -432,6 +432,14 @@ struct mac_output {
 
   /* 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;