From dc3f3eb190554e03fe9afb54007f18d7f148ad9b Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Tue, 2 Dec 2008 10:50:58 +0000
Subject: [PATCH] warning fixes + compile on linx

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1378 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DebuggerWX/Src/CodeView.cpp                  | 2 +-
 Source/Core/DolphinWX/Src/PatchAddEdit.cpp               | 6 +++---
 Source/Core/DolphinWX/Src/SConscript                     | 1 +
 Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.cpp | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/Core/DebuggerWX/Src/CodeView.cpp b/Source/Core/DebuggerWX/Src/CodeView.cpp
index 9a15b984eb..ea7d782a5d 100644
--- a/Source/Core/DebuggerWX/Src/CodeView.cpp
+++ b/Source/Core/DebuggerWX/Src/CodeView.cpp
@@ -244,7 +244,7 @@ void CCodeView::OnPopupMenu(wxCommandEvent& event)
 			{
 				// Check if this address has been modified
 				int find = -1;				
-				for(int i = 0; i < BlrList.size(); i++)
+				for(u32 i = 0; i < BlrList.size(); i++)
 				{
 					if(BlrList.at(i).Address == selection)
 					{ find = i; break;  }					
diff --git a/Source/Core/DolphinWX/Src/PatchAddEdit.cpp b/Source/Core/DolphinWX/Src/PatchAddEdit.cpp
index 41e44c4e11..3bab617774 100644
--- a/Source/Core/DolphinWX/Src/PatchAddEdit.cpp
+++ b/Source/Core/DolphinWX/Src/PatchAddEdit.cpp
@@ -35,10 +35,10 @@ CPatchAddEdit::~CPatchAddEdit()
 {
 }
 
-void CPatchAddEdit::CreateGUIControls(int selection)
+void CPatchAddEdit::CreateGUIControls(int _selection)
 {
-	std::string currentName = onFrame.at(selection).name;
-	std::vector<PatchEngine::PatchEntry> currentEntries = onFrame.at(selection).entries;
+	std::string currentName = onFrame.at(_selection).name;
+	std::vector<PatchEngine::PatchEntry> currentEntries = onFrame.at(_selection).entries;
 
 	wxBoxSizer* sEditPatch = new wxBoxSizer(wxVERTICAL);
 	wxStaticText* EditPatchNameText = new wxStaticText(this, ID_EDITPATCH_NAME_TEXT, _("Name:"), wxDefaultPosition, wxDefaultSize);
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 7bb1b2c78b..2788275f17 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -21,6 +21,7 @@ if not env['osx64']:
 		'MemcardManager.cpp',
 		'MemoryCards/GCMemcard.cpp',
 		'PluginManager.cpp',
+                'PatchAddEdit.cpp',
 		'CheatsWindow.cpp',
 		'stdafx.cpp',
 		]
diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.cpp
index a72066d22b..2f7b2e89f6 100644
--- a/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.cpp
+++ b/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.cpp
@@ -374,7 +374,6 @@ void ConfigBox::SetControllerAll(int controller)
 void ConfigBox::GetControllerAll(int controller)
 {
 	wxString tmp;
-	char value[64];
 	long lvalue;
 
 	joysticks[controller].ID = m_Joyname[controller]->GetSelection();