Commit 3c463992 authored by Adrian Robert's avatar Adrian Robert
Browse files

(EmacsView, EmacsMenu, EmacsToolbar, EmacsTooltip): Add formal protocol...

(EmacsView, EmacsMenu, EmacsToolbar, EmacsTooltip): Add formal protocol mention to inheritance.  [NS_HAVE_NSINTEGER]: Drop conditional and contents.
parent 31e88bd8
...@@ -54,7 +54,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -54,7 +54,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
@class EmacsToolbar; @class EmacsToolbar;
@interface EmacsView : NSView <NSTextInput> @interface EmacsView : NSView <NSTextInput,NSWindowDelegate>
{ {
char *old_title; char *old_title;
BOOL windowClosing; BOOL windowClosing;
...@@ -104,7 +104,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -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; struct frame *frame;
unsigned long keyEquivModMask; unsigned long keyEquivModMask;
...@@ -131,7 +131,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -131,7 +131,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
@class EmacsImage; @class EmacsImage;
@interface EmacsToolbar : NSToolbar @interface EmacsToolbar : NSToolbar <NSToolbarDelegate>
{ {
EmacsView *emacsView; EmacsView *emacsView;
NSMutableDictionary *identifierToItem; NSMutableDictionary *identifierToItem;
...@@ -174,7 +174,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ...@@ -174,7 +174,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
- (Lisp_Object)runDialogAt: (NSPoint)p; - (Lisp_Object)runDialogAt: (NSPoint)p;
@end @end
@interface EmacsTooltip : NSObject @interface EmacsTooltip : NSObject <NSWindowDelegate>
{ {
NSWindow *win; NSWindow *win;
NSTextField *textField; NSTextField *textField;
...@@ -328,11 +328,6 @@ extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu; ...@@ -328,11 +328,6 @@ extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
@end @end
#endif #endif
#ifndef NS_HAVE_NSINTEGER
typedef long NSInteger;
typedef unsigned long NSUInteger;
#endif /* not NS_HAVE_NSINTEGER */
#endif /* __OBJC__ */ #endif /* __OBJC__ */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment