ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MemoryWindow: Replace Search with FindNext

This commit is contained in:
Sepalani 2017-04-18 19:08:44 +01:00
parent d1dc9d5a0c
commit 5123dc2651
2 changed files with 11 additions and 5 deletions
Source/Core/DolphinWX/Debugger
MemoryWindow.cppMemoryWindow.h

13
Source/Core/DolphinWX/Debugger/MemoryWindow.cpp
View File

@ -48,7 +48,7 @@ enum
IDM_DUMP_FAKEVMEM, IDM_DUMP_FAKEVMEM,
IDM_VALBOX, IDM_VALBOX,
IDM_DATA_TYPE_RBOX, IDM_DATA_TYPE_RBOX,
IDM_SEARCH, IDM_FIND_NEXT,
IDM_ASCII, IDM_ASCII,
IDM_HEX, IDM_HEX,
IDM_MEMCHECK_OPTIONS_CHANGE IDM_MEMCHECK_OPTIONS_CHANGE
@ -60,7 +60,7 @@ EVT_BUTTON(IDM_DUMP_MEMORY, CMemoryWindow::OnDumpMemory)
EVT_BUTTON(IDM_DUMP_MEM2, CMemoryWindow::OnDumpMem2) EVT_BUTTON(IDM_DUMP_MEM2, CMemoryWindow::OnDumpMem2)
EVT_BUTTON(IDM_DUMP_FAKEVMEM, CMemoryWindow::OnDumpFakeVMEM) EVT_BUTTON(IDM_DUMP_FAKEVMEM, CMemoryWindow::OnDumpFakeVMEM)
EVT_RADIOBOX(IDM_DATA_TYPE_RBOX, CMemoryWindow::OnDataTypeChanged) EVT_RADIOBOX(IDM_DATA_TYPE_RBOX, CMemoryWindow::OnDataTypeChanged)
EVT_BUTTON(IDM_SEARCH, CMemoryWindow::OnSearch) EVT_BUTTON(IDM_FIND_NEXT, CMemoryWindow::OnFindNext)
EVT_RADIOBUTTON(IDM_MEMCHECK_OPTIONS_CHANGE, CMemoryWindow::OnMemCheckOptionChange) EVT_RADIOBUTTON(IDM_MEMCHECK_OPTIONS_CHANGE, CMemoryWindow::OnMemCheckOptionChange)
EVT_CHECKBOX(IDM_MEMCHECK_OPTIONS_CHANGE, CMemoryWindow::OnMemCheckOptionChange) EVT_CHECKBOX(IDM_MEMCHECK_OPTIONS_CHANGE, CMemoryWindow::OnMemCheckOptionChange)
END_EVENT_TABLE() END_EVENT_TABLE()
@ -98,7 +98,7 @@ CMemoryWindow::CMemoryWindow(wxWindow* parent, wxWindowID id, const wxPoint& pos
dump_sizer->Add(new wxButton(this, IDM_DUMP_FAKEVMEM, _("Dump FakeVMEM")), 0, wxEXPAND); dump_sizer->Add(new wxButton(this, IDM_DUMP_FAKEVMEM, _("Dump FakeVMEM")), 0, wxEXPAND);
wxStaticBoxSizer* const sizerSearchType = new wxStaticBoxSizer(wxVERTICAL, this, _("Search")); wxStaticBoxSizer* const sizerSearchType = new wxStaticBoxSizer(wxVERTICAL, this, _("Search"));
sizerSearchType->Add(btnSearch = new wxButton(this, IDM_SEARCH, _("Search"))); sizerSearchType->Add(btnSearch = new wxButton(this, IDM_FIND_NEXT, _("Find Next")));
sizerSearchType->Add(m_rb_ascii = new wxRadioButton(this, IDM_ASCII, "Ascii", wxDefaultPosition, sizerSearchType->Add(m_rb_ascii = new wxRadioButton(this, IDM_ASCII, "Ascii", wxDefaultPosition,
wxDefaultSize, wxRB_GROUP)); wxDefaultSize, wxRB_GROUP));
sizerSearchType->Add(m_rb_hex = new wxRadioButton(this, IDM_HEX, _("Hex"))); sizerSearchType->Add(m_rb_hex = new wxRadioButton(this, IDM_HEX, _("Hex")));
@ -267,9 +267,14 @@ void CMemoryWindow::OnDataTypeChanged(wxCommandEvent& ev)
} }
} }
void CMemoryWindow::OnSearch(wxCommandEvent& event) void CMemoryWindow::OnFindNext(wxCommandEvent& event)
{ {
wxBusyCursor hourglass_cursor; wxBusyCursor hourglass_cursor;
Search(true);
}
void CMemoryWindow::Search(bool find_next)
{
u8* ram_ptr = nullptr; u8* ram_ptr = nullptr;
u32 ram_size = 0; u32 ram_size = 0;
// NOTE: We're assuming the base address is zero. // NOTE: We're assuming the base address is zero.

3
Source/Core/DolphinWX/Debugger/MemoryWindow.h
View File

@ -35,7 +35,8 @@ private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
void OnDataTypeChanged(wxCommandEvent& event); void OnDataTypeChanged(wxCommandEvent& event);
void OnSearch(wxCommandEvent& event); void OnFindNext(wxCommandEvent& event);
void Search(bool find_next = true);
void OnAddrBoxChange(wxCommandEvent& event); void OnAddrBoxChange(wxCommandEvent& event);
void OnValueChanged(wxCommandEvent&); void OnValueChanged(wxCommandEvent&);
void SetMemoryValueFromValBox(wxCommandEvent& event); void SetMemoryValueFromValBox(wxCommandEvent& event);