From 232fe7453666f1056d128f8a0ef1e338cb1cc3a0 Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Thu, 1 Jan 2009 15:38:46 +0000
Subject: [PATCH] warning fix by olejl We should get rid of that
 wxmessagebox...

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1731 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp
index 1081b4a750..d4da5b95b6 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp
@@ -89,10 +89,10 @@ void DEBUG_QUIT()
 int Config::CheckForDuplicateJoypads(bool OK)
 {
 	// Count the number of duplicate names
-	int NumDuplicates = 0, Duplicate;
+	int NumDuplicates = 0, Duplicate = 0;
 	for(u32 i = 0; i < 4; i++)
 	{
-		for(int j = 0; j < 4; j++)
+		for(u32 j = 0; j < 4; j++)
 		{
 			// Avoid potential crash
 			if(joysticks[i].ID >= SDL_NumJoysticks() || joysticks[j].ID >= SDL_NumJoysticks()) continue;
@@ -136,7 +136,7 @@ int Config::CheckForDuplicateJoypads(bool OK)
 			" message and close the configuration window and don't show this message again.]"));
 
 			ReturnMessage = wxMessageBox(wxString::Format
-			(wxT("%s%s"), MainText , ExtendedText), wxT("Notice"),
+			(MainText + ExtendedText), wxT("Notice"),
 			(wxOK | wxCANCEL) | wxICON_INFORMATION, 0, 100);				
 			if (ReturnMessage == wxCANCEL) g_Config.bSaveByIDNotice = false;
 		}
@@ -146,7 +146,7 @@ int Config::CheckForDuplicateJoypads(bool OK)
 			"\n\n[Select 'Cancel' if you don't want to see this information again.]"));
 
 			ReturnMessage = wxMessageBox(wxString::Format
-			(wxT("%s%s"), MainText , ExtendedText), wxT("Notice"),
+			(MainText  + ExtendedText), wxT("Notice"),
 			(wxOK | wxCANCEL) | wxICON_INFORMATION, 0, 100);				
 			if (ReturnMessage == wxCANCEL) g_Config.bSaveByIDNotice = false;
 		}