aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorAndreas Färber <andreas.faerber@web.de>2011-06-09 20:53:32 +0200
committerAndreas Färber <andreas.faerber@web.de>2011-06-14 03:08:58 +0200
commit7fee199cf9704587d4ed9eb23044970f2206debc (patch)
treec71967209e24ef7e0a75f81197d71181b49e27c4 /ui
parente949467ba6e9829be0a2fc7ec27ec544d7bd3a29 (diff)
cocoa: Avoid warning related to multiple handleEvent: definitions
Avoid compiler confusion as to which method signature to use for the handleEvent: selector on OSX >= 10.6 by making the variable type-safe as opposed to generic 'id' type. Requires moving the variable definition to after the class definition. ----8<---- ui/cocoa.m: In function ‘cocoa_refresh’: ui/cocoa.m:997: warning: multiple methods named ‘-handleEvent:’ found /System/Library/Frameworks/AppKit.framework/Headers/NSTextInputContext.h:84: warning: using ‘-(BOOL)handleEvent:(NSEvent *)theEvent’ ui/cocoa.m:272: warning: also found ‘-(void)handleEvent:(NSEvent *)event’ ----8<--- Reported-by: Alexandre Raymond <cerbere@gmail.com> Signed-off-by: Andreas Färber <andreas.faerber@web.de> Tested-by: Alexandre Raymond <cerbere@gmail.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/cocoa.m3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 1c5475977..515e684dd 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -63,7 +63,6 @@ typedef struct {
} QEMUScreen;
NSWindow *normalWindow;
-id cocoaView;
static DisplayChangeListener *dcl;
int gArgc;
@@ -278,6 +277,8 @@ static int cocoa_keycode_to_qemu(int keycode)
- (QEMUScreen) gscreen;
@end
+QemuCocoaView *cocoaView;
+
@implementation QemuCocoaView
- (id)initWithFrame:(NSRect)frameRect
{