From cf62b109565ee0efb5a18a37c63e5ed71fc64d63 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Wed, 26 May 2010 20:46:51 +0000 Subject: [PATCH] Move platform-specific variables into proper scope. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5484 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp | 2 +- Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp | 2 +- Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp b/Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp index 2e6f73b620..22ec6b6960 100644 --- a/Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp +++ b/Source/Plugins/InputPluginCommon/Src/ControllerEmu.cpp @@ -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); diff --git a/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp b/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp index fe598cdb11..76ac5477fc 100644 --- a/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp +++ b/Source/Plugins/Plugin_GCPad/Src/ConfigBox.cpp @@ -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(), diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp index 77e2114c86..14f97564a6 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigPadDlg.cpp @@ -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(),