Mercurial > emacs

changeset 105625:ecdd7b507a32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(NS_HAVE_NSINTEGER): Back out and augment with CGFloat, still needed under Tiger.
author Adrian Robert <Adrian.B.Robert@gmail.com>
date Fri, 16 Oct 2009 03:09:06 +0000
parents 6f9c7db80c0c
children 35885da5174e
files src/nsterm.h
diffstat 1 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/nsterm.h	Fri Oct 16 03:09:02 2009 +0000
+++ b/src/nsterm.h	Fri Oct 16 03:09:06 2009 +0000
@@ -54,7 +54,7 @@
 
 @class EmacsToolbar;
 
-@interface EmacsView : NSView <NSTextInput,NSWindowDelegate>
+@interface EmacsView : NSView <NSTextInput> /* 10.6+: NSWindowDelegate */
    {
    char *old_title;
    BOOL windowClosing;
@@ -104,7 +104,7 @@
 
    ========================================================================== */
 
-@interface EmacsMenu : NSMenu <NSMenuDelegate>
+@interface EmacsMenu : NSMenu  /* 10.6+: <NSMenuDelegate> */
 {
   struct frame *frame;
   unsigned long keyEquivModMask;
@@ -131,7 +131,7 @@
 
 @class EmacsImage;
 
-@interface EmacsToolbar : NSToolbar <NSToolbarDelegate>
+@interface EmacsToolbar : NSToolbar  /* 10.6+: <NSToolbarDelegate> */
    {
      EmacsView *emacsView;
      NSMutableDictionary *identifierToItem;
@@ -174,7 +174,7 @@
 - (Lisp_Object)runDialogAt: (NSPoint)p;
 @end
 
-@interface EmacsTooltip : NSObject <NSWindowDelegate>
+@interface EmacsTooltip : NSObject  /* 10.6+: <NSWindowDelegate> */
   {
     NSWindow *win;
     NSTextField *textField;
@@ -328,6 +328,18 @@
 @end
 #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__ */