Fix nowx build.

We really should integrate the nowx functionality into the main build,
removing nowx and HAVE_WX checks and turning USE_WX into a variable
that defaults to GUI use but can be overridden at the command line.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5630 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-06-06 21:06:58 +00:00
parent b20c04aa45
commit f4abbdf6b1
5 changed files with 22 additions and 9 deletions

View File

@ -294,8 +294,10 @@ void EmuStateChange(PLUGIN_EMUSTATE newState)
g_EmulatorState = newState;
}
#if defined(HAVE_WX) && HAVE_WX
// Hack to use wx key events
volatile bool wxkeystate[400];
volatile bool wxkeystate[WXK_SPECIAL20];
#endif
// Set buttons status from keyboard input. Currently this is done from
// wxWidgets in the main application.
@ -303,7 +305,7 @@ volatile bool wxkeystate[400];
void Wiimote_Input(u16 _Key, u8 _UpDown)
{
#if defined(__APPLE__) && defined(USE_WX) && USE_WX
if (_Key < 400)
if (_Key < WXK_SPECIAL20)
{
wxkeystate[_Key] = _UpDown;
}