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

Kill off the wx casts within InputCommon and GLInterface.

Browse Source 
All because someone didn't actually return the wxWindow handle for the edge case.
This commit is contained in:
Lioncash
2014-09-14 01:06:25 -04:00
parent 0b44795cf3
commit 357c0adc3c
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/InputCommon/ControllerInterface/OSX/OSXKeyboard.mm
View File

@ -7,7 +7,6 @@
#include <Foundation/Foundation.h>
#include <IOKit/hid/IOHIDLib.h>
#include <Cocoa/Cocoa.h>
#include <wx/wx.h> // wxWidgets
#include "InputCommon/ControllerInterface/OSX/OSXKeyboard.h"
@ -45,7 +44,7 @@ Keyboard::Keyboard(IOHIDDeviceRef device, std::string name, int index, void *win
CFRelease(elements);
}
m_windowid = [[(NSView *)(((wxWindow *)window)->GetHandle()) window] windowNumber];
m_windowid = [[reinterpret_cast<NSView*>(window) window] windowNumber];
// cursor, with a hax for-loop
for (unsigned int i=0; i<4; ++i)