# HG changeset patch # User Kim F. Storm # Date 1048254597 0 # Node ID 609980fd9f790de1cea1f9d00070c70571dbd009 # Parent e3d56226cb7f61d4f94ded0a700d935cc2dafc8e (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 -r e3d56226cb7f -r 609980fd9f79 src/macgui.h --- a/src/macgui.h Fri Mar 21 13:49:48 2003 +0000 +++ b/src/macgui.h Fri Mar 21 13:49:57 2003 +0000 @@ -30,6 +30,8 @@ typedef unsigned long Time; +#define No_Cursor (0) /* fix later */ + #if MAC_OSX typedef struct OpaqueWindowPtr* Window; #else @@ -169,5 +171,30 @@ 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 */