Mercurial > emacs
comparison src/macgui.h @ 83066:887bb2eb4a89
Merged in changes from CVS HEAD
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-116
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-117
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-106
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 28 Feb 2004 01:33:17 +0000 |
parents | 6c8849d06ab3 |
children | f1d6a507dcfd |
comparison
equal
deleted
inserted
replaced
83065:a871be7b26a5 | 83066:887bb2eb4a89 |
---|---|
21 /* Contributed by Andrew Choi (akochoi@mac.com). */ | 21 /* Contributed by Andrew Choi (akochoi@mac.com). */ |
22 | 22 |
23 #ifndef EMACS_MACGUI_H | 23 #ifndef EMACS_MACGUI_H |
24 #define EMACS_MACGUI_H | 24 #define EMACS_MACGUI_H |
25 | 25 |
26 typedef int Pixmap; | |
27 typedef int Bitmap; | |
28 | |
29 typedef int Display; /* fix later */ | 26 typedef int Display; /* fix later */ |
30 | 27 |
31 typedef char * XrmDatabase; /* fix later */ | 28 typedef char * XrmDatabase; /* fix later */ |
32 | 29 |
33 typedef unsigned long Time; | 30 typedef unsigned long Time; |
34 | 31 |
35 #if MAC_OSX | 32 #if MAC_OSX |
33 #undef mktime | |
34 #undef DEBUG | |
35 #undef Z | |
36 #undef free | |
37 #undef malloc | |
38 #undef realloc | |
39 /* Macros max and min defined in lisp.h conflict with those in | |
40 precompiled header Carbon.h. */ | |
41 #undef max | |
42 #undef min | |
43 #undef init_process | |
44 #include <Carbon/Carbon.h> | |
45 #undef Z | |
46 #define Z (current_buffer->text->z) | |
47 #undef free | |
48 #define free unexec_free | |
49 #undef malloc | |
50 #define malloc unexec_malloc | |
51 #undef realloc | |
52 #define realloc unexec_realloc | |
53 #undef min | |
54 #define min(a, b) ((a) < (b) ? (a) : (b)) | |
55 #undef max | |
56 #define max(a, b) ((a) > (b) ? (a) : (b)) | |
57 #undef init_process | |
58 #define init_process emacs_init_process | |
59 #undef INFINITY | |
36 typedef struct OpaqueWindowPtr* Window; | 60 typedef struct OpaqueWindowPtr* Window; |
37 #else | 61 #else |
38 #include <QuickDraw.h> | 62 #include <QuickDraw.h> /* for WindowPtr */ |
63 #include <QDOffscreen.h> /* for GWorldPtr */ | |
64 #include <Controls.h> /* for ControlHandle in xdisp.c */ | |
39 typedef WindowPtr Window; | 65 typedef WindowPtr Window; |
40 #endif | 66 #endif |
67 | |
68 typedef GWorldPtr Pixmap; | |
41 | 69 |
42 #define FACE_DEFAULT (~0) | 70 #define FACE_DEFAULT (~0) |
43 | 71 |
44 | 72 |
45 /* Emulate XCharStruct. */ | 73 /* Emulate XCharStruct. */ |