From f48a74a236676800201132c4ccd4d27d71c1222c Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Sat, 15 Nov 2008 03:53:00 +0000
Subject: [PATCH] let dsp null build in debug mode. fixed typo(?) in wiimote
 emu, so now left click=A, right click=B. Fixed up ConfigMain to write to the
 correct offset for changing wii language, and the dialog doesn't get
 extremely wide anymore. Also ignore rcdefs.h.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1180 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DolphinWX/Src/ConfigMain.cpp             | 12 ++++--------
 Source/Core/DolphinWX/Src/ConfigMain.h               |  2 +-
 Source/Plugins/Plugin_DSP_NULL/Src/Globals.cpp       |  2 +-
 .../Plugins/Plugin_Wiimote_Test/Src/FillReport.cpp   |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index f4c8b8341e..297c805f29 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -76,6 +76,10 @@ CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
 	}
 
 	CreateGUIControls();
+	for(u32 i = 0; i < SConfig::GetInstance().m_ISOFolder.size(); i++)
+	{
+		ISOPaths->Append(wxString(SConfig::GetInstance().m_ISOFolder[i].c_str(), wxConvUTF8));
+	}
 }
 
 CConfigMain::~CConfigMain()
@@ -84,10 +88,6 @@ CConfigMain::~CConfigMain()
 
 void CConfigMain::CreateGUIControls()
 {
-	// Why does this not work? some restriction is needed so that huge
-	//	ISO paths dont cause the dialog to become gargantuan
-	SetMaxSize(wxSize(350, 350));
-	
 	Notebook = new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize);
 
 	GeneralPage = new wxPanel(Notebook, ID_GENERALPAGE, wxDefaultPosition, wxDefaultSize);
@@ -217,10 +217,6 @@ void CConfigMain::CreateGUIControls()
 
 	// Paths page
 	sbISOPaths = new wxStaticBoxSizer(wxVERTICAL, PathsPage, wxT("ISO Directories"));
-	for(u32 i = 0; i < SConfig::GetInstance().m_ISOFolder.size(); i++)
-	{
-		arrayStringFor_ISOPaths.Add(wxString(SConfig::GetInstance().m_ISOFolder[i].c_str(), wxConvUTF8));
-	}
 	ISOPaths = new wxListBox(PathsPage, ID_ISOPATHS, wxDefaultPosition, wxDefaultSize, arrayStringFor_ISOPaths, wxLB_SINGLE, wxDefaultValidator);
 	AddISOPath = new wxButton(PathsPage, ID_ADDISOPATH, wxT("Add..."), wxDefaultPosition, wxDefaultSize, 0);
 	RemoveISOPath = new wxButton(PathsPage, ID_REMOVEISOPATH, wxT("Remove"), wxDefaultPosition, wxDefaultSize, 0);
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.h b/Source/Core/DolphinWX/Src/ConfigMain.h
index 56d097d31b..e9874c0d2d 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.h
+++ b/Source/Core/DolphinWX/Src/ConfigMain.h
@@ -100,7 +100,7 @@ class CConfigMain
 		{
 			IPL_AR = 0x04D9,
 			IPL_SSV = 0x04EA,
-			IPL_LNG = 0x04AF,
+			IPL_LNG = 0x04F3,
 			IPL_PGS = 0x17CC,
 			IPL_E60 = 0x17D5
 		};
diff --git a/Source/Plugins/Plugin_DSP_NULL/Src/Globals.cpp b/Source/Plugins/Plugin_DSP_NULL/Src/Globals.cpp
index bd939bfb3a..e29f88d607 100644
--- a/Source/Plugins/Plugin_DSP_NULL/Src/Globals.cpp
+++ b/Source/Plugins/Plugin_DSP_NULL/Src/Globals.cpp
@@ -19,7 +19,7 @@ void DebugLog(const char* _fmt, ...)
 	vsprintf(Msg, _fmt, ap);
 	va_end(ap);
 
-	g_dspInitialize.pLog(Msg);
+	g_dspInitialize.pLog(Msg, FALSE);
 #endif
 }
 
diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/FillReport.cpp b/Source/Plugins/Plugin_Wiimote_Test/Src/FillReport.cpp
index 1c1ca3ad43..2c6ad3ba9a 100644
--- a/Source/Plugins/Plugin_Wiimote_Test/Src/FillReport.cpp
+++ b/Source/Plugins/Plugin_Wiimote_Test/Src/FillReport.cpp
@@ -51,7 +51,7 @@ void FillReportInfo(wm_core& _core)
 	if(GetAsyncKeyState(VK_LBUTTON) ? 1 : 0 || GetAsyncKeyState('A') ? 1 : 0)
 		_core.a = 1;
 
-	if(GetAsyncKeyState(VK_LBUTTON) ? 1 : 0 || GetAsyncKeyState('B') ? 1 : 0)
+	if(GetAsyncKeyState(VK_RBUTTON) ? 1 : 0 || GetAsyncKeyState('B') ? 1 : 0)
 		_core.b = 1;
 
 	_core.one = GetAsyncKeyState('1') ? 1 : 0;