From 849252d51c0d224889e09ca2cb422ddb4173ae29 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 12 Apr 2010 13:38:41 +0000 Subject: [PATCH] fixing some warnings, adding proper OnChar support for special keys git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/window.mm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index 3decd9fc80..8e579e45d0 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -689,7 +689,7 @@ void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event) impl->mouseEvent(event, self, _cmd); } -BOOL wxOSX_acceptsFirstMouse(NSView* self, SEL _cmd, NSEvent *event) +BOOL wxOSX_acceptsFirstMouse(NSView* WXUNUSED(self), SEL WXUNUSED(_cmd), NSEvent *WXUNUSED(event)) { // This is needed to support click through, otherwise the first click on a window // will not do anything unless it is the active window already. @@ -1333,6 +1333,7 @@ void wxWidgetCocoaImpl::SetVisibility( bool visible ) - (void)animationDidEnd:(NSAnimation*)animation { + wxUnusedVar(animation); m_isDone = true; } @@ -1949,10 +1950,20 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event) { if ( !result ) { - if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) - [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]]; + if ( wxevent.GetKeyCode() < WXK_SPACE || wxevent.GetKeyCode() == WXK_DELETE || wxevent.GetKeyCode() >= WXK_START ) + { + // eventually we could setup a doCommandBySelector catcher and retransform this into the wx key chars + wxKeyEvent wxevent2(wxevent) ; + wxevent2.SetEventType(wxEVT_CHAR); + GetWXPeer()->OSXHandleKeyEvent(wxevent2); + } else - [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]]; + { + if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) + [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]]; + else + [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]]; + } result = true; } } -- 2.47.2