(No_Cursor): Define as 0 for Mac.

(XRectangle): Add X compatible rectangle type.
(NativeRectangle): Declare as Rect for Mac.
(CONVERT_TO_XRECT, CONVERT_FROM_XRECT, STORE_NATIVE_RECT): New macros.

diff --git a/src/macgui.h b/src/macgui.h
index f0ae1c3639772d039d03ae48fa2299a96d09d865..3e11f2b3d4089db99af984f4a98acab91a8ee9bb 100644 (file)
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -30,6 +30,8 @@ typedef int Display;  /* fix later */
 
 typedef unsigned long Time;
 
+#define No_Cursor (0)  /* fix later */
+
 #if MAC_OSX
 typedef struct OpaqueWindowPtr* Window;
 #else
@@ -169,5 +171,30 @@ XCreateGC (void *, Window, unsigned long, XGCValues *);
 
 extern int XParseGeometry ();
 
+typedef struct {
+    int x, y;
+    unsigned width, height;
+} XRectangle;
+
+#define NativeRectangle Rect
+
+#define CONVERT_TO_XRECT(xr,nr)                        \
+  ((xr).x = (nr).left,                         \
+   (xr).y = (nr).top,                          \
+   (xr).width = ((nr).right - (nr).left),      \
+   (xr).height = ((nr).bottom - (nr).top))
+
+#define CONVERT_FROM_XRECT(xr,nr)              \
+  ((nr).left = (xr).x,                         \
+   (nr).top = (xr).y,                          \
+   (nr).right = ((xr).x + (xr).width),         \
+   (nr).bottom = ((xr).y + (xr).height))
+
+#define STORE_NATIVE_RECT(nr,x,y,width,height) \
+  ((nr).left = (x),                            \
+   (nr).top = (y),                             \
+   (nr).right = ((nr).left + (width)),         \
+   (nr).bottom = ((nr).top + (height)))
+
 #endif /* EMACS_MACGUI_H */