piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

GUI: make some elements such as memory jit and breakpoint windows into

Browse Source 
wxpanels. It should now work in linux as well. I had to remove the bar 
off the breakpoint panel though, so we need to decide what to do with 
it.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4227 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2009-09-07 20:51:02 +00:00
parent 24d68da653
commit 5a99432f1b
8 changed files with 29 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Core/DebuggerWX/Src/BreakpointWindow.cpp
View File

@ -33,7 +33,7 @@ extern "C" {
#include "../resources/toolbar_delete.c"
}
BEGIN_EVENT_TABLE(CBreakPointWindow, wxFrame)
BEGIN_EVENT_TABLE(CBreakPointWindow, wxPanel)
EVT_CLOSE(CBreakPointWindow::OnClose)
EVT_MENU(IDM_DELETE, CBreakPointWindow::OnDelete)
EVT_MENU(IDM_CLEAR, CBreakPointWindow::OnClear)
@ -45,7 +45,7 @@ BEGIN_EVENT_TABLE(CBreakPointWindow, wxFrame)
END_EVENT_TABLE()
CBreakPointWindow::CBreakPointWindow(CCodeWindow* _pCodeWindow, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
: wxFrame(parent, id, title, position, size, style)
: wxPanel(parent, id, position, size, style, title)
, m_BreakPointListView(NULL)
, m_pCodeWindow(_pCodeWindow)
{
@ -78,8 +78,8 @@ void CBreakPointWindow::Load(IniFile& _IniFile)
void CBreakPointWindow::CreateGUIControls()
{
SetTitle(wxT("Breakpoints"));
SetIcon(wxNullIcon);
// SetTitle(wxT("Breakpoints"));
// SetIcon(wxNullIcon);
SetSize(8, 8, 400, 370);
Center();
@ -117,18 +117,19 @@ void CBreakPointWindow::PopulateToolbar(wxToolBar* toolBar)
void CBreakPointWindow::RecreateToolbar()
{
// FIXME: what do we do with this?
// delete and recreate the toolbar
wxToolBarBase* toolBar = GetToolBar();
long style = toolBar ? toolBar->GetWindowStyle() : wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT;
// wxToolBarBase* toolBar = GetToolBar();
// long style = toolBar ? toolBar->GetWindowStyle() : wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT;
delete toolBar;
SetToolBar(NULL);
// delete toolBar;
// SetToolBar(NULL);
style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_BOTTOM | wxTB_RIGHT | wxTB_HORZ_LAYOUT | wxTB_TOP);
wxToolBar* theToolBar = CreateToolBar(style, ID_TOOLBAR);
// style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_BOTTOM | wxTB_RIGHT | wxTB_HORZ_LAYOUT | wxTB_TOP);
// wxToolBar* theToolBar = CreateToolBar(style, ID_TOOLBAR);
PopulateToolbar(theToolBar);
SetToolBar(theToolBar);
// PopulateToolbar(theToolBar);
// SetToolBar(theToolBar);
}
void CBreakPointWindow::InitBitmaps()