[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src nsterm.h
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] emacs/src nsterm.h |
Date: |
Mon, 12 Oct 2009 00:26:45 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 09/10/12 00:26:45
Modified files:
src : nsterm.h
Log message:
(EmacsView, EmacsMenu, EmacsToolbar, EmacsTooltip): Add formal protocol
mention to inheritance. [NS_HAVE_NSINTEGER]: Drop conditional and contents.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsterm.h?cvsroot=emacs&r1=1.27&r2=1.28
Patches:
Index: nsterm.h
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- nsterm.h 27 Sep 2009 15:48:30 -0000 1.27
+++ nsterm.h 12 Oct 2009 00:26:45 -0000 1.28
@@ -54,7 +54,7 @@
@class EmacsToolbar;
address@hidden EmacsView : NSView <NSTextInput>
address@hidden EmacsView : NSView <NSTextInput,NSWindowDelegate>
{
char *old_title;
BOOL windowClosing;
@@ -104,7 +104,7 @@
==========================================================================
*/
address@hidden EmacsMenu : NSMenu
address@hidden EmacsMenu : NSMenu <NSMenuDelegate>
{
struct frame *frame;
unsigned long keyEquivModMask;
@@ -131,7 +131,7 @@
@class EmacsImage;
address@hidden EmacsToolbar : NSToolbar
address@hidden EmacsToolbar : NSToolbar <NSToolbarDelegate>
{
EmacsView *emacsView;
NSMutableDictionary *identifierToItem;
@@ -174,7 +174,7 @@
- (Lisp_Object)runDialogAt: (NSPoint)p;
@end
address@hidden EmacsTooltip : NSObject
address@hidden 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__ */
- [Emacs-diffs] emacs/src nsterm.h,
Adrian Robert <=