mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-30 20:58:54 +00:00
more nowx fixes
disabled njoy test build git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1545 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
7790afb1f3
commit
7f8cc4ec62
16 changed files with 107 additions and 36 deletions
|
@ -41,6 +41,7 @@ bool g_UseRealWiiMote = false;
|
|||
|
||||
HINSTANCE g_hInstance;
|
||||
|
||||
#if defined(HAVE_WX) && HAVE_WX
|
||||
class wxDLLApp : public wxApp
|
||||
{
|
||||
bool OnInit()
|
||||
|
@ -51,6 +52,7 @@ class wxDLLApp : public wxApp
|
|||
IMPLEMENT_APP_NO_MAIN(wxDLLApp)
|
||||
|
||||
WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst);
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
|
||||
|
@ -113,6 +115,7 @@ extern "C" void DllAbout(HWND _hParent)
|
|||
|
||||
extern "C" void DllConfig(HWND _hParent)
|
||||
{
|
||||
#if defined(HAVE_WX) && HAVE_WX
|
||||
wxWindow win;
|
||||
#ifdef _WIN32
|
||||
win.SetHWND(_hParent);
|
||||
|
@ -122,6 +125,7 @@ extern "C" void DllConfig(HWND _hParent)
|
|||
#ifdef _WIN32
|
||||
win.SetHWND(0);
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
extern "C" void Wiimote_Initialize(SWiimoteInitialize _WiimoteInitialize)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue