piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix nowx build.

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

8
Source/Plugins/Plugin_GCPad/Src/GCPad.cpp
View File

@ -243,15 +243,17 @@ void EmuStateChange(PLUGIN_EMUSTATE 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.
// --------------
void PAD_Input(u16 _Key, u8 _UpDown)
{
#if defined(__APPLE__) && defined(USE_WX) && USE_WX
if (_Key < 400)
if (_Key < WXK_SPECIAL20)
{
wxkeystate[_Key] = _UpDown;
}
@ -634,7 +636,7 @@ bool IsKey(int Key)
}
else if (MapKey < 0x1100)
#elif defined (USE_WX) && USE_WX
if (MapKey < 400) {
if (MapKey < WXK_SPECIAL20) {
Ret = wxkeystate[MapKey];
}
else if (MapKey < 0x1100)