diff options
author | planetmaker <planetmaker@openttd.org> | 2010-12-21 15:57:55 +0000 |
---|---|---|
committer | planetmaker <planetmaker@openttd.org> | 2010-12-21 15:57:55 +0000 |
commit | 26575ab8f880a39dc9c07203d4f8b31eb667fdac (patch) | |
tree | b856ca9c3891022933f1a291cbdaba461fcad11d /src/video/cocoa/wnd_quartz.mm | |
parent | 7ab04792c501fcc605eff92d79eab5a66707e28f (diff) | |
download | openttd-26575ab8f880a39dc9c07203d4f8b31eb667fdac.tar.xz |
(svn r21575) -Codechange: [OSX] Use the same class for the window delegate routines in windowed screen drivers
Diffstat (limited to 'src/video/cocoa/wnd_quartz.mm')
-rw-r--r-- | src/video/cocoa/wnd_quartz.mm | 50 |
1 files changed, 2 insertions, 48 deletions
diff --git a/src/video/cocoa/wnd_quartz.mm b/src/video/cocoa/wnd_quartz.mm index b9a84160f..50712cf9d 100644 --- a/src/video/cocoa/wnd_quartz.mm +++ b/src/video/cocoa/wnd_quartz.mm @@ -62,16 +62,6 @@ class WindowQuartzSubdriver; - (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag; @end -/* Delegate for our NSWindow to send ask for quit on close */ -@interface OTTD_QuartzWindowDelegate : NSObject { - WindowQuartzSubdriver *driver; -} - -- (void)setDriver:(WindowQuartzSubdriver*)drv; - -- (BOOL)windowShouldClose:(id)sender; -@end - /* Subclass of NSView to fix Quartz rendering */ @interface OTTD_QuartzView : NSView { WindowQuartzSubdriver *driver; @@ -243,42 +233,6 @@ static CGColorSpaceRef QZ_GetCorrectColorSpace() @end -@implementation OTTD_QuartzWindowDelegate - -- (void)setDriver:(WindowQuartzSubdriver*)drv -{ - driver = drv; -} - -- (BOOL)windowShouldClose:(id)sender -{ - HandleExitGameRequest(); - - return NO; -} - -- (void)windowDidBecomeKey:(NSNotification*)aNotification -{ - driver->active = true; -} - -- (void)windowDidResignKey:(NSNotification*)aNotification -{ - driver->active = false; -} - -- (void)windowDidBecomeMain:(NSNotification*)aNotification -{ - driver->active = true; -} - -- (void)windowDidResignMain:(NSNotification*)aNotification -{ - driver->active = false; -} - -@end - @implementation OTTD_QuartzView - (void)setDriver:(WindowQuartzSubdriver*)drv @@ -400,7 +354,7 @@ bool WindowQuartzSubdriver::SetVideoMode(int width, int height) /* Check if we should recreate the window */ if (this->window == nil) { - OTTD_QuartzWindowDelegate *delegate; + OTTD_CocoaWindowDelegate *delegate; /* Set the window style */ unsigned int style = NSTitledWindowMask; @@ -436,7 +390,7 @@ bool WindowQuartzSubdriver::SetVideoMode(int width, int height) [ this->window useOptimizedDrawing:YES ]; - delegate = [ [ OTTD_QuartzWindowDelegate alloc ] init ]; + delegate = [ [ OTTD_CocoaWindowDelegate alloc ] init ]; [ delegate setDriver:this ]; [ this->window setDelegate:[ delegate autorelease ] ]; } else { |