X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/32d235f89b5593e18a142b3c09a2b6d07d3bc339..a7fecaa0c5f8247c3b3747506201ec2a2ecbe292:/src/nsgui.h
diff --git a/src/nsgui.h b/src/nsgui.h
index 90dbef6a06..5935531fa4 100644
--- a/src/nsgui.h
+++ b/src/nsgui.h
@@ -1,5 +1,5 @@
/* Definitions and headers for communication on the NeXT/Open/GNUstep API.
- Copyright (C) 1995, 2005, 2008 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2005, 2008-2014 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -27,22 +27,14 @@ along with GNU Emacs. If not, see . */
#warning "Z is defined. If you get a later parse error in a header, check that buffer.h or other files #define-ing Z are not included."
#endif /* Z */
#define Cursor FooFoo
-#undef init_process
#endif /* NS_IMPL_COCOA */
-#ifdef NS_IMPL_GNUSTEP
-#undef hash_remove
-#endif
+#undef verify
#import
-#ifdef NS_IMPL_GNUSTEP
-#define hash_remove emacs_hash_remove
-#endif
-
#ifdef NS_IMPL_COCOA
#undef Cursor
-#define init_process emacs_init_process
#endif /* NS_IMPL_COCOA */
#import
@@ -52,6 +44,9 @@ along with GNU Emacs. If not, see . */
#endif /* __OBJC__ */
+#undef verify
+#undef _GL_VERIFY_H
+#include
/* menu-related */
#define free_widget_value(wv) xfree (wv)
@@ -68,7 +63,7 @@ typedef struct _XCharStruct
int descent;
} XCharStruct;
-/* 23: Fake tructure from Xlib.h to represent two-byte characters. */
+/* Fake structure from Xlib.h to represent two-byte characters. */
#ifndef __OBJC__
typedef unsigned short unichar;
#endif
@@ -83,20 +78,16 @@ typedef unichar XChar2b;
#define XCHAR2B_BYTE2(chp) \
((*chp) & 0x00ff)
-#define FACE_DEFAULT (~0)
-
-/* PENDING: xfaces requires these structures, but the question is are we
- forced to use them? */
+/* XXX: xfaces requires these structures, but the question is are we
+ forced to use them? */
typedef struct _XGCValues
{
+ unsigned long foreground;
+ unsigned long background;
#ifdef __OBJC__
- NSColor *foreground;
- NSColor *background;
struct ns_font *font;
#else
- void *foreground;
- void *background;
void *font;
#endif
} XGCValues;
@@ -133,20 +124,25 @@ typedef int Display;
typedef Lisp_Object XrmDatabase;
-/* 23: some sort of attempt to normalize rectangle handling.. seems a bit much
- for what is accomplished */
+/* some sort of attempt to normalize rectangle handling.. seems a bit much
+ for what is accomplished */
typedef struct {
int x, y;
unsigned width, height;
} XRectangle;
#ifndef __OBJC__
-typedef struct _NSPoint { float x, y; } NSPoint;
-typedef struct _NSSize { float width, height; } NSSize;
-typedef struct _NSRect { NSPoint origin; NSSize size; } NSRect;
+#if defined (__LP64__) && __LP64__
+typedef double CGFloat;
+#else
+typedef float CGFloat;
#endif
+typedef struct _NSPoint { CGFloat x, y; } NSPoint;
+typedef struct _NSSize { CGFloat width, height; } NSSize;
+typedef struct _NSRect { NSPoint origin; NSSize size; } NSRect;
+#endif /* NOT OBJC */
-#define NativeRectangle struct _NSRect
+#define NativeRectangle NSRect
#define CONVERT_TO_XRECT(xr, nr) \
((xr).x = (nr).origin.x, \
@@ -204,6 +200,3 @@ typedef struct _NSRect { NSPoint origin; NSSize size; } NSRect;
#define PWinGravity (1L << 9) /* program specified window gravity */
#endif /* __NSGUI_H__ */
-
-/* arch-tag: b2af3275-62c3-45b4-9335-4c9635c67e55
- (do not change this comment) */