Update the breakpoint list after an add from the parent
Doing it from the add dialogs instead would prevent the call to these dialogs outside of a breakpointWindow which would be necessary for hotkeys binding.
This commit is contained in:
parent
a447213420
commit
00e03f1436
|
@ -16,8 +16,7 @@
|
||||||
#include "DolphinWX/Debugger/BreakpointWindow.h"
|
#include "DolphinWX/Debugger/BreakpointWindow.h"
|
||||||
#include "DolphinWX/WxUtils.h"
|
#include "DolphinWX/WxUtils.h"
|
||||||
|
|
||||||
BreakPointDlg::BreakPointDlg(CBreakPointWindow* _Parent)
|
BreakPointDlg::BreakPointDlg(wxWindow* _Parent) : wxDialog(_Parent, wxID_ANY, _("Add Breakpoint"))
|
||||||
: wxDialog(_Parent, wxID_ANY, _("Add Breakpoint")), Parent(_Parent)
|
|
||||||
{
|
{
|
||||||
Bind(wxEVT_BUTTON, &BreakPointDlg::OnOK, this, wxID_OK);
|
Bind(wxEVT_BUTTON, &BreakPointDlg::OnOK, this, wxID_OK);
|
||||||
|
|
||||||
|
@ -42,8 +41,7 @@ void BreakPointDlg::OnOK(wxCommandEvent& event)
|
||||||
if (AsciiToHex(WxStrToStr(AddressString), Address))
|
if (AsciiToHex(WxStrToStr(AddressString), Address))
|
||||||
{
|
{
|
||||||
PowerPC::breakpoints.Add(Address);
|
PowerPC::breakpoints.Add(Address);
|
||||||
Parent->NotifyUpdate();
|
EndModal(wxID_OK);
|
||||||
Close();
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -6,16 +6,14 @@
|
||||||
|
|
||||||
#include <wx/dialog.h>
|
#include <wx/dialog.h>
|
||||||
|
|
||||||
class CBreakPointWindow;
|
|
||||||
class wxTextCtrl;
|
class wxTextCtrl;
|
||||||
|
|
||||||
class BreakPointDlg : public wxDialog
|
class BreakPointDlg : public wxDialog
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
BreakPointDlg(CBreakPointWindow* _Parent);
|
BreakPointDlg(wxWindow* _Parent);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
CBreakPointWindow* Parent;
|
|
||||||
wxTextCtrl* m_pEditAddress;
|
wxTextCtrl* m_pEditAddress;
|
||||||
|
|
||||||
void OnOK(wxCommandEvent& event);
|
void OnOK(wxCommandEvent& event);
|
||||||
|
|
|
@ -146,13 +146,19 @@ void CBreakPointWindow::OnClear(wxCommandEvent& WXUNUSED(event))
|
||||||
void CBreakPointWindow::OnAddBreakPoint(wxCommandEvent& WXUNUSED(event))
|
void CBreakPointWindow::OnAddBreakPoint(wxCommandEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
BreakPointDlg bpDlg(this);
|
BreakPointDlg bpDlg(this);
|
||||||
bpDlg.ShowModal();
|
if (bpDlg.ShowModal() == wxID_OK)
|
||||||
|
{
|
||||||
|
NotifyUpdate();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CBreakPointWindow::OnAddMemoryCheck(wxCommandEvent& WXUNUSED(event))
|
void CBreakPointWindow::OnAddMemoryCheck(wxCommandEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
MemoryCheckDlg memDlg(this);
|
MemoryCheckDlg memDlg(this);
|
||||||
memDlg.ShowModal();
|
if (memDlg.ShowModal() == wxID_OK)
|
||||||
|
{
|
||||||
|
NotifyUpdate();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CBreakPointWindow::Event_SaveAll(wxCommandEvent& WXUNUSED(event))
|
void CBreakPointWindow::Event_SaveAll(wxCommandEvent& WXUNUSED(event))
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
#include "DolphinWX/Debugger/MemoryCheckDlg.h"
|
#include "DolphinWX/Debugger/MemoryCheckDlg.h"
|
||||||
#include "DolphinWX/WxUtils.h"
|
#include "DolphinWX/WxUtils.h"
|
||||||
|
|
||||||
MemoryCheckDlg::MemoryCheckDlg(CBreakPointWindow* parent)
|
MemoryCheckDlg::MemoryCheckDlg(wxWindow* parent)
|
||||||
: wxDialog(parent, wxID_ANY, _("Add a Memory Breakpoint")), m_parent(parent)
|
: wxDialog(parent, wxID_ANY, _("Add a Memory Breakpoint"))
|
||||||
{
|
{
|
||||||
Bind(wxEVT_BUTTON, &MemoryCheckDlg::OnOK, this, wxID_OK);
|
Bind(wxEVT_BUTTON, &MemoryCheckDlg::OnOK, this, wxID_OK);
|
||||||
Bind(wxEVT_RADIOBUTTON, &MemoryCheckDlg::OnRadioButtonClick, this);
|
Bind(wxEVT_RADIOBUTTON, &MemoryCheckDlg::OnRadioButtonClick, this);
|
||||||
|
@ -165,8 +165,7 @@ void MemoryCheckDlg::OnOK(wxCommandEvent& event)
|
||||||
MemCheck.Break = Break;
|
MemCheck.Break = Break;
|
||||||
|
|
||||||
PowerPC::memchecks.Add(MemCheck);
|
PowerPC::memchecks.Add(MemCheck);
|
||||||
m_parent->NotifyUpdate();
|
EndModal(wxID_OK);
|
||||||
Close();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
event.Skip();
|
event.Skip();
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
|
|
||||||
#include <wx/dialog.h>
|
#include <wx/dialog.h>
|
||||||
|
|
||||||
class CBreakPointWindow;
|
|
||||||
class wxRadioButton;
|
class wxRadioButton;
|
||||||
class wxStaticText;
|
class wxStaticText;
|
||||||
class wxTextCtrl;
|
class wxTextCtrl;
|
||||||
|
@ -14,10 +13,9 @@ class wxTextCtrl;
|
||||||
class MemoryCheckDlg : public wxDialog
|
class MemoryCheckDlg : public wxDialog
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
MemoryCheckDlg(CBreakPointWindow* parent);
|
MemoryCheckDlg(wxWindow* parent);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
CBreakPointWindow* m_parent;
|
|
||||||
wxStaticText* m_textAddress;
|
wxStaticText* m_textAddress;
|
||||||
wxStaticText* m_textStartAddress;
|
wxStaticText* m_textStartAddress;
|
||||||
wxStaticText* m_textEndAddress;
|
wxStaticText* m_textEndAddress;
|
||||||
|
|
Loading…
Reference in New Issue