Fix input methods for GTK.

[gnu-emacs] / src / w32gui.h

diff --git a/src/w32gui.h b/src/w32gui.h
index 3d4909217fe7b11c7e33306f516e253cf23474b0..9f59290027cb1a0fd457f7ed734a7718a6b1e0a8 100644 (file)
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -21,11 +21,6 @@ Boston, MA 02111-1307, USA.  */
 #ifndef EMACS_W32GUI_H
 #define EMACS_W32GUI_H
 #include <windows.h>
-/* Emacs takes care of ensuring that these are defined.  */
-#ifdef max
-#undef max
-#undef min
-#endif
 
 #include "w32bdf.h"
 
@@ -83,6 +78,14 @@ typedef DWORD Time;
 typedef HWND Window;
 typedef HCURSOR Cursor;
 
+/* Windows equivalent of XImage.  */
+typedef struct _XImage
+{
+  unsigned char * data;
+  BITMAPINFO info;
+  /* Optional RGBQUAD array for palette follows (see BITMAPINFO docs).  */
+} XImage;
+
 #define FACE_DEFAULT (~0)
 
 extern HINSTANCE hinst;