diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-09-18 20:17:16 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-09-18 20:17:16 -0400 |
| commit | 68d62c3d32296bcf8d6831f70314c1d7c50044c9 (patch) | |
| tree | e007da89c0dc22b730f54b23dde4e41b3bb1a876 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 88196d373f1b2070df14597f493bb601a24873cd (diff) | |
| parent | 207d7787a435515c47cbba0b12d7d1341dda596c (diff) | |
Merge pull request #1110 from lioncash/apple-code
DolphinWX: Fix GC/Wiimote input windows randomly crashing on OSX
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 4045879e31..e6a9aaad17 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -1245,11 +1245,9 @@ void CFrame::OnConfigPAD(wxCommandEvent& WXUNUSED (event)) { #if defined(HAVE_X11) && HAVE_X11 Window win = X11Utils::XWindowFromHandle(GetHandle()); - Pad::Initialize((void *)win); -#elif defined(__APPLE__) - Pad::Initialize((void *)this); + Pad::Initialize(reinterpret_cast<void*>(win)); #else - Pad::Initialize(GetHandle()); + Pad::Initialize(reinterpret_cast<void*>(GetHandle())); #endif } InputConfigDialog m_ConfigFrame(this, *pad_plugin, _trans("Dolphin GCPad Configuration")); @@ -1273,11 +1271,9 @@ void CFrame::OnConfigWiimote(wxCommandEvent& WXUNUSED (event)) { #if defined(HAVE_X11) && HAVE_X11 Window win = X11Utils::XWindowFromHandle(GetHandle()); - Wiimote::Initialize((void *)win); -#elif defined(__APPLE__) - Wiimote::Initialize((void *)this); + Wiimote::Initialize(reinterpret_cast<void*>(win)); #else - Wiimote::Initialize(GetHandle()); + Wiimote::Initialize(reinterpret_cast<void*>(GetHandle())); #endif } WiimoteConfigDiag m_ConfigFrame(this, *wiimote_plugin); |