From de9991c30d683ce496a22b9bae0a2074bac7f887 Mon Sep 17 00:00:00 2001 From: Sonicadvance1 Date: Fri, 13 Nov 2009 20:27:40 +0000 Subject: [PATCH] NoWX fixes >_> git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4560 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp | 4 +++- Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp index 7d993163ab..88c16cf997 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp @@ -36,10 +36,10 @@ #if defined(HAVE_WX) && HAVE_WX #include "ConfigPadDlg.h" + extern WiimotePadConfigDialog *m_PadConfigFrame; #endif extern SWiimoteInitialize g_WiimoteInitialize; -extern WiimotePadConfigDialog *m_PadConfigFrame; namespace WiiMoteEmu { @@ -443,10 +443,12 @@ void Initialize() /* Populate joyinfo for all attached devices and do g_Config.Load() if the configuration window is not already open, if it's already open we continue with the settings we have */ + #if defined(HAVE_WX) && HAVE_WX if (!m_PadConfigFrame) { LocalSearchDevices(joyinfo, NumPads); } + #endif // Copy extension id and calibration to its register, g_Config.Load() is needed before this UpdateExtRegisterBlocks(); diff --git a/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp index 8f232ba43f..9b5e5c1256 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/EmuPad.cpp @@ -38,10 +38,10 @@ #if defined(HAVE_WX) && HAVE_WX #include "ConfigPadDlg.h" + extern WiimotePadConfigDialog *m_PadConfigFrame; #endif extern SWiimoteInitialize g_WiimoteInitialize; -extern WiimotePadConfigDialog *m_PadConfigFrame; namespace WiiMoteEmu {