X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/faf257a1609acac6d1bfda8dfd12cdc2d096f542..c3702194809d8772afa226d5107ec3abb05e8d35:/src/nsterm.h
diff --git a/src/nsterm.h b/src/nsterm.h
index d2a66aadfe..97db10ce33 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -41,7 +41,6 @@ along with GNU Emacs. If not, see . */
- (void)showPreferencesWindow: (id)sender;
- (BOOL) openFile: (NSString *)fileName;
- (void)fd_handler: (NSTimer *) fdEntry;
-- (void)cursor_blink_handler: (NSTimer *)cursorEntry;
- (void)timeout_handler: (NSTimer *)timedEntry;
- (BOOL)fulfillService: (NSString *)name withArg: (NSString *)arg;
@end
@@ -83,6 +82,11 @@ along with GNU Emacs. If not, see . */
- (void) setWindowClosing: (BOOL)closing;
- (EmacsToolbar *) toolbar;
- (void) deleteWorkingText;
+
+#ifdef NS_IMPL_GNUSTEP
+/* Not declared, but useful. */
+- (void) unlockFocusNeedsFlush: (BOOL)needs;
+#endif
@end
@@ -355,7 +359,7 @@ along with GNU Emacs. If not, see . */
@end
extern NSArray *ns_send_types, *ns_return_types;
-extern EmacsMenu *mainMenu, *svcsMenu;
+extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
/* Apple removed the declaration, but kept the implementation */
#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
@@ -364,10 +368,10 @@ extern EmacsMenu *mainMenu, *svcsMenu;
@end
#endif
-#if defined (NS_IMPL_GNUSTEP) || ( defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4)
+#ifndef NS_HAVE_NSINTEGER
typedef long NSInteger;
typedef unsigned long NSUInteger;
-#endif /* NS_IMPL_GNUSTEP || (NS_IMPL_COCOA and <= 10.4) */
+#endif /* not NS_HAVE_NSINTEGER */
#endif /* __OBJC__ */