From 5d7cd29a8bf0f50003f76319f8cb97e45de8187f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 10 Apr 2015 19:49:09 -0400 Subject: [PATCH] ISOProperties: Remove unnecessary/unused variables & controls. --- Source/Core/DolphinWX/ISOProperties.cpp | 4 ++-- Source/Core/DolphinWX/ISOProperties.h | 14 ++------------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index 06197d044a..a515b9dbb2 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -479,7 +479,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) // Patches wxBoxSizer* const sPatches = new wxBoxSizer(wxVERTICAL); - Patches = new wxCheckListBox(m_PatchPage, ID_PATCHES_LIST, wxDefaultPosition, wxDefaultSize, arrayStringFor_Patches, wxLB_HSCROLL); + Patches = new wxCheckListBox(m_PatchPage, ID_PATCHES_LIST, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_HSCROLL); wxBoxSizer* const sPatchButtons = new wxBoxSizer(wxHORIZONTAL); EditPatch = new wxButton(m_PatchPage, ID_EDITPATCH, _("Edit...")); wxButton* const AddPatch = new wxButton(m_PatchPage, ID_ADDPATCH, _("Add...")); @@ -500,7 +500,7 @@ void CISOProperties::CreateGUIControls(bool IsWad) // Action Replay Cheats wxBoxSizer * const sCheats = new wxBoxSizer(wxVERTICAL); - Cheats = new wxCheckListBox(m_CheatPage, ID_CHEATS_LIST, wxDefaultPosition, wxDefaultSize, arrayStringFor_Cheats, wxLB_HSCROLL); + Cheats = new wxCheckListBox(m_CheatPage, ID_CHEATS_LIST, wxDefaultPosition, wxDefaultSize, 0, nullptr, wxLB_HSCROLL); wxBoxSizer * const sCheatButtons = new wxBoxSizer(wxHORIZONTAL); EditCheat = new wxButton(m_CheatPage, ID_EDITCHEAT, _("Edit...")); wxButton * const AddCheat = new wxButton(m_CheatPage, ID_ADDCHEAT, _("Add...")); diff --git a/Source/Core/DolphinWX/ISOProperties.h b/Source/Core/DolphinWX/ISOProperties.h index 46b31fe12c..d478ffef76 100644 --- a/Source/Core/DolphinWX/ISOProperties.h +++ b/Source/Core/DolphinWX/ISOProperties.h @@ -40,8 +40,6 @@ class wxWindow; namespace DiscIO { struct SFileInfo; } namespace Gecko { class CodeConfigPanel; } -extern std::vector arCodes; - struct WiiPartition { DiscIO::IVolume *Partition; @@ -56,7 +54,6 @@ struct PHackData std::string PHZNear; std::string PHZFar; }; -extern PHackData PHack_Data; class CISOProperties : public wxDialog { @@ -75,8 +72,6 @@ public: void ActionReplayList_Load(); bool SaveGameConfig(); - PHackData PHack_Data; - private: DECLARE_EVENT_TABLE(); @@ -106,19 +101,14 @@ private: wxArrayString arrayStringFor_EmuState; wxChoice* EmuState; wxTextCtrl* EmuIssues; - wxArrayString arrayStringFor_Patches; + wxCheckListBox* Patches; wxButton* EditPatch; wxButton* RemovePatch; - wxArrayString arrayStringFor_Cheats; + wxCheckListBox* Cheats; wxButton* EditCheat; wxButton* RemoveCheat; - wxArrayString arrayStringFor_Speedhacks; - wxCheckListBox* Speedhacks; - wxButton* EditSpeedhack; - wxButton* AddSpeedhack; - wxButton* RemoveSpeedhack; wxTextCtrl* m_Name; wxTextCtrl* m_GameID;