typedef int Display; /* fix later */
-typedef char * XrmDatabase; /* fix later */
+typedef Lisp_Object XrmDatabase;
typedef unsigned long Time;
#ifdef HAVE_CARBON
#undef Z
#ifdef MAC_OSX
+#if ! HAVE_MKTIME || BROKEN_MKTIME
#undef mktime
+#endif
#undef DEBUG
#undef free
#undef malloc
#undef min
#undef init_process
#include <Carbon/Carbon.h>
+#if ! HAVE_MKTIME || BROKEN_MKTIME
#undef mktime
#define mktime emacs_mktime
+#endif
#undef free
#define free unexec_free
#undef malloc
#else /* not HAVE_CARBON */
#include <QuickDraw.h> /* for WindowPtr */
#include <QDOffscreen.h> /* for GWorldPtr */
+#include <Appearance.h> /* for ThemeCursor */
#include <Windows.h>
+#include <Controls.h>
#include <Gestalt.h>
#endif /* not HAVE_CARBON */
typedef WindowPtr Window;
typedef GWorldPtr Pixmap;
-#if TARGET_API_MAC_CARBON
#define Cursor ThemeCursor
#define No_Cursor (-1)
-#else
-#define SetPortWindowPort(w) SetPort(w)
-#define Cursor CursHandle
-#define No_Cursor (0)
-extern CursPtr arrow_cursor;
-#endif
#define FACE_DEFAULT (~0)
(xcs).descent = (bds).bottom)
struct MacFontStruct {
- char *fontname;
+ char *full_name;
short mac_fontnum; /* font number of font used in this window */
int mac_fontsize; /* size of font */
short mac_fontface; /* plain, bold, italics, etc. */
+#if TARGET_API_MAC_CARBON
+ int mac_scriptcode; /* Mac OS script code for font used */
+#else
short mac_scriptcode; /* Mac OS script code for font used */
+#endif
#if 0
SInt16 mFontNum; /* font number of font used in this window */