Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle the remaining selectors which otherwise lead to beeping on key press.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-03-17 21:04:15 +00:00
parent 3bb5029df2
commit 46f573dc0c
1 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/osx/cocoa/nonownedwnd.mm
View File

@@ -57,6 +57,26 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
return wxPoint( x, y); return wxPoint( x, y);
} }
bool shouldHandleSelector(SEL selector)
{
if (selector == @selector(noop:)
|| selector == @selector(complete:)
|| selector == @selector(deleteBackward:)
|| selector == @selector(deleteForward:)
|| selector == @selector(insertNewline:)
|| selector == @selector(insertTab:)
|| selector == @selector(keyDown:)
|| selector == @selector(keyUp:)
|| selector == @selector(scrollPageUp:)
|| selector == @selector(scrollPageDown:)
|| selector == @selector(scrollToBeginningOfDocument:)
|| selector == @selector(scrollToEndOfDocument:))
return false;
return true;
}
// //
// wx native implementation classes // wx native implementation classes
// //
@@ -64,7 +84,6 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector); typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector);
@interface wxNSWindow : NSWindow @interface wxNSWindow : NSWindow
{ {
wxNonOwnedWindowCocoaImpl* impl; wxNonOwnedWindowCocoaImpl* impl;
} }
@@ -86,10 +105,18 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
return impl; return impl;
} }
- (void)doCommandBySelector:(SEL)selector
{
if (shouldHandleSelector(selector) &&
!(selector == @selector(cancel:) || selector == @selector(cancelOperation:)) )
[super doCommandBySelector:selector];
}
// NB: if we don't do this, all key downs that get handled lead to a NSBeep // NB: if we don't do this, all key downs that get handled lead to a NSBeep
- (void)noResponderFor: (SEL) selector - (void)noResponderFor: (SEL) selector
{ {
if (selector != @selector(keyDown:)) if (selector != @selector(keyDown:) && selector != @selector(keyUp:))
{ {
wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)]; wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)];
superimpl(self, @selector(noResponderFor:), selector); superimpl(self, @selector(noResponderFor:), selector);
@@ -126,10 +153,16 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
return impl; return impl;
} }
// NB: if we don't do this, all key downs that get handled lead to a NSBeep - (void)doCommandBySelector:(SEL)selector
{
if (shouldHandleSelector(selector))
[super doCommandBySelector:selector];
}
// NB: if we don't do this, it seems that all events that end here lead to a NSBeep
- (void)noResponderFor: (SEL) selector - (void)noResponderFor: (SEL) selector
{ {
if (selector != @selector(keyDown:)) if (selector != @selector(keyDown:) && selector != @selector(keyUp:))
{ {
wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)]; wxOSX_NoResponderHandlerPtr superimpl = (wxOSX_NoResponderHandlerPtr) [[self superclass] instanceMethodForSelector:@selector(noResponderFor:)];
superimpl(self, @selector(noResponderFor:), selector); superimpl(self, @selector(noResponderFor:), selector);