diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-02-23 07:33:03 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-02-23 07:48:06 +0100 |
| commit | 70f3a069f2b760b2add51046781be625bef758db (patch) | |
| tree | 23b74ddd0815882d3a598c67ac11fc7ecf95e98a /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 60a5d8900bd2bf63e4af32d60ec7f69053e13297 (diff) | |
Revert "Merge pull request #83 from lioncash/remove-console"
This breaks Linux stdout logging.
This reverts commit 7ac5b1f2f805b2bc553492606cf71b6609fa0ae7, reversing
changes made to 9bc14012fccf92f38b7d270ec82f7dac522986c5.
Revert "Merge pull request #77 from lioncash/remove-console"
This reverts commit 9bc14012fccf92f38b7d270ec82f7dac522986c5, reversing
changes made to b18a33377d7229a66226a524186d24c57f1d56aa.
Conflicts:
Source/Core/Common/LogManager.cpp
Source/Core/DolphinWX/Frame.cpp
Source/Core/DolphinWX/FrameAui.cpp
Source/Core/DolphinWX/LogConfigWindow.cpp
Source/Core/DolphinWX/LogWindow.cpp
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 06ae7b962b..e8eff865b7 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -258,11 +258,17 @@ void CFrame::CreateMenu() viewMenu->AppendSeparator(); viewMenu->AppendCheckItem(IDM_LOGWINDOW, _("Show &Log")); viewMenu->AppendCheckItem(IDM_LOGCONFIGWINDOW, _("Show Log &Configuration")); + viewMenu->AppendCheckItem(IDM_CONSOLEWINDOW, _("Show &Console")); viewMenu->AppendSeparator(); +#ifndef _WIN32 + viewMenu->Enable(IDM_CONSOLEWINDOW, false); +#endif + if (g_pCodeWindow) { viewMenu->Check(IDM_LOGWINDOW, g_pCodeWindow->bShowOnStart[0]); + viewMenu->Check(IDM_CONSOLEWINDOW, g_pCodeWindow->bShowOnStart[1]); const wxString MenuText[] = { wxTRANSLATE("&Registers"), @@ -285,6 +291,7 @@ void CFrame::CreateMenu() { viewMenu->Check(IDM_LOGWINDOW, SConfig::GetInstance().m_InterfaceLogWindow); viewMenu->Check(IDM_LOGCONFIGWINDOW, SConfig::GetInstance().m_InterfaceLogConfigWindow); + viewMenu->Check(IDM_CONSOLEWINDOW, SConfig::GetInstance().m_InterfaceConsole); } wxMenu *platformMenu = new wxMenu; |