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

attempt to get the 'new focus' window parameter of a focus kill event set correctly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2013-06-03 10:37:01 +00:00
parent c34cd96a33
commit 60d66be369
4 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osx/cocoa/textctrl.mm
View File

@@ -182,7 +182,11 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if ( impl )
{
impl->DoNotifyFocusEvent( false, NULL );
NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
NSView* otherView = [responder isKindOfClass:[NSView class]] ? (NSView*)responder : nil;
wxWidgetImpl* otherWindow = impl->FindFromWXWidget(otherView);
impl->DoNotifyFocusEvent( false, otherWindow );
}
}
@@ -336,7 +340,11 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if ( impl )
{
impl->DoNotifyFocusEvent( false, NULL );
NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
NSView* otherView = [responder isKindOfClass:[NSView class]] ? (NSView*)responder : nil;
wxWidgetImpl* otherWindow = impl->FindFromWXWidget(otherView);
impl->DoNotifyFocusEvent( false, otherWindow );
}
}
@@ -506,7 +514,11 @@ NSView* wxMacEditHelper::ms_viewCurrentlyEdited = nil;
timpl->SetInternalSelection(range.location, range.location + range.length);
}
impl->DoNotifyFocusEvent( false, NULL );
NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
NSView* otherView = [responder isKindOfClass:[NSView class]] ? (NSView*)responder : nil;
wxWidgetImpl* otherWindow = impl->FindFromWXWidget(otherView);
impl->DoNotifyFocusEvent( false, otherWindow );
}
}
@end