diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-10-16 03:09:06 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-10-16 03:09:06 +0000 |
| commit | bf1f95c234383073d527d9054e93303c288b4c1f (patch) | |
| tree | 720439a6d1c7c5be53077ecbaa74a50d7111bdcd | |
| parent | a2728659c103560ce429beb441dc82b6a6789a1f (diff) | |
| download | emacs-bf1f95c234383073d527d9054e93303c288b4c1f.tar.gz | |
(NS_HAVE_NSINTEGER): Back out and augment with CGFloat, still needed under Tiger.
| -rw-r--r-- | src/nsterm.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index d247f900950..29d312a4840 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -54,7 +54,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ @class EmacsToolbar; -@interface EmacsView : NSView <NSTextInput,NSWindowDelegate> +@interface EmacsView : NSView <NSTextInput> /* 10.6+: NSWindowDelegate */ { char *old_title; BOOL windowClosing; @@ -104,7 +104,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ========================================================================== */ -@interface EmacsMenu : NSMenu <NSMenuDelegate> +@interface EmacsMenu : NSMenu /* 10.6+: <NSMenuDelegate> */ { struct frame *frame; unsigned long keyEquivModMask; @@ -131,7 +131,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ @class EmacsImage; -@interface EmacsToolbar : NSToolbar <NSToolbarDelegate> +@interface EmacsToolbar : NSToolbar /* 10.6+: <NSToolbarDelegate> */ { EmacsView *emacsView; NSMutableDictionary *identifierToItem; @@ -174,7 +174,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ - (Lisp_Object)runDialogAt: (NSPoint)p; @end -@interface EmacsTooltip : NSObject <NSWindowDelegate> +@interface EmacsTooltip : NSObject /* 10.6+: <NSWindowDelegate> */ { NSWindow *win; NSTextField *textField; @@ -328,6 +328,18 @@ extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu; @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__ */ |