summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/InputConfigDiag.cpp
diff options
context:
space:
mode:
authorRachel Bryk <RachelBryk@gmail.com>2014-11-09 15:02:18 -0500
committerRachel Bryk <RachelBryk@gmail.com>2014-11-11 14:14:22 -0500
commite9cb629723bb0fabbad130c2a63b3cdbaaf8ba6a (patch)
treee63ba5755800e9ab82a6314ba8e9f368cbd23a67 /Source/Core/DolphinWX/InputConfigDiag.cpp
parent71d8165a8649cde73663b1534bbdd6094faecf2d (diff)
Fix some double->float conversions.
Diffstat (limited to 'Source/Core/DolphinWX/InputConfigDiag.cpp')
-rw-r--r--Source/Core/DolphinWX/InputConfigDiag.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp
index d4ec43641e..745417845e 100644
--- a/Source/Core/DolphinWX/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/InputConfigDiag.cpp
@@ -128,7 +128,7 @@ void PadSettingSpin::UpdateGUI()
void PadSettingSpin::UpdateValue()
{
- setting->SetValue(float(((wxSpinCtrl*)wxcontrol)->GetValue()) / 100);
+ setting->SetValue(ControlState(((wxSpinCtrl*)wxcontrol)->GetValue()) / 100);
}
ControlDialog::ControlDialog(GamepadPage* const parent, InputConfig& config, ControllerInterface::ControlReference* const ref)
@@ -490,7 +490,7 @@ void GamepadPage::ClearControl(wxEvent& event)
{
ControlButton* const btn = (ControlButton*)event.GetEventObject();
btn->control_reference->expression.clear();
- btn->control_reference->range = 1.0f;
+ btn->control_reference->range = 1.0;
std::lock_guard<std::recursive_mutex> lk(m_config.controls_lock);
controller->UpdateReferences(g_controller_interface);