From c71f76834ed7dfa22478b2f90ddcd752ac856ac2 Mon Sep 17 00:00:00 2001 From: "sl1nk3.s" Date: Tue, 15 Sep 2009 21:35:32 +0000 Subject: GUI : Added possibility to move the logwindow around in non-debugger mode, fix toolbar size issue, fix changing themes (again...) and added abort button to extract all as well as misc changes. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4281 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DebuggerWX/Src/BreakpointWindow.cpp | 19 ----------- Source/Core/DebuggerWX/Src/BreakpointWindow.h | 6 ---- Source/Core/DebuggerWX/Src/CodeWindow.cpp | 3 -- Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp | 37 ++++++++-------------- Source/Core/DebuggerWX/Src/JitWindow.cpp | 19 ----------- Source/Core/DebuggerWX/Src/JitWindow.h | 3 -- Source/Core/DebuggerWX/Src/RegisterWindow.cpp | 17 ---------- Source/Core/DebuggerWX/Src/RegisterWindow.h | 3 -- 8 files changed, 13 insertions(+), 94 deletions(-) (limited to 'Source/Core/DebuggerWX') diff --git a/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp b/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp index dee778c789..228bc60568 100644 --- a/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp +++ b/Source/Core/DebuggerWX/Src/BreakpointWindow.cpp @@ -56,25 +56,6 @@ CBreakPointWindow::CBreakPointWindow(CCodeWindow* _pCodeWindow, wxWindow* parent // Create the toolbar RecreateToolbar(); } -CBreakPointWindow::~CBreakPointWindow() -{} - -void CBreakPointWindow::Save(IniFile& _IniFile) const -{ - _IniFile.Set("BreakPoint", "x", GetPosition().x); - _IniFile.Set("BreakPoint", "y", GetPosition().y); - _IniFile.Set("BreakPoint", "w", GetSize().GetWidth()); - _IniFile.Set("BreakPoint", "h", GetSize().GetHeight()); -} -void CBreakPointWindow::Load(IniFile& _IniFile) -{ - int x,y,w,h; - _IniFile.Get("BreakPoint", "x", &x, GetPosition().x); - _IniFile.Get("BreakPoint", "y", &y, GetPosition().y); - _IniFile.Get("BreakPoint", "w", &w, GetSize().GetWidth()); - _IniFile.Get("BreakPoint", "h", &h, GetSize().GetHeight()); - SetSize(x, y, w, h); -} void CBreakPointWindow::CreateGUIControls() { diff --git a/Source/Core/DebuggerWX/Src/BreakpointWindow.h b/Source/Core/DebuggerWX/Src/BreakpointWindow.h index bb2909aa1c..1c8c444d2e 100644 --- a/Source/Core/DebuggerWX/Src/BreakpointWindow.h +++ b/Source/Core/DebuggerWX/Src/BreakpointWindow.h @@ -36,13 +36,7 @@ class CBreakPointWindow const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(400, 250), long style = wxNO_BORDER); - virtual ~CBreakPointWindow(); - void NotifyUpdate(); - - void Save(IniFile& _IniFile) const; - void Load(IniFile& _IniFile); - private: diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp index 98e9d0b2f1..3edba8bf75 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp @@ -489,9 +489,6 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam jitsroff = pCoreMenu->Append(IDM_JITSROFF, _T("&JIT SystemRegisters off"), wxEmptyString, wxITEM_CHECK); #endif -// wxMenuItem* dualcore = pDebugMenu->Append(IDM_DUALCORE, _T("&DualCore"), wxEmptyString, wxITEM_CHECK); -// dualcore->Check(_LocalCoreStartupParameter.bUseDualCore); - pMenuBar->Append(pCoreMenu, _T("&JIT")); CreateMenuSymbols(); diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp index b119c001fd..e601cc9675 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp @@ -162,32 +162,21 @@ void CCodeWindow::Save() ini.Set(_Section.c_str(), "Sound", iSoundWindow); ini.Set(_Section.c_str(), "Video", iVideoWindow); // Save floating setting - ini.Set("Float", "Log", (bool)FindWindowById(IDM_LOGWINDOW_PARENT)); - ini.Set("Float", "Console", (bool)FindWindowById(IDM_CONSOLEWINDOW_PARENT)); - ini.Set("Float", "Code", (bool)FindWindowById(IDM_CODEWINDOW_PARENT)); - ini.Set("Float", "Registers", (bool)FindWindowById(IDM_REGISTERWINDOW_PARENT)); - ini.Set("Float", "Breakpoints", (bool)FindWindowById(IDM_BREAKPOINTWINDOW_PARENT)); - ini.Set("Float", "Memory", (bool)FindWindowById(IDM_MEMORYWINDOW_PARENT)); - ini.Set("Float", "JIT", (bool)FindWindowById(IDM_JITWINDOW_PARENT)); - ini.Set("Float", "Sound", (bool)FindWindowById(IDM_SOUNDWINDOW_PARENT)); - ini.Set("Float", "Video", (bool)FindWindowById(IDM_VIDEOWINDOW_PARENT)); + ini.Set("Float", "Log", !!FindWindowById(IDM_LOGWINDOW_PARENT)); + ini.Set("Float", "Console", !!FindWindowById(IDM_CONSOLEWINDOW_PARENT)); + ini.Set("Float", "Code", !!FindWindowById(IDM_CODEWINDOW_PARENT)); + ini.Set("Float", "Registers", !!FindWindowById(IDM_REGISTERWINDOW_PARENT)); + ini.Set("Float", "Breakpoints", !!FindWindowById(IDM_BREAKPOINTWINDOW_PARENT)); + ini.Set("Float", "Memory", !!FindWindowById(IDM_MEMORYWINDOW_PARENT)); + ini.Set("Float", "JIT", !!FindWindowById(IDM_JITWINDOW_PARENT)); + ini.Set("Float", "Sound", !!FindWindowById(IDM_SOUNDWINDOW_PARENT)); + ini.Set("Float", "Video", !!FindWindowById(IDM_VIDEOWINDOW_PARENT)); // Save window settings - /* - ini.Set("CodeWindow", "x", GetPosition().x); - ini.Set("CodeWindow", "y", GetPosition().y); - ini.Set("CodeWindow", "w", GetSize().GetWidth()); - ini.Set("CodeWindow", "h", GetSize().GetHeight()); - ini.Set("MainWindow", "x", GetParent()->GetPosition().x); - ini.Set("MainWindow", "y", GetParent()->GetPosition().y); - ini.Set("MainWindow", "w", GetParent()->GetSize().GetWidth()); - ini.Set("MainWindow", "h", GetParent()->GetSize().GetHeight()); - - if (m_BreakpointWindow) m_BreakpointWindow->Save(file); - if (m_RegisterWindow) m_RegisterWindow->Save(file); - if (m_MemoryWindow) m_MemoryWindow->Save(file); - if (m_JitWindow) m_JitWindow->Save(file); - */ + ini.Set("MainWindow", "x", Parent->GetPosition().x); + ini.Set("MainWindow", "y", Parent->GetPosition().y); + ini.Set("MainWindow", "w", Parent->GetSize().GetWidth()); + ini.Set("MainWindow", "h", Parent->GetSize().GetHeight()); ini.Save(DEBUGGER_CONFIG_FILE); } diff --git a/Source/Core/DebuggerWX/Src/JitWindow.cpp b/Source/Core/DebuggerWX/Src/JitWindow.cpp index a0b489b7fd..c3543140e4 100644 --- a/Source/Core/DebuggerWX/Src/JitWindow.cpp +++ b/Source/Core/DebuggerWX/Src/JitWindow.cpp @@ -104,25 +104,6 @@ CJitWindow::~CJitWindow() } -void CJitWindow::Save(IniFile& _IniFile) const -{ - _IniFile.Set("JitWindow", "x", GetPosition().x); - _IniFile.Set("JitWindow", "y", GetPosition().y); - _IniFile.Set("JitWindow", "w", GetSize().GetWidth()); - _IniFile.Set("JitWindow", "h", GetSize().GetHeight()); -} - - -void CJitWindow::Load(IniFile& _IniFile) -{ - int x,y,w,h; - _IniFile.Get("JitWindow", "x", &x, GetPosition().x); - _IniFile.Get("JitWindow", "y", &y, GetPosition().y); - _IniFile.Get("JitWindow", "w", &w, GetSize().GetWidth()); - _IniFile.Get("JitWindow", "h", &h, GetSize().GetHeight()); - SetSize(x, y, w, h); -} - void CJitWindow::OnRefresh(wxCommandEvent& /*event*/) { block_list->Update(); } diff --git a/Source/Core/DebuggerWX/Src/JitWindow.h b/Source/Core/DebuggerWX/Src/JitWindow.h index 6f898ae480..8320f800e4 100644 --- a/Source/Core/DebuggerWX/Src/JitWindow.h +++ b/Source/Core/DebuggerWX/Src/JitWindow.h @@ -52,9 +52,6 @@ public: long style = wxNO_BORDER); ~CJitWindow(); - void Save(IniFile& _IniFile) const; - void Load(IniFile& _IniFile); - static void ViewAddr(u32 em_address); void Update(); diff --git a/Source/Core/DebuggerWX/Src/RegisterWindow.cpp b/Source/Core/DebuggerWX/Src/RegisterWindow.cpp index fdebddf8a1..0771929f26 100644 --- a/Source/Core/DebuggerWX/Src/RegisterWindow.cpp +++ b/Source/Core/DebuggerWX/Src/RegisterWindow.cpp @@ -38,23 +38,6 @@ CRegisterWindow::~CRegisterWindow() { } -void CRegisterWindow::Save(IniFile& _IniFile) const -{ - _IniFile.Set("RegisterWindow", "x", GetPosition().x); - _IniFile.Set("RegisterWindow", "y", GetPosition().y); - _IniFile.Set("RegisterWindow", "w", GetSize().GetWidth()); - _IniFile.Set("RegisterWindow", "h", GetSize().GetHeight()); -} - -void CRegisterWindow::Load(IniFile& _IniFile) -{ - int x,y,w,h; - _IniFile.Get("RegisterWindow", "x", &x, GetPosition().x); - _IniFile.Get("RegisterWindow", "y", &y, GetPosition().y); - _IniFile.Get("RegisterWindow", "w", &w, GetSize().GetWidth()); - _IniFile.Get("RegisterWindow", "h", &h, GetSize().GetHeight()); - SetSize(x, y, w, h); -} void CRegisterWindow::CreateGUIControls() { diff --git a/Source/Core/DebuggerWX/Src/RegisterWindow.h b/Source/Core/DebuggerWX/Src/RegisterWindow.h index 3006a276dd..f1e6c6a8c3 100644 --- a/Source/Core/DebuggerWX/Src/RegisterWindow.h +++ b/Source/Core/DebuggerWX/Src/RegisterWindow.h @@ -35,9 +35,6 @@ public: virtual ~CRegisterWindow(); - void Save(IniFile& _IniFile) const; - void Load(IniFile& _IniFile); - void NotifyUpdate(); -- cgit v1.2.3