diff options
| author | j4ck.fr0st <j4ck.fr0st@gmail.com> | 2010-01-23 12:59:02 +0000 |
|---|---|---|
| committer | j4ck.fr0st <j4ck.fr0st@gmail.com> | 2010-01-23 12:59:02 +0000 |
| commit | 6b2466c8698b9aef03aada137e25e7ef631f4356 (patch) | |
| tree | f1aee21b4ac8efd408a757e34bfc57c7bcfabac5 /Source/Plugins/Plugin_GCpad/ConfigBox.cpp | |
| parent | 9ec5ee94b4a8786dd21f723446a32f2ff13b5f07 (diff) | |
Added GCpad to SConstruct, should compile fine on Linux and Mac OSX now.
(some things need cleanup, waiting for ayuanx to finish it)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4932 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_GCpad/ConfigBox.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_GCpad/ConfigBox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Plugins/Plugin_GCpad/ConfigBox.cpp b/Source/Plugins/Plugin_GCpad/ConfigBox.cpp index 767819447f..2c9e08d882 100644 --- a/Source/Plugins/Plugin_GCpad/ConfigBox.cpp +++ b/Source/Plugins/Plugin_GCpad/ConfigBox.cpp @@ -19,7 +19,7 @@ #include "math.h" // System
#include "ConfigBox.h"
#include "Config.h"
-#include "GCpad.h"
+#include "GCPad.h"
#if defined(HAVE_X11) && HAVE_X11
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -363,7 +363,7 @@ void GCPadConfigDialog::UpdateGUI() }
#elif defined(HAVE_X11) && HAVE_X11
char keyStr[10] = {0};
- for (int x = 0; x <= IDB_TGR_SEMI_R - IDB_BTN_A; x++)
+ for (int x = 0; x <= IDB_SHDR_SEMI_R - IDB_BTN_A; x++)
{
InputCommon::XKeyToString(GCMapping[m_Page].Button[x + EGC_A], keyStr);
m_Button_GC[x][m_Page]->SetLabel(wxString::FromAscii(keyStr));
|