Allow use of Logger window without entire debug suite via the -l command line option, make the options actually viewable in the logger and a very little bit of a cleanup in nJoy Test

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1633 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 16 insertions, 2 deletions

diff --git a/Source/Core/DebuggerWX/Src/LogWindow.cpp b/Source/Core/DebuggerWX/Src/LogWindow.cpp
index d3c92bdfcd..c16885e4e5 100644
--- a/Source/Core/DebuggerWX/Src/LogWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/LogWindow.cpp
@@ -70,8 +70,7 @@ CLogWindow::CLogWindow(wxWindow* parent)
 
 	// I could not find any transparency setting and it would not automatically space correctly
 	m_options->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
-	m_options->SetMinSize(wxSize(m_options->GetSize().GetWidth() - 40,
-		m_options->GetCount() * 15));
+	//m_options->SetMinSize(wxSize(m_options->GetSize().GetWidth() - 40,m_options->GetCount() * 15));
 	#ifdef _WIN32
 	for (unsigned int i = 0; i < m_options->GetCount(); ++i)
 		m_options->GetItem(i)->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE));
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index 4c442d9294..f984408b2c 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -39,6 +39,7 @@
 #include "Frame.h"
 #include "Config.h"
 #include "CodeWindow.h"
+#include "LogWindow.h"
 #include "ExtendedTrace.h"
 #include "BootManager.h"
 
@@ -120,6 +121,7 @@ bool DolphinApp::OnInit()
 	// ============
 	// Check for debugger
 	bool UseDebugger = false;
+	bool UseLogger = false;
 	bool LoadElf = false; wxString ElfFile;
 
 #if wxUSE_CMDLINE_PARSER
@@ -133,6 +135,9 @@ bool DolphinApp::OnInit()
 			wxCMD_LINE_SWITCH, _T("d"), _T("debugger"), _T("Opens the debugger")
 		},
 		{
+			wxCMD_LINE_SWITCH, _T("l"), _T("logger"), _T("Opens The Logger")
+		},
+		{
 			wxCMD_LINE_OPTION, _T("e"), _T("elf"), _T("Loads an elf file"),
 			wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
 		},
@@ -179,6 +184,7 @@ bool DolphinApp::OnInit()
 	} 
 
 	UseDebugger = parser.Found(_T("debugger"));
+	UseLogger = parser.Found(_T("logger"));
 	LoadElf = parser.Found(_T("elf"), &ElfFile);
 
 	if( LoadElf && ElfFile == wxEmptyString )
@@ -229,6 +235,15 @@ bool DolphinApp::OnInit()
 		g_pCodeWindow = new CCodeWindow(SConfig::GetInstance().m_LocalCoreStartupParameter, main_frame);
 		g_pCodeWindow->Show(true);
 	}
+	if(!UseDebugger && UseLogger)
+	{
+	#ifdef LOGGING
+		// We aren't using debugger, just logger
+		// Should be fine for a local copy
+		CLogWindow* m_LogWindow = new CLogWindow(main_frame);
+		m_LogWindow->Show(true);
+	#endif
+	} 
 
 	// First check if we have a elf command line
 	if (LoadElf && ElfFile != wxEmptyString)