Codechange: [OSX] Fold remaining Cocoa video subdriver into the main driver.

This commit is contained in:
Michael Lutz
2021-01-22 22:29:46 +01:00
parent e6bea3961f
commit 88f6c7a9f3
5 changed files with 210 additions and 279 deletions

View File

@@ -12,7 +12,7 @@
#import <Cocoa/Cocoa.h>
class WindowQuartzSubdriver;
class VideoDriver_Cocoa;
extern NSString *OTTDMainLaunchGameEngine;
@@ -23,10 +23,10 @@ extern NSString *OTTDMainLaunchGameEngine;
/** Subclass of NSWindow to cater our special needs */
@interface OTTD_CocoaWindow : NSWindow {
WindowQuartzSubdriver *driver;
VideoDriver_Cocoa *driver;
}
- (void)setDriver:(WindowQuartzSubdriver *)drv;
- (void)setDriver:(VideoDriver_Cocoa *)drv;
- (void)miniaturize:(id)sender;
- (void)display;
@@ -39,10 +39,10 @@ extern NSString *OTTDMainLaunchGameEngine;
/** Subclass of NSView to fix Quartz rendering and mouse awareness */
@interface OTTD_CocoaView : NSView <NSTextInputClient>
{
WindowQuartzSubdriver *driver;
VideoDriver_Cocoa *driver;
NSTrackingRectTag trackingtag;
}
- (void)setDriver:(WindowQuartzSubdriver *)drv;
- (void)setDriver:(VideoDriver_Cocoa *)drv;
- (void)drawRect:(NSRect)rect;
- (BOOL)isOpaque;
- (BOOL)acceptsFirstResponder;
@@ -59,10 +59,10 @@ extern NSString *OTTDMainLaunchGameEngine;
/** Delegate for our NSWindow to send ask for quit on close */
@interface OTTD_CocoaWindowDelegate : NSObject <NSWindowDelegate>
{
WindowQuartzSubdriver *driver;
VideoDriver_Cocoa *driver;
}
- (void)setDriver:(WindowQuartzSubdriver *)drv;
- (void)setDriver:(VideoDriver_Cocoa *)drv;
- (BOOL)windowShouldClose:(id)sender;
- (void)windowDidEnterFullScreen:(NSNotification *)aNotification;