ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Kill off the wx casts within InputCommon and GLInterface. 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/Frame.h
View File

@ -87,12 +87,10 @@ public:
void* GetRenderHandle() void* GetRenderHandle()
{ {
#ifdef _WIN32 #if defined(HAVE_X11) && HAVE_X11
return (void *)m_RenderParent->GetHandle(); return reinterpret_cast<void*>(X11Utils::XWindowFromHandle(m_RenderParent->GetHandle()));
#elif defined(HAVE_X11) && HAVE_X11
return (void *)X11Utils::XWindowFromHandle(m_RenderParent->GetHandle());
#else #else
return m_RenderParent; return reinterpret_cast<void*>(m_RenderParent->GetHandle());
#endif #endif
} }

5
Source/Core/DolphinWX/GLInterface/AGL.cpp
View File

@ -2,8 +2,6 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <wx/panel.h>
#include "DolphinWX/GLInterface/AGL.h" #include "DolphinWX/GLInterface/AGL.h"
#include "VideoCommon/RenderBase.h" #include "VideoCommon/RenderBase.h"
@ -19,8 +17,7 @@ void cInterfaceAGL::Swap()
// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() // Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize()
bool cInterfaceAGL::Create(void *window_handle) bool cInterfaceAGL::Create(void *window_handle)
{ {
// FIXME: Get rid of the explicit use of wxPanel here. This shouldn't be necessary. cocoaWin = reinterpret_cast<NSView*>(window_handle);
cocoaWin = reinterpret_cast<NSView*>(((wxPanel*)window_handle)->GetHandle());
NSSize size = [cocoaWin frame].size; NSSize size = [cocoaWin frame].size;
// Enable high-resolution display support. // Enable high-resolution display support.

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

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