*** empty log message ***

[gnu-emacs] / src / w32gui.h

diff --git a/src/w32gui.h b/src/w32gui.h
index 2cca61eb5f9aec817af3de513506707acada9d93..04182c6da80f34b96f447d1ebf2ce5f09f2beeb7 100644 (file)
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -72,13 +72,17 @@ typedef struct _XGCValues
 typedef HBITMAP Pixmap;
 typedef HBITMAP Bitmap;
 
+typedef char * XrmDatabase;
+
 typedef XGCValues * GC;
 typedef COLORREF Color;
 typedef DWORD Time;
 typedef HWND Window;
-typedef int Display;  /* ++KFS: define here? */
+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 +148,34 @@ 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 */
+
+/* arch-tag: 9172e5fb-45a5-4684-afd9-ca0e81324604
+   (do not change this comment) */