From c78e559e88a7864a0b55cb00c82b6deac27ff1da Mon Sep 17 00:00:00 2001
From: Michael Lutz <michi@icosahedron.de>
Date: Fri, 12 Feb 2021 01:18:36 +0100
Subject: Codechange: [OSX] Remove unused 'app active' flag.

---
 src/video/cocoa/cocoa_v.h    |  3 +--
 src/video/cocoa/cocoa_v.mm   |  1 -
 src/video/cocoa/cocoa_wnd.h  |  3 ---
 src/video/cocoa/cocoa_wnd.mm | 55 --------------------------------------------
 4 files changed, 1 insertion(+), 61 deletions(-)

(limited to 'src/video/cocoa')

diff --git a/src/video/cocoa/cocoa_v.h b/src/video/cocoa/cocoa_v.h
index 8ebf5ba6e..3f62102d1 100644
--- a/src/video/cocoa/cocoa_v.h
+++ b/src/video/cocoa/cocoa_v.h
@@ -39,8 +39,7 @@ private:
 	uint32 palette[256];  ///< Colour Palette
 
 public:
-	bool active;          ///< Whether the window is visible
-	bool setup;
+	bool setup; ///< Window is currently being created.
 
 	OTTD_CocoaWindow *window;    ///< Pointer to window object
 	OTTD_CocoaView *cocoaview;   ///< Pointer to view object
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index dea64e60d..40d041a5d 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -111,7 +111,6 @@ VideoDriver_Cocoa::VideoDriver_Cocoa()
 	this->buffer_depth  = 0;
 	this->window_buffer = nullptr;
 	this->pixel_buffer  = nullptr;
-	this->active        = false;
 	this->setup         = false;
 
 	this->window    = nil;
diff --git a/src/video/cocoa/cocoa_wnd.h b/src/video/cocoa/cocoa_wnd.h
index 98ed7df7e..fa7036396 100644
--- a/src/video/cocoa/cocoa_wnd.h
+++ b/src/video/cocoa/cocoa_wnd.h
@@ -32,11 +32,8 @@ extern NSString *OTTDMainLaunchGameEngine;
 @interface OTTD_CocoaWindow : NSWindow
 - (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag driver:(VideoDriver_Cocoa *)drv;
 
-- (void)miniaturize:(id)sender;
 - (void)display;
 - (void)setFrame:(NSRect)frameRect display:(BOOL)flag;
-- (void)appDidHide:(NSNotification*)note;
-- (void)appDidUnhide:(NSNotification*)note;
 @end
 
 /** Subclass of NSView to support mouse awareness and text input. */
diff --git a/src/video/cocoa/cocoa_wnd.mm b/src/video/cocoa/cocoa_wnd.mm
index 5a3de7e55..a836646b5 100644
--- a/src/video/cocoa/cocoa_wnd.mm
+++ b/src/video/cocoa/cocoa_wnd.mm
@@ -370,13 +370,6 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 - (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag driver:(VideoDriver_Cocoa *)drv
 {
 	if (self = [ super initWithContentRect:contentRect styleMask:styleMask backing:backingType defer:flag ]) {
-		/* Make our window subclass receive these application notifications */
-		[ [ NSNotificationCenter defaultCenter ] addObserver:self
-			selector:@selector(appDidHide:) name:NSApplicationDidHideNotification object:NSApp ];
-
-		[ [ NSNotificationCenter defaultCenter ] addObserver:self
-			selector:@selector(appDidUnhide:) name:NSApplicationDidUnhideNotification object:NSApp ];
-
 		self->driver = drv;
 
 		[ self setContentMinSize:NSMakeSize(64.0f, 64.0f) ];
@@ -391,17 +384,6 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 	return self;
 }
 
-/**
- * Minimize the window
- */
-- (void)miniaturize:(id)sender
-{
-	/* window is hidden now */
-	driver->active = false;
-
-	[ super miniaturize:sender ];
-}
-
 /**
  * This method fires just before the window deminaturizes from the Dock.
  * We'll save the current visible surface, let the window manager redraw any
@@ -418,9 +400,6 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 
 	/* restore visible surface */
 	[ self restoreCachedImage ];
-
-	/* window is visible again */
-	driver->active = true;
 }
 /**
  * Define the rectangle we draw our window in
@@ -431,20 +410,6 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 
 	driver->AllocateBackingStore();
 }
-/**
- * Handle hiding of the application
- */
-- (void)appDidHide:(NSNotification*)note
-{
-	driver->active = false;
-}
-/**
- * Unhide and restore display plane and re-activate driver
- */
-- (void)appDidUnhide:(NSNotification*)note
-{
-	driver->active = true;
-}
 
 @end
 
@@ -1122,26 +1087,6 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
 
 	return NO;
 }
-/** Handle key acceptance */
-- (void)windowDidBecomeKey:(NSNotification*)aNotification
-{
-	driver->active = true;
-}
-/** Resign key acceptance */
-- (void)windowDidResignKey:(NSNotification*)aNotification
-{
-	driver->active = false;
-}
-/** Handle becoming main window */
-- (void)windowDidBecomeMain:(NSNotification*)aNotification
-{
-	driver->active = true;
-}
-/** Resign being main window */
-- (void)windowDidResignMain:(NSNotification*)aNotification
-{
-	driver->active = false;
-}
 /** Window entered fullscreen mode (10.7). */
 - (void)windowDidEnterFullScreen:(NSNotification *)aNotification
 {
-- 
cgit v1.2.3-70-g09d2