ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2288 from lioncash/unnecessary 

ISOProperties: Remove unnecessary/unused variables & controls.
This commit is contained in:
Lioncash 2015-04-14 10:42:29 -04:00
parent 882080c282 5d7cd29a8b
commit a6970b3744
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -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..."));

14
Source/Core/DolphinWX/ISOProperties.h
View File

@ -40,8 +40,6 @@ class wxWindow;
namespace DiscIO { struct SFileInfo; }
namespace Gecko { class CodeConfigPanel; }
extern std::vector<ActionReplay::ARCode> 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;