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

Fix use of wrong type for firstResponder return value

Browse Source
This commit is contained in:
Václav Slavík
2017-02-02 18:21:43 +01:00
parent 8b6a5c88ab
commit f28bdb9a92
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -494,7 +494,7 @@ extern int wxOSXGetIdFromSelector(SEL action );
{ {
// See windowDidResignKey: -- we emulate corresponding focus set // See windowDidResignKey: -- we emulate corresponding focus set
// event for the first responder here as well: // event for the first responder here as well:
NSView *firstResponder = [window firstResponder]; NSResponder *firstResponder = [window firstResponder];
wxWidgetCocoaImpl *focused = firstResponder wxWidgetCocoaImpl *focused = firstResponder
? (wxWidgetCocoaImpl*)wxWidgetImpl::FindFromWXWidget(wxOSXGetViewFromResponder(firstResponder)) ? (wxWidgetCocoaImpl*)wxWidgetImpl::FindFromWXWidget(wxOSXGetViewFromResponder(firstResponder))
: NULL; : NULL;
@@ -521,7 +521,7 @@ extern int wxOSXGetIdFromSelector(SEL action );
// As for wx the deactivation also means losing focus, we // As for wx the deactivation also means losing focus, we
// must emulate focus events _without_ resetting first responder // must emulate focus events _without_ resetting first responder
// (because that would subtly break other things in Cocoa/macOS): // (because that would subtly break other things in Cocoa/macOS):
NSView *firstResponder = [window firstResponder]; NSResponder *firstResponder = [window firstResponder];
wxWidgetCocoaImpl *focused = firstResponder wxWidgetCocoaImpl *focused = firstResponder
? (wxWidgetCocoaImpl*)wxWidgetImpl::FindFromWXWidget(wxOSXGetViewFromResponder(firstResponder)) ? (wxWidgetCocoaImpl*)wxWidgetImpl::FindFromWXWidget(wxOSXGetViewFromResponder(firstResponder))
: NULL; : NULL;