Fixed OS X 10.6.8 build issue (bug#21862).

* src/nsterm.h (EmacsView): Add missing declarations.
* src/nsterm.m ([EmacsView windowDidBecomeKey]): New method, like
the standard method but without the notification parameter.
Intended to be used for direct calls.
([EmacsView windowDidEnterFullScreen]): Call the non-notification
version of `windowDidBecomeKey'. Made the notification method call
the non-notification method instead of the vice versa.
(NSWindowDidEnterFullScreenNotification): Deleted, no longer
needed.
This commit is contained in:
Anders Lindgren 2015-11-15 18:46:04 +01:00
parent 4f19767dfa
commit 63e6f4c820
2 changed files with 19 additions and 11 deletions

View file

@ -412,6 +412,13 @@ void nstrace_leave(int *);
- (void)windowDidMove: (id)sender;
#endif
- (int)fullscreenState;
/* Non-notification versions of NSView methods. Used for direct calls. */
- (void)windowWillEnterFullScreen;
- (void)windowDidEnterFullScreen;
- (void)windowWillExitFullScreen;
- (void)windowDidExitFullScreen;
- (void)windowDidBecomeKey;
@end

View file

@ -6439,6 +6439,12 @@ - (void)viewDidEndLiveResize
- (void)windowDidBecomeKey: (NSNotification *)notification
/* cf. x_detect_focus_change(), x_focus_changed(), x_new_focus_frame() */
{
[self windowDidBecomeKey];
}
- (void)windowDidBecomeKey /* for direct calls */
{
struct ns_display_info *dpyinfo = FRAME_DISPLAY_INFO (emacsframe);
struct frame *old_focus = dpyinfo->x_focus_frame;
@ -6866,10 +6872,6 @@ - (NSApplicationPresentationOptions)window:(NSWindow *)window
}
#endif
#if !defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
#define NSWindowDidEnterFullScreenNotification "NSWindowDidEnterFullScreenNotification"
#endif
- (void)windowWillEnterFullScreen:(NSNotification *)notification
{
[self windowWillEnterFullScreen];
@ -6880,19 +6882,18 @@ - (void)windowWillEnterFullScreen /* provided for direct calls */
fs_before_fs = fs_state;
}
- (void)windowDidEnterFullScreen /* provided for direct calls */
{
[self windowDidEnterFullScreen:
[NSNotification notificationWithName:NSWindowDidEnterFullScreenNotification
object:[self window]]];
}
- (void)windowDidEnterFullScreen:(NSNotification *)notification
{
[self windowDidEnterFullScreen];
}
- (void)windowDidEnterFullScreen /* provided for direct calls */
{
NSTRACE ("windowDidEnterFullScreen");
[self setFSValue: FULLSCREEN_BOTH];
if (! [self fsIsNative])
{
[self windowDidBecomeKey:notification];
[self windowDidBecomeKey];
[nonfs_window orderOut:self];
}
else