(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 --git a/src/w32gui.h b/src/w32gui.h
index 775a97a443a490c03da923223c7e41d332e17344..690ec66f8d550a4b661a15027c6258e622850725 100644 (file)
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -79,6 +79,8 @@ typedef HWND Window;
 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 nCmdShow;
 
 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 */