From 37116a7575c1dd96ae93c11ffbae64358d59d4aa Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Tue, 22 Jun 2021 01:41:15 +0200 Subject: [PATCH] Codechange: [OSX] Remove old code that has no effect on current OSX versions. --- src/video/cocoa/cocoa_ogl.mm | 1 - src/video/cocoa/cocoa_wnd.h | 1 - src/video/cocoa/cocoa_wnd.mm | 17 ----------------- 3 files changed, 19 deletions(-) diff --git a/src/video/cocoa/cocoa_ogl.mm b/src/video/cocoa/cocoa_ogl.mm index 81222d2abf..af9839a1c5 100644 --- a/src/video/cocoa/cocoa_ogl.mm +++ b/src/video/cocoa/cocoa_ogl.mm @@ -152,7 +152,6 @@ static bool _allowSoftware; { if (self = [ super initWithFrame:frameRect ]) { /* We manage our content updates ourselves. */ - self.wantsBestResolutionOpenGLSurface = _allow_hidpi_window ? YES : NO; self.layerContentsRedrawPolicy = NSViewLayerContentsRedrawOnSetNeedsDisplay; /* Create backing layer. */ diff --git a/src/video/cocoa/cocoa_wnd.h b/src/video/cocoa/cocoa_wnd.h index f8b9385ac2..3ddd5a4f04 100644 --- a/src/video/cocoa/cocoa_wnd.h +++ b/src/video/cocoa/cocoa_wnd.h @@ -32,7 +32,6 @@ 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)display; - (void)setFrame:(NSRect)frameRect display:(BOOL)flag; @end diff --git a/src/video/cocoa/cocoa_wnd.mm b/src/video/cocoa/cocoa_wnd.mm index 1f470a9481..05b55e2a83 100644 --- a/src/video/cocoa/cocoa_wnd.mm +++ b/src/video/cocoa/cocoa_wnd.mm @@ -405,23 +405,6 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel return self; } -/** - * This method fires just before the window deminaturizes from the Dock. - * We'll save the current visible surface, let the window manager redraw any - * UI elements, and restore the surface. This way, no expose event - * is required, and the deminiaturize works perfectly. - */ -- (void)display -{ - /* save current visible surface */ - [ self cacheImageInRect:[ driver->cocoaview frame ] ]; - - /* let the window manager redraw controls, border, etc */ - [ super display ]; - - /* restore visible surface */ - [ self restoreCachedImage ]; -} /** * Define the rectangle we draw our window in */