Fix the DSPLLE debugger window.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7007 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2011-01-31 04:36:49 +00:00
parent 424b8fd6b3
commit b6251ba674
10 changed files with 24 additions and 19 deletions

View File

@ -14,4 +14,4 @@ set(SRCS Src/BreakpointDlg.cpp
Src/RegisterWindow.cpp)
add_library(debwx STATIC ${SRCS})
target_link_libraries(debwx common debugger_ui_util)
target_link_libraries(debwx common core debugger_ui_util)

View File

@ -139,6 +139,7 @@ CCodeWindow::CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter
, m_BreakpointWindow(NULL)
, m_MemoryWindow(NULL)
, m_JitWindow(NULL)
, m_SoundWindow(NULL)
, m_VideoWindow(NULL)
, codeview(NULL)
{

View File

@ -37,6 +37,7 @@ class CBreakPointWindow;
class CMemoryWindow;
class CJitWindow;
class CCodeView;
class DSPDebuggerLLE;
class GFXDebuggerPanel;
class CCodeWindow
@ -107,6 +108,7 @@ class CCodeWindow
CBreakPointWindow* m_BreakpointWindow;
CMemoryWindow* m_MemoryWindow;
CJitWindow* m_JitWindow;
DSPDebuggerLLE* m_SoundWindow;
GFXDebuggerPanel* m_VideoWindow;
// Settings

View File

@ -38,6 +38,7 @@
#include "MemoryWindow.h"
#include "JitWindow.h"
#include "DebuggerPanel.h"
#include "DSPDebugWindow.h"
#include "FileUtil.h"
#include "CodeWindow.h"
@ -516,7 +517,6 @@ 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)
{
@ -531,7 +531,6 @@ void CCodeWindow::ToggleSoundWindow(bool bShow)
Parent->DoRemovePage(m_SoundWindow, false);
m_SoundWindow = NULL;
}
#endif
}
void CCodeWindow::ToggleVideoWindow(bool bShow)

View File

@ -39,11 +39,13 @@ BEGIN_EVENT_TABLE(DSPDebuggerLLE, wxPanel)
END_EVENT_TABLE()
DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent)
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(700, 800),
DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent, wxWindowID id)
: wxPanel(parent, id, wxDefaultPosition, wxDefaultSize,
wxTAB_TRAVERSAL, _("DSP LLE Debugger"))
, m_CachedStepCounter(-1)
{
m_DebuggerFrame = this;
// notify wxAUI which frame to use
m_mgr.SetManagedWindow(this);

View File

@ -47,7 +47,7 @@ class CMemoryView;
class DSPDebuggerLLE : public wxPanel
{
public:
DSPDebuggerLLE(wxWindow *parent);
DSPDebuggerLLE(wxWindow *parent, wxWindowID id = wxID_ANY);
virtual ~DSPDebuggerLLE();
void Refresh();
@ -86,15 +86,15 @@ private:
void OnClose(wxCloseEvent& event);
void OnChangeState(wxCommandEvent& event);
void OnRightClick(wxListEvent& event);
void OnDoubleClick(wxListEvent& event);
//void OnRightClick(wxListEvent& event);
//void OnDoubleClick(wxListEvent& event);
void OnAddrBoxChange(wxCommandEvent& event);
void OnSymbolListChange(wxCommandEvent& event);
bool JumpToAddress(u16 addr);
void FocusOnPC();
void UnselectAll();
//void UnselectAll();
};
extern DSPDebuggerLLE* m_DebuggerFrame;