piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 22:59:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update wx to r75363 to address a wx bug that was breaking netplay on OS X.

Browse Source
This commit is contained in:
comex
2013-12-08 15:37:10 -05:00
parent 9722be069b
commit 1334d7fc41
185 changed files with 2040 additions and 5175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Externals/wxWidgets3/src/osx/window_osx.cpp vendored
View File

@ -39,6 +39,7 @@
#include "wx/tooltip.h"
#include "wx/spinctrl.h"
#include "wx/geometry.h"
#include "wx/weakref.h"
#if wxUSE_LISTCTRL
#include "wx/listctrl.h"
@ -610,7 +611,7 @@ void wxWindowMac::SetFocus()
void wxWindowMac::OSXSimulateFocusEvents()
{
wxWindow* former = FindFocus() ;
wxWeakRef<wxWindow> former = FindFocus() ;
if ( former != NULL && former != this )
{
{
@ -620,6 +621,9 @@ void wxWindowMac::OSXSimulateFocusEvents()
former->HandleWindowEvent(event) ;
}
// 'former' could have been destroyed by a wxEVT_KILL_FOCUS handler,
// so we must test it for non-NULL again
if ( former )
{
wxFocusEvent event(wxEVT_SET_FOCUS, former->GetId());
event.SetEventObject(former);
@ -2545,10 +2549,12 @@ bool wxWindowMac::OSXHandleClicked( double WXUNUSED(timestampsec) )
return false;
}
#if wxOSX_USE_COCOA_OR_IPHONE
void *wxWindowMac::OSXGetViewOrWindow() const
{
return GetHandle();
}
#endif
wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
{