ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Soren Jorvang 2010-05-26 20:46:51 +00:00
parent daf1069c27
commit cf62b10956
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp
View File

@ -295,9 +295,9 @@ ControllerEmu::Cursor::Cursor( const char* const _name, const SWiimoteInitialize
void GetMousePos(float& x, float& y, const SWiimoteInitialize* const wiimote_initialize) void GetMousePos(float& x, float& y, const SWiimoteInitialize* const wiimote_initialize)
{ {
#ifdef _WIN32
unsigned int win_width = 2, win_height = 2; unsigned int win_width = 2, win_height = 2;
#ifdef _WIN32
// Get the cursor position for the entire screen // Get the cursor position for the entire screen
POINT point = { 1, 1 }; POINT point = { 1, 1 };
GetCursorPos(&point); GetCursorPos(&point);

2
Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp
View File

@ -206,7 +206,6 @@ void GCPadConfigDialog::OnKeyDown(wxKeyEvent& event)
// Save the key // Save the key
g_Pressed = event.GetKeyCode(); g_Pressed = event.GetKeyCode();
// Handle the keyboard key mapping // Handle the keyboard key mapping
char keyStr[128] = {0};
// Allow the escape key to set a blank key // Allow the escape key to set a blank key
if (g_Pressed == WXK_ESCAPE) if (g_Pressed == WXK_ESCAPE)
@ -234,6 +233,7 @@ void GCPadConfigDialog::OnKeyDown(wxKeyEvent& event)
} }
} }
#elif defined(HAVE_X11) && HAVE_X11 #elif defined(HAVE_X11) && HAVE_X11
char keyStr[128] = {0};
int XKey = InputCommon::wxCharCodeWXToX(g_Pressed); int XKey = InputCommon::wxCharCodeWXToX(g_Pressed);
InputCommon::XKeyToString(XKey, keyStr); InputCommon::XKeyToString(XKey, keyStr);
SetButtonText(ClickedButton->GetId(), SetButtonText(ClickedButton->GetId(),

2
Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp
View File

@ -208,7 +208,6 @@ void WiimotePadConfigDialog::OnKeyDown(wxKeyEvent& event)
// Save the key // Save the key
g_Pressed = event.GetKeyCode(); g_Pressed = event.GetKeyCode();
// Handle the keyboard key mapping // Handle the keyboard key mapping
char keyStr[128] = {0};
// Allow the escape key to set a blank key // Allow the escape key to set a blank key
if (g_Pressed == WXK_ESCAPE) if (g_Pressed == WXK_ESCAPE)
@ -236,6 +235,7 @@ void WiimotePadConfigDialog::OnKeyDown(wxKeyEvent& event)
} }
} }
#elif defined(HAVE_X11) && HAVE_X11 #elif defined(HAVE_X11) && HAVE_X11
char keyStr[128] = {0};
int XKey = InputCommon::wxCharCodeWXToX(g_Pressed); int XKey = InputCommon::wxCharCodeWXToX(g_Pressed);
InputCommon::XKeyToString(XKey, keyStr); InputCommon::XKeyToString(XKey, keyStr);
SetButtonText(ClickedButton->GetId(), SetButtonText(ClickedButton->GetId(),