changing to allow for 2x ramping up NSApp run
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
0e4a6d339a
commit
17243986ec
@ -242,21 +242,39 @@ void wxBell()
|
|||||||
// here we subclass NSApplication, for the purpose of being able to override sendEvent.
|
// here we subclass NSApplication, for the purpose of being able to override sendEvent.
|
||||||
@interface wxNSApplication : NSApplication
|
@interface wxNSApplication : NSApplication
|
||||||
{
|
{
|
||||||
|
BOOL firstPass;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (id)init;
|
||||||
|
|
||||||
- (void)sendEvent:(NSEvent *)anEvent;
|
- (void)sendEvent:(NSEvent *)anEvent;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@implementation wxNSApplication
|
@implementation wxNSApplication
|
||||||
|
|
||||||
|
- (id)init
|
||||||
|
{
|
||||||
|
self = [super init];
|
||||||
|
firstPass = YES;
|
||||||
|
return self;
|
||||||
|
}
|
||||||
|
|
||||||
/* This is needed because otherwise we don't receive any key-up events for command-key
|
/* This is needed because otherwise we don't receive any key-up events for command-key
|
||||||
combinations (an AppKit bug, apparently) */
|
combinations (an AppKit bug, apparently) */
|
||||||
- (void)sendEvent:(NSEvent *)anEvent
|
- (void)sendEvent:(NSEvent *)anEvent
|
||||||
{
|
{
|
||||||
if ([anEvent type] == NSKeyUp && ([anEvent modifierFlags] & NSCommandKeyMask))
|
if ([anEvent type] == NSKeyUp && ([anEvent modifierFlags] & NSCommandKeyMask))
|
||||||
[[self keyWindow] sendEvent:anEvent];
|
[[self keyWindow] sendEvent:anEvent];
|
||||||
else [super sendEvent:anEvent];
|
else
|
||||||
|
[super sendEvent:anEvent];
|
||||||
|
|
||||||
|
if ( firstPass )
|
||||||
|
{
|
||||||
|
[NSApp stop:nil];
|
||||||
|
firstPass = NO;
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
@ -293,6 +311,14 @@ bool wxApp::DoInitGui()
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxApp::CallOnInit()
|
||||||
|
{
|
||||||
|
wxMacAutoreleasePool autoreleasepool;
|
||||||
|
m_onInitResult = false;
|
||||||
|
[NSApp run];
|
||||||
|
return m_onInitResult;
|
||||||
|
}
|
||||||
|
|
||||||
void wxApp::DoCleanUp()
|
void wxApp::DoCleanUp()
|
||||||
{
|
{
|
||||||
if ( appcontroller != nil )
|
if ( appcontroller != nil )
|
||||||
|
Loading…
Reference in New Issue
Block a user