summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/LogConfigWindow.cpp
diff options
context:
space:
mode:
authorShawn Hoffman <godisgovernment@gmail.com>2015-03-15 22:11:18 -0700
committerShawn Hoffman <godisgovernment@gmail.com>2015-03-15 22:11:18 -0700
commit0a79b6d5a73e8091686e11db416c1ddfd4274376 (patch)
tree34a801428235c68b267561506c3038a13dfb1218 /Source/Core/DolphinWX/LogConfigWindow.cpp
parent7cda374910ffa9fc9680035ea77083b1cc0d14d9 (diff)
[windows] Remove ConsoleListener, which was not actually used.
Replace it with the DebuggerLogListener.
Diffstat (limited to 'Source/Core/DolphinWX/LogConfigWindow.cpp')
-rw-r--r--Source/Core/DolphinWX/LogConfigWindow.cpp53
1 files changed, 1 insertions, 52 deletions
diff --git a/Source/Core/DolphinWX/LogConfigWindow.cpp b/Source/Core/DolphinWX/LogConfigWindow.cpp
index 7ff43ce395..3eb8ee710a 100644
--- a/Source/Core/DolphinWX/LogConfigWindow.cpp
+++ b/Source/Core/DolphinWX/LogConfigWindow.cpp
@@ -64,14 +64,6 @@ void LogConfigWindow::CreateGUIControls()
m_writeConsoleCB->Bind(wxEVT_CHECKBOX, &LogConfigWindow::OnWriteConsoleChecked, this);
m_writeWindowCB = new wxCheckBox(this, wxID_ANY, _("Write to Window"));
m_writeWindowCB->Bind(wxEVT_CHECKBOX, &LogConfigWindow::OnWriteWindowChecked, this);
- m_writeDebuggerCB = nullptr;
-#ifdef _MSC_VER
- if (IsDebuggerPresent())
- {
- m_writeDebuggerCB = new wxCheckBox(this, wxID_ANY, _("Write to Debugger"));
- m_writeDebuggerCB->Bind(wxEVT_CHECKBOX, &LogConfigWindow::OnWriteDebuggerChecked, this);
- }
-#endif
wxButton *btn_toggle_all = new wxButton(this, wxID_ANY, _("Toggle All Log Types"),
wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
@@ -85,17 +77,7 @@ void LogConfigWindow::CreateGUIControls()
wxStaticBoxSizer* sbOutputs = new wxStaticBoxSizer(wxVERTICAL, this, _("Logger Outputs"));
sbOutputs->Add(m_writeFileCB, 0, wxDOWN, 1);
sbOutputs->Add(m_writeConsoleCB, 0, wxDOWN, 1);
-#ifdef _MSC_VER
- if (m_writeDebuggerCB)
- {
- sbOutputs->Add(m_writeWindowCB, 0, wxDOWN, 1);
- sbOutputs->Add(m_writeDebuggerCB, 0);
- }
- else
-#endif
- {
- sbOutputs->Add(m_writeWindowCB, 0);
- }
+ sbOutputs->Add(m_writeWindowCB, 0);
wxStaticBoxSizer* sbLogTypes = new wxStaticBoxSizer(wxVERTICAL, this, _("Log Types"));
sbLogTypes->Add(m_checks, 1, wxEXPAND);
@@ -137,17 +119,6 @@ void LogConfigWindow::LoadSettings()
m_writeConsoleCB->SetValue(m_writeConsole);
options->Get("WriteToWindow", &m_writeWindow, true);
m_writeWindowCB->SetValue(m_writeWindow);
-#ifdef _MSC_VER
- if (IsDebuggerPresent())
- {
- options->Get("WriteToDebugger", &m_writeDebugger, true);
- m_writeDebuggerCB->SetValue(m_writeDebugger);
- }
- else
-#endif
- {
- m_writeDebugger = false;
- }
// Run through all of the log types and check each checkbox for each logging type
// depending on its set value within the config ini.
@@ -173,10 +144,6 @@ void LogConfigWindow::SaveSettings()
options->Set("WriteToFile", m_writeFile);
options->Set("WriteToConsole", m_writeConsole);
options->Set("WriteToWindow", m_writeWindow);
-#ifdef _MSC_VER
- if (IsDebuggerPresent())
- options->Set("WriteToDebugger", m_writeDebugger);
-#endif
// Save all enabled/disabled states of the log types to the config ini.
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
@@ -247,21 +214,6 @@ void LogConfigWindow::OnWriteWindowChecked(wxCommandEvent& event)
}
}
-void LogConfigWindow::OnWriteDebuggerChecked(wxCommandEvent& event)
-{
- for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
- {
- m_writeDebugger = event.IsChecked();
- if (m_checks->IsChecked(i))
- {
- if (m_writeDebugger)
- m_LogManager->AddListener((LogTypes::LOG_TYPE)i, (LogListener *)m_LogManager->GetDebuggerListener());
- else
- m_LogManager->RemoveListener((LogTypes::LOG_TYPE)i, (LogListener *)m_LogManager->GetDebuggerListener());
- }
- }
-}
-
void LogConfigWindow::OnToggleAll(wxCommandEvent& WXUNUSED(event))
{
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; ++i)
@@ -286,15 +238,12 @@ void LogConfigWindow::ToggleLog(int _logType, bool enable)
m_LogManager->AddListener(logType, m_LogManager->GetFileListener());
if (m_writeConsole)
m_LogManager->AddListener(logType, m_LogManager->GetConsoleListener());
- if (m_writeDebugger)
- m_LogManager->AddListener(logType, m_LogManager->GetDebuggerListener());
}
else
{
m_LogManager->RemoveListener(logType, (LogListener *)m_LogWindow);
m_LogManager->RemoveListener(logType, m_LogManager->GetFileListener());
m_LogManager->RemoveListener(logType, m_LogManager->GetConsoleListener());
- m_LogManager->RemoveListener(logType, m_LogManager->GetDebuggerListener());
}
}