Move platform-specific variables into proper scope.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5484 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
daf1069c27
commit
cf62b10956
|
@ -295,9 +295,9 @@ ControllerEmu::Cursor::Cursor( const char* const _name, const SWiimoteInitialize
|
|||
|
||||
void GetMousePos(float& x, float& y, const SWiimoteInitialize* const wiimote_initialize)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
unsigned int win_width = 2, win_height = 2;
|
||||
|
||||
#ifdef _WIN32
|
||||
// Get the cursor position for the entire screen
|
||||
POINT point = { 1, 1 };
|
||||
GetCursorPos(&point);
|
||||
|
|
|
@ -206,7 +206,6 @@ void GCPadConfigDialog::OnKeyDown(wxKeyEvent& event)
|
|||
// Save the key
|
||||
g_Pressed = event.GetKeyCode();
|
||||
// Handle the keyboard key mapping
|
||||
char keyStr[128] = {0};
|
||||
|
||||
// Allow the escape key to set a blank key
|
||||
if (g_Pressed == WXK_ESCAPE)
|
||||
|
@ -234,6 +233,7 @@ void GCPadConfigDialog::OnKeyDown(wxKeyEvent& event)
|
|||
}
|
||||
}
|
||||
#elif defined(HAVE_X11) && HAVE_X11
|
||||
char keyStr[128] = {0};
|
||||
int XKey = InputCommon::wxCharCodeWXToX(g_Pressed);
|
||||
InputCommon::XKeyToString(XKey, keyStr);
|
||||
SetButtonText(ClickedButton->GetId(),
|
||||
|
|
|
@ -208,7 +208,6 @@ void WiimotePadConfigDialog::OnKeyDown(wxKeyEvent& event)
|
|||
// Save the key
|
||||
g_Pressed = event.GetKeyCode();
|
||||
// Handle the keyboard key mapping
|
||||
char keyStr[128] = {0};
|
||||
|
||||
// Allow the escape key to set a blank key
|
||||
if (g_Pressed == WXK_ESCAPE)
|
||||
|
@ -236,6 +235,7 @@ void WiimotePadConfigDialog::OnKeyDown(wxKeyEvent& event)
|
|||
}
|
||||
}
|
||||
#elif defined(HAVE_X11) && HAVE_X11
|
||||
char keyStr[128] = {0};
|
||||
int XKey = InputCommon::wxCharCodeWXToX(g_Pressed);
|
||||
InputCommon::XKeyToString(XKey, keyStr);
|
||||
SetButtonText(ClickedButton->GetId(),
|
||||
|
|
Loading…
Reference in New Issue