summaryrefslogtreecommitdiff
path: root/src/nsterm.h
diff options
context:
space:
mode:
authorAdrian Robert <Adrian.B.Robert@gmail.com>2009-10-12 00:26:45 +0000
committerAdrian Robert <Adrian.B.Robert@gmail.com>2009-10-12 00:26:45 +0000
commit3c46399248132d63c4662855c504ea7b0518de4a (patch)
treed06cfca4f2f16d937c01fc80a66ca0c9f6f6539b /src/nsterm.h
parent31e88bd8e73b3c99c389fee295aba67e4bf12033 (diff)
downloademacs-3c46399248132d63c4662855c504ea7b0518de4a.tar.gz
(EmacsView, EmacsMenu, EmacsToolbar, EmacsTooltip): Add formal protocol mention to inheritance. [NS_HAVE_NSINTEGER]: Drop conditional and contents.
Diffstat (limited to 'src/nsterm.h')
-rw-r--r--src/nsterm.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/nsterm.h b/src/nsterm.h
index 9663051f8b7..d247f900950 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>
+@interface EmacsView : NSView <NSTextInput,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
+@interface EmacsMenu : NSMenu <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
+@interface EmacsToolbar : NSToolbar <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
+@interface EmacsTooltip : NSObject <NSWindowDelegate>
{
NSWindow *win;
NSTextField *textField;
@@ -328,11 +328,6 @@ extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
@end
#endif
-#ifndef NS_HAVE_NSINTEGER
-typedef long NSInteger;
-typedef unsigned long NSUInteger;
-#endif /* not NS_HAVE_NSINTEGER */
-
#endif /* __OBJC__ */