# HG changeset patch # User Kim F. Storm # Date 1048254693 0 # Node ID c2c4c37724f1b1854c576188941c0b7e60c7b2ab # Parent e3a41ffa1cba2ceafaf724a8d2d89964ba4316e3 (No_Cursor): Define as 0 for W32. (XRectangle): Add X compatible rectangle type. (NativeRectangle): Declare as RECT for W32. (CONVERT_TO_XRECT, CONVERT_FROM_XRECT, STORE_NATIVE_RECT): New macros. diff -r e3a41ffa1cba -r c2c4c37724f1 src/w32gui.h --- a/src/w32gui.h Fri Mar 21 13:51:25 2003 +0000 +++ b/src/w32gui.h Fri Mar 21 13:51:33 2003 +0000 @@ -79,6 +79,8 @@ typedef HDC Display; /* HDC so it doesn't conflict with xpm lib. */ typedef HCURSOR Cursor; +#define No_Cursor (0) + #define XChar2b wchar_t /* Dealing with bits of wchar_t as if they were an XChar2b. */ @@ -144,4 +146,31 @@ 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_W32GUI_H */