HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix SIGDANGER handlers, for AIX.
[bpt/emacs.git]
/
src
/
nsgui.h
diff --git
a/src/nsgui.h
b/src/nsgui.h
index
90dbef6
..
53d0c8b
100644
(file)
--- a/
src/nsgui.h
+++ b/
src/nsgui.h
@@
-1,5
+1,5
@@
/* Definitions and headers for communication on the NeXT/Open/GNUstep API.
/* 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
-2013
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-27,22
+27,14
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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
#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 */
#endif /* NS_IMPL_COCOA */
-#ifdef NS_IMPL_GNUSTEP
-#undef hash_remove
-#endif
+#undef verify
#import <AppKit/AppKit.h>
#import <AppKit/AppKit.h>
-#ifdef NS_IMPL_GNUSTEP
-#define hash_remove emacs_hash_remove
-#endif
-
#ifdef NS_IMPL_COCOA
#undef Cursor
#ifdef NS_IMPL_COCOA
#undef Cursor
-#define init_process emacs_init_process
#endif /* NS_IMPL_COCOA */
#import <Foundation/NSDistantObject.h>
#endif /* NS_IMPL_COCOA */
#import <Foundation/NSDistantObject.h>
@@
-52,6
+44,9
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#endif /* __OBJC__ */
#endif /* __OBJC__ */
+#undef verify
+#undef _GL_VERIFY_H
+#include <verify.h>
/* menu-related */
#define free_widget_value(wv) xfree (wv)
/* menu-related */
#define free_widget_value(wv) xfree (wv)
@@
-68,7
+63,7
@@
typedef struct _XCharStruct
int descent;
} XCharStruct;
int descent;
} XCharStruct;
-/*
23: Fake
tructure from Xlib.h to represent two-byte characters. */
+/*
Fake s
tructure from Xlib.h to represent two-byte characters. */
#ifndef __OBJC__
typedef unsigned short unichar;
#endif
#ifndef __OBJC__
typedef unsigned short unichar;
#endif
@@
-83,20
+78,16
@@
typedef unichar XChar2b;
#define XCHAR2B_BYTE2(chp) \
((*chp) & 0x00ff)
#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
{
typedef struct _XGCValues
{
+ unsigned long foreground;
+ unsigned long background;
#ifdef __OBJC__
#ifdef __OBJC__
- NSColor *foreground;
- NSColor *background;
struct ns_font *font;
#else
struct ns_font *font;
#else
- void *foreground;
- void *background;
void *font;
#endif
} XGCValues;
void *font;
#endif
} XGCValues;
@@
-133,20
+124,25
@@
typedef int Display;
typedef Lisp_Object XrmDatabase;
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 {
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
#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, \
#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__ */
#define PWinGravity (1L << 9) /* program specified window gravity */
#endif /* __NSGUI_H__ */
-
-/* arch-tag: b2af3275-62c3-45b4-9335-4c9635c67e55
- (do not change this comment) */