Mercurial > emacs
changeset 105559:ec0d4464a897
(EmacsView, EmacsMenu, EmacsToolbar, EmacsTooltip): Add formal protocol mention to inheritance. [NS_HAVE_NSINTEGER]: Drop conditional and contents.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Mon, 12 Oct 2009 00:26:45 +0000 |
| parents | d5a3427bfd72 |
| children | 1d9d89f892e9 |
| files | src/nsterm.h |
| diffstat | 1 files changed, 4 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/nsterm.h Mon Oct 12 00:26:41 2009 +0000 +++ b/src/nsterm.h Mon Oct 12 00:26:45 2009 +0000 @@ -54,7 +54,7 @@ @class EmacsToolbar; -@interface EmacsView : NSView <NSTextInput> +@interface EmacsView : NSView <NSTextInput,NSWindowDelegate> { char *old_title; BOOL windowClosing; @@ -104,7 +104,7 @@ ========================================================================== */ -@interface EmacsMenu : NSMenu +@interface EmacsMenu : NSMenu <NSMenuDelegate> { struct frame *frame; unsigned long keyEquivModMask; @@ -131,7 +131,7 @@ @class EmacsImage; -@interface EmacsToolbar : NSToolbar +@interface EmacsToolbar : NSToolbar <NSToolbarDelegate> { EmacsView *emacsView; NSMutableDictionary *identifierToItem; @@ -174,7 +174,7 @@ - (Lisp_Object)runDialogAt: (NSPoint)p; @end -@interface EmacsTooltip : NSObject +@interface EmacsTooltip : NSObject <NSWindowDelegate> { NSWindow *win; NSTextField *textField; @@ -328,11 +328,6 @@ @end #endif -#ifndef NS_HAVE_NSINTEGER -typedef long NSInteger; -typedef unsigned long NSUInteger; -#endif /* not NS_HAVE_NSINTEGER */ - #endif /* __OBJC__ */