piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2342 from rohit-n/warnings

Browse Source 
Silence -Wshadow and -Wsign-compare warnings.
This commit is contained in:
Markus Wick 2015-04-30 23:22:19 +02:00
commit 4b00ccbe4e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/AboutDolphin.cpp
View File

@ -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); wxTextCtrl* const Branch = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxSize(300, 50), wxNO_BORDER | wxTE_NO_VSCROLL);
BanishBackground(Branch); BanishBackground(Branch);
wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text); 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 FirstSpacer = new wxStaticText(this, wxID_ANY, wxString(" | "));
wxStaticText* const SecondSpacer = 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/"); 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(); Copyright->SetFocus();
wxBoxSizer* const sCheckUpdates = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const sCheckUpdates = new wxBoxSizer(wxHORIZONTAL);
sCheckUpdates->Add(Update); sCheckUpdates->Add(UpdateText);
sCheckUpdates->Add(Download); sCheckUpdates->Add(Download);
wxBoxSizer* const sLinks = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const sLinks = new wxBoxSizer(wxHORIZONTAL);

2
Source/Core/DolphinWX/TASInputDlg.cpp
View File

@ -493,7 +493,7 @@ void TASInputDlg::SetStickValue(bool* ActivatedByKeyboard, int* AmountPressed, w
void TASInputDlg::SetSliderValue(Control* control, int CurrentValue) void TASInputDlg::SetSliderValue(Control* control, int CurrentValue)
{ {
if (CurrentValue != control->default_value) if (CurrentValue != (int)control->default_value)
{ {
control->value = CurrentValue; control->value = CurrentValue;
control->set_by_keyboard = true; control->set_by_keyboard = true;