From 76181f9327d1588e261c3ff48a40b4a90772db2c Mon Sep 17 00:00:00 2001 From: Rohit Nirmal Date: Wed, 29 Apr 2015 19:59:34 -0500 Subject: [PATCH] Silence -Wshadow and -Wsign-compare warnings. --- Source/Core/DolphinWX/AboutDolphin.cpp | 4 ++-- Source/Core/DolphinWX/TASInputDlg.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/AboutDolphin.cpp b/Source/Core/DolphinWX/AboutDolphin.cpp index ad6bbaeff8..0ff183c464 100644 --- a/Source/Core/DolphinWX/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/AboutDolphin.cpp @@ -81,7 +81,7 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, wxTextCtrl* const Branch = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxSize(300, 50), wxNO_BORDER | wxTE_NO_VSCROLL); BanishBackground(Branch); wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text); - wxStaticText* const Update = new wxStaticText(this, wxID_ANY, CheckUpdateText); + wxStaticText* const UpdateText = new wxStaticText(this, wxID_ANY, CheckUpdateText); wxStaticText* const FirstSpacer = new wxStaticText(this, wxID_ANY, wxString(" | ")); wxStaticText* const SecondSpacer = new wxStaticText(this, wxID_ANY, wxString(" | ")); wxHyperlinkCtrl* const Download = new wxHyperlinkCtrl(this, wxID_ANY, "dolphin-emu.org/download", "https://dolphin-emu.org/download/"); @@ -116,7 +116,7 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, Copyright->SetFocus(); wxBoxSizer* const sCheckUpdates = new wxBoxSizer(wxHORIZONTAL); - sCheckUpdates->Add(Update); + sCheckUpdates->Add(UpdateText); sCheckUpdates->Add(Download); wxBoxSizer* const sLinks = new wxBoxSizer(wxHORIZONTAL); diff --git a/Source/Core/DolphinWX/TASInputDlg.cpp b/Source/Core/DolphinWX/TASInputDlg.cpp index 448f665cd6..652a5d3782 100644 --- a/Source/Core/DolphinWX/TASInputDlg.cpp +++ b/Source/Core/DolphinWX/TASInputDlg.cpp @@ -493,7 +493,7 @@ void TASInputDlg::SetStickValue(bool* ActivatedByKeyboard, int* AmountPressed, w void TASInputDlg::SetSliderValue(Control* control, int CurrentValue) { - if (CurrentValue != control->default_value) + if (CurrentValue != (int)control->default_value) { control->value = CurrentValue; control->set_by_keyboard = true;