X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/abd5747ed94ae15ca754f246cdfa5b51d3b2a497..1c5f6018d55ea3c0e5430cde60624e2232d87bec:/src/nsterm.h
diff --git a/src/nsterm.h b/src/nsterm.h
index 9663051f8b..bc0e6e286c 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -1,5 +1,5 @@
/* Definitions and headers for communication with NeXT/Open/GNUstep API.
- Copyright (C) 1989, 1993, 2005, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1989, 1993, 2005, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -54,7 +54,7 @@ along with GNU Emacs. If not, see . */
@class EmacsToolbar;
-@interface EmacsView : NSView
+@interface EmacsView : NSView /* 10.6+: NSWindowDelegate */
{
char *old_title;
BOOL windowClosing;
@@ -104,7 +104,7 @@ along with GNU Emacs. If not, see . */
========================================================================== */
-@interface EmacsMenu : NSMenu
+@interface EmacsMenu : NSMenu /* 10.6+: */
{
struct frame *frame;
unsigned long keyEquivModMask;
@@ -131,7 +131,7 @@ along with GNU Emacs. If not, see . */
@class EmacsImage;
-@interface EmacsToolbar : NSToolbar
+@interface EmacsToolbar : NSToolbar /* 10.6+: */
{
EmacsView *emacsView;
NSMutableDictionary *identifierToItem;
@@ -174,7 +174,7 @@ along with GNU Emacs. If not, see . */
- (Lisp_Object)runDialogAt: (NSPoint)p;
@end
-@interface EmacsTooltip : NSObject
+@interface EmacsTooltip : NSObject /* 10.6+: */
{
NSWindow *win;
NSTextField *textField;
@@ -329,8 +329,15 @@ extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
#endif
#ifndef NS_HAVE_NSINTEGER
+#if defined(__LP64__) && __LP64__
+typedef double CGFloat;
typedef long NSInteger;
typedef unsigned long NSUInteger;
+#else
+typedef float CGFloat;
+typedef int NSInteger;
+typedef unsigned int NSUInteger;
+#endif /* not LP64 */
#endif /* not NS_HAVE_NSINTEGER */
#endif /* __OBJC__ */
@@ -599,7 +606,7 @@ struct x_output
#define NS_FACE_FOREGROUND(f) ((f)->foreground)
#define NS_FACE_BACKGROUND(f) ((f)->background)
#define FRAME_NS_TITLEBAR_HEIGHT(f) ((f)->output_data.ns->titlebar_height)
-#define FRAME_NS_TOOLBAR_HEIGHT(f) ((f)->output_data.ns->toolbar_height)
+#define FRAME_TOOLBAR_HEIGHT(f) ((f)->output_data.ns->toolbar_height)
#define FONT_WIDTH(f) ((f)->max_width)
#define FONT_HEIGHT(f) ((f)->height)
@@ -701,6 +708,8 @@ extern void nxatoms_of_nsselect ();
extern int ns_lisp_to_cursor_type ();
extern Lisp_Object ns_cursor_type_to_lisp (int arg);
extern Lisp_Object Qnone;
+extern void ns_set_name_as_filename (struct frame *f);
+extern void ns_set_doc_edited (struct frame *f, Lisp_Object arg);
extern int
ns_defined_color (struct frame *f, char *name, XColor *color_def, int alloc,
@@ -751,8 +760,8 @@ extern unsigned long ns_get_pixel (void *img, int x, int y);
extern void ns_put_pixel (void *img, int x, int y, unsigned long argb);
extern void ns_set_alpha (void *img, int x, int y, unsigned char a);
-extern int x_display_pixel_height P_ ((struct ns_display_info *));
-extern int x_display_pixel_width P_ ((struct ns_display_info *));
+extern int x_display_pixel_height (struct ns_display_info *);
+extern int x_display_pixel_width (struct ns_display_info *);
/* This in nsterm.m */
extern unsigned long ns_get_rgb_color (struct frame *f,