NoWX fixes >_>
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4560 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
4d3620ace3
commit
de9991c30d
|
@ -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();
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue