From b7e5fb6ef2f944a2923049f77860988c89ae9216 Mon Sep 17 00:00:00 2001 From: hrydgard Date: Sat, 20 Jun 2009 20:21:35 +0000 Subject: [PATCH] submitting just because I want to move these files git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3515 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DebuggerWX/Src/CodeView.cpp | 1 + Source/Core/DebuggerWX/Src/CodeView.h | 94 ++++++++++++------------- 2 files changed, 47 insertions(+), 48 deletions(-) diff --git a/Source/Core/DebuggerWX/Src/CodeView.cpp b/Source/Core/DebuggerWX/Src/CodeView.cpp index bcd953102d..07aee49901 100644 --- a/Source/Core/DebuggerWX/Src/CodeView.cpp +++ b/Source/Core/DebuggerWX/Src/CodeView.cpp @@ -21,6 +21,7 @@ #include "HW/Memmap.h" // for Write_U32 #include "Common.h" #include "StringUtil.h" +#include "Debugger/DebugInterface.h" #include "Host.h" #include "CodeView.h" diff --git a/Source/Core/DebuggerWX/Src/CodeView.h b/Source/Core/DebuggerWX/Src/CodeView.h index dc0b563fc1..d6692431e7 100644 --- a/Source/Core/DebuggerWX/Src/CodeView.h +++ b/Source/Core/DebuggerWX/Src/CodeView.h @@ -20,71 +20,69 @@ #include "Debugger.h" #include "Common.h" -#include "Debugger/DebugInterface.h" #include DECLARE_EVENT_TYPE(wxEVT_CODEVIEW_CHANGE, -1); -class CCodeView - : public wxControl +class DebugInterface; + +class CCodeView : public wxControl { - public: - CCodeView(DebugInterface* debuginterface, wxWindow* parent, wxWindowID Id = -1, const wxSize& Size = wxDefaultSize); - wxSize DoGetBestSize() const; - void OnPaint(wxPaintEvent& event); - void OnErase(wxEraseEvent& event); - void OnMouseDown(wxMouseEvent& event); - void OnMouseMove(wxMouseEvent& event); - void OnMouseUpL(wxMouseEvent& event); - void OnMouseUpR(wxMouseEvent& event); - void OnPopupMenu(wxCommandEvent& event); - void InsertBlrNop(int); +public: + CCodeView(DebugInterface* debuginterface, wxWindow* parent, wxWindowID Id = -1, const wxSize& Size = wxDefaultSize); + wxSize DoGetBestSize() const; + void OnPaint(wxPaintEvent& event); + void OnErase(wxEraseEvent& event); + void OnMouseDown(wxMouseEvent& event); + void OnMouseMove(wxMouseEvent& event); + void OnMouseUpL(wxMouseEvent& event); + void OnMouseUpR(wxMouseEvent& event); + void OnPopupMenu(wxCommandEvent& event); + void InsertBlrNop(int); - u32 GetSelection() {return(selection);} + u32 GetSelection() {return(selection);} - struct BlrStruct // for IDM_INSERTBLR - { - u32 Address; - u32 OldValue; - }; - std::vector BlrList; + struct BlrStruct // for IDM_INSERTBLR + { + u32 Address; + u32 OldValue; + }; + std::vector BlrList; - void Center(u32 addr) - { - curAddress = addr; - selection = addr; - redraw(); - } + void Center(u32 addr) + { + curAddress = addr; + selection = addr; + redraw(); + } - private: +private: + void RaiseEvent(); + int YToAddress(int y); - void RaiseEvent(); - int YToAddress(int y); + u32 AddrToBranch(u32 addr); - u32 AddrToBranch(u32 addr); + void redraw() {Refresh();} - void redraw() {Refresh();} + DebugInterface* debugger; + int curAddress; + int align; + int rowHeight; - DebugInterface* debugger; + u32 selection; + u32 oldSelection; + bool selectionChanged; + bool selecting; + bool hasFocus; + bool showHex; - int curAddress; - int align; - int rowHeight; + int lx, ly; + void _MoveTo(int x, int y) {lx = x; ly = y;} + void _LineTo(wxPaintDC &dc, int x, int y); - u32 selection; - u32 oldSelection; - bool selectionChanged; - bool selecting; - bool hasFocus; - bool showHex; - - int lx, ly; - void _MoveTo(int x, int y) {lx = x; ly = y;} - void _LineTo(wxPaintDC &dc, int x, int y); - - DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; #endif /*CODEVIEW_H_*/