From c593bd226c9d00010e572be8a80a116746d9c772 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 16 Aug 2015 18:22:09 -0400 Subject: [PATCH 1/2] Frame: Remove an unused enum and array --- Source/Core/DolphinWX/Frame.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index cd9284a134..9b1374fec0 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -186,14 +186,6 @@ private: EToolbar_Max }; - enum - { - Toolbar_Delete, - Toolbar_Add_BP, - Toolbar_Add_MC, - Num_Bitmaps - }; - enum { ADD_PANE_TOP, @@ -206,7 +198,6 @@ private: wxTimer m_poll_hotkey_timer; wxBitmap m_Bitmaps[EToolbar_Max]; - wxBitmap m_BitmapsMenu[EToolbar_Max]; wxMenuBar* m_menubar_shadow; From a824f6a74c9dfb968f35951a1476540103c79a34 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 16 Aug 2015 18:28:31 -0400 Subject: [PATCH 2/2] Debugger: Remove unused instance variables --- Source/Core/DolphinWX/Debugger/JitWindow.h | 4 ---- Source/Core/DolphinWX/Debugger/MemoryWindow.h | 1 - 2 files changed, 5 deletions(-) diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.h b/Source/Core/DolphinWX/Debugger/JitWindow.h index 617d984ccc..ad7bbe666d 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.h +++ b/Source/Core/DolphinWX/Debugger/JitWindow.h @@ -5,7 +5,6 @@ #pragma once #include -#include #include #include @@ -19,14 +18,12 @@ class wxTextCtrl; class JitBlockList : public wxListCtrl { - std::vector block_ranking; public: JitBlockList(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style); void Init(); void Update() override; }; - class CJitWindow : public wxPanel { public: @@ -49,7 +46,6 @@ private: wxButton* button_refresh; wxTextCtrl* ppc_box; wxTextCtrl* x86_box; - wxListBox* top_instructions; void OnSymbolListChange(wxCommandEvent& event); void OnCallstackListChange(wxCommandEvent& event); diff --git a/Source/Core/DolphinWX/Debugger/MemoryWindow.h b/Source/Core/DolphinWX/Debugger/MemoryWindow.h index 177cbb0bae..b5cc8d7f4f 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryWindow.h +++ b/Source/Core/DolphinWX/Debugger/MemoryWindow.h @@ -61,7 +61,6 @@ private: CMemoryView* memview; wxListBox* symbols; - wxButton* buttonGo; wxTextCtrl* addrbox; wxTextCtrl* valbox; };