diff options
| author | Chong Yidong | 2008-08-01 16:07:49 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-08-01 16:07:49 +0000 |
| commit | 98a2166aefdc2fdf9d61d6e76e6dcabda5cfcfa1 (patch) | |
| tree | 6b5df18a22cbf7c4db730677fedf80b21edfd27c /src | |
| parent | 6fcb12fdcf455f3fdad5e7b66a27edc21961b372 (diff) | |
| download | emacs-98a2166aefdc2fdf9d61d6e76e6dcabda5cfcfa1.tar.gz emacs-98a2166aefdc2fdf9d61d6e76e6dcabda5cfcfa1.zip | |
(EmacsApp -application:openFiles:): GNUStep does not
define NSApplicationDelegateReplySuccess.
(EmacsView -converstationIdentifier): Use long instead of
NSInteger for GNUStep, since it doesn't have NSInteger.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsterm.m | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index a67a8e0c3b6..61fe21ba389 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -4132,7 +4132,13 @@ fprintf (stderr, "res = %d\n", EQ (res, Qt)); /* FIXME */ | |||
| 4132 | NSString *file; | 4132 | NSString *file; |
| 4133 | while ((file = [files nextObject]) != nil) | 4133 | while ((file = [files nextObject]) != nil) |
| 4134 | [ns_pending_files addObject: file]; | 4134 | [ns_pending_files addObject: file]; |
| 4135 | |||
| 4136 | #ifdef NS_IMPL_GNUSTEP | ||
| 4137 | [self replyToOpenOrPrint: 0]; | ||
| 4138 | #else | ||
| 4135 | [self replyToOpenOrPrint: NSApplicationDelegateReplySuccess]; | 4139 | [self replyToOpenOrPrint: NSApplicationDelegateReplySuccess]; |
| 4140 | #endif /* NS_IMPL_GNUSTEP */ | ||
| 4141 | |||
| 4136 | } | 4142 | } |
| 4137 | 4143 | ||
| 4138 | /* TODO: these may help w/IO switching btwn terminal and NSApp */ | 4144 | /* TODO: these may help w/IO switching btwn terminal and NSApp */ |
| @@ -4639,10 +4645,17 @@ if (NS_KEYLOG) NSLog (@"firstRectForCharRange request"); | |||
| 4639 | return rect; | 4645 | return rect; |
| 4640 | } | 4646 | } |
| 4641 | 4647 | ||
| 4648 | #ifdef NS_IMPL_GNUSTEP | ||
| 4649 | - (long)conversationIdentifier | ||
| 4650 | { | ||
| 4651 | return (long)self; | ||
| 4652 | } | ||
| 4653 | #else | ||
| 4642 | - (NSInteger)conversationIdentifier | 4654 | - (NSInteger)conversationIdentifier |
| 4643 | { | 4655 | { |
| 4644 | return (NSInteger)self; | 4656 | return (NSInteger)self; |
| 4645 | } | 4657 | } |
| 4658 | #endif | ||
| 4646 | 4659 | ||
| 4647 | /* TODO: below here not yet implemented correctly, but may not be needed */ | 4660 | /* TODO: below here not yet implemented correctly, but may not be needed */ |
| 4648 | 4661 | ||