diff options
| author | Glenn Rice <glennricster@gmail.com> | 2011-01-30 17:04:12 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2011-01-30 17:04:12 +0000 |
| commit | cde1c5bd60dc738ce30b2ace5cdbadb264db2a34 (patch) | |
| tree | 92461c5e3c7ad1becedda8852e293c845e5d7640 /Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp | |
| parent | db1765c4256fc7990347870e0862bc764f7a7398 (diff) | |
Remove the PIC linker flag for DSP on linux.
Fix some debugger issues. Still need to get sound window working, but the invalid id panic alert is fixed.
Also, a ";" as a comment in an ini file is now only allowed at the beginning of a line. The debugger has settings strings with semicolons in them. That completely broke the debugger.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6989 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp')
| -rw-r--r-- | Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp index 80d326d753..ea4b7dd758 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp @@ -425,7 +425,7 @@ void CCodeWindow::OpenPages() if (bShowOnStart[IDM_JITWINDOW - IDM_LOGWINDOW]) ToggleJitWindow(true); if (bShowOnStart[IDM_SOUNDWINDOW - IDM_LOGWINDOW]) - ToggleDLLWindow(IDM_SOUNDWINDOW, true); + ToggleSoundWindow(true); if (bShowOnStart[IDM_VIDEOWINDOW - IDM_LOGWINDOW]) ToggleDLLWindow(IDM_VIDEOWINDOW, true); } @@ -515,22 +515,23 @@ void CCodeWindow::ToggleJitWindow(bool bShow) void CCodeWindow::ToggleSoundWindow(bool bShow) { + // TODO: Resurrect DSP debugger window. +#if 0 GetMenuBar()->FindItem(IDM_SOUNDWINDOW)->Check(bShow); if (bShow) { - /* TODO: Resurrect DSP debugger window. - if (!m_JitWindow) - m_JitWindow = new CJitWindow(Parent, IDM_SOUNDWINDOW); - Parent->DoAddPage(m_JitWindow, + if (!m_SoundWindow) + m_SoundWindow = new DSPDebuggerLLE(Parent, IDM_SOUNDWINDOW); + Parent->DoAddPage(m_SoundWindow, iNbAffiliation[IDM_SOUNDWINDOW - IDM_LOGWINDOW], Parent->bFloatWindow[IDM_SOUNDWINDOW - IDM_LOGWINDOW]); - */ } else // Close { - //Parent->DoRemovePage(m_JitWindow, false); - // m_JitWindow = NULL; + Parent->DoRemovePage(m_SoundWindow, false); + m_SoundWindow = NULL; } +#endif } // Notice: This windows docking will produce several wx debugging messages for plugin |