From 50f600c834b5202a5e7a38fe5d4a6b5ca3bce122 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 14 Feb 2015 16:00:15 -0500 Subject: [PATCH] DolphinWX: Change Enable(false) calls into Disable() where possible --- .../Core/DolphinWX/Cheats/GeckoCodeDiag.cpp | 2 +- Source/Core/DolphinWX/ConfigMain.cpp | 2 +- .../Core/DolphinWX/Debugger/DebuggerPanel.cpp | 28 +++++++++---------- Source/Core/DolphinWX/ISOProperties.cpp | 16 +++++------ .../DolphinWX/PostProcessingConfigDiag.cpp | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp index 0282b13d86..2c477bb389 100644 --- a/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp +++ b/Source/Core/DolphinWX/Cheats/GeckoCodeDiag.cpp @@ -63,7 +63,7 @@ CodeConfigPanel::CodeConfigPanel(wxWindow* const parent) // button sizer wxBoxSizer* const sizer_buttons = new wxBoxSizer(wxHORIZONTAL); btn_download = new wxButton(this, wxID_ANY, _("Download Codes (WiiRD Database)"), wxDefaultPosition, wxSize(128, -1)); - btn_download->Enable(false); + btn_download->Disable(); btn_download->Bind(wxEVT_BUTTON, &CodeConfigPanel::DownloadCodes, this); sizer_buttons->AddStretchSpacer(1); sizer_buttons->Add(btn_download, 1, wxEXPAND); diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index 989df3ba9f..8ad31e0675 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -753,7 +753,7 @@ void CConfigMain::CreateGUIControls() RecursiveISOPath = new wxCheckBox(PathsPage, ID_RECURSIVEISOPATH, _("Search Subfolders")); AddISOPath = new wxButton(PathsPage, ID_ADDISOPATH, _("Add...")); RemoveISOPath = new wxButton(PathsPage, ID_REMOVEISOPATH, _("Remove")); - RemoveISOPath->Enable(false); + RemoveISOPath->Disable(); DefaultISO = new wxFilePickerCtrl(PathsPage, ID_DEFAULTISO, wxEmptyString, _("Choose a default ISO:"), _("All GC/Wii files (elf, dol, gcm, iso, wbfs, ciso, gcz, wad)") + wxString::Format("|*.elf;*.dol;*.gcm;*.iso;*.wbfs;*.ciso;*.gcz;*.wad|%s", wxGetTranslation(wxALL_FILES)), diff --git a/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp b/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp index bf0744c7ff..0106839c09 100644 --- a/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp +++ b/Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp @@ -223,24 +223,24 @@ void GFXDebuggerPanel::CreateGUIControls() void GFXDebuggerPanel::OnPause() { - m_pButtonDump->Enable(true); - m_pDumpList->Enable(true); - m_pButtonUpdateScreen->Enable(true); - m_pButtonClearScreen->Enable(true); - m_pButtonClearTextureCache->Enable(true); - m_pButtonClearVertexShaderCache->Enable(true); - m_pButtonClearPixelShaderCache->Enable(true); + m_pButtonDump->Enable(); + m_pDumpList->Enable(); + m_pButtonUpdateScreen->Enable(); + m_pButtonClearScreen->Enable(); + m_pButtonClearTextureCache->Enable(); + m_pButtonClearVertexShaderCache->Enable(); + m_pButtonClearPixelShaderCache->Enable(); } void GFXDebuggerPanel::OnContinue() { - m_pButtonDump->Enable(false); - m_pDumpList->Enable(false); - m_pButtonUpdateScreen->Enable(false); - m_pButtonClearScreen->Enable(false); - m_pButtonClearTextureCache->Enable(false); - m_pButtonClearVertexShaderCache->Enable(false); - m_pButtonClearPixelShaderCache->Enable(false); + m_pButtonDump->Disable(); + m_pDumpList->Disable(); + m_pButtonUpdateScreen->Disable(); + m_pButtonClearScreen->Disable(); + m_pButtonClearTextureCache->Disable(); + m_pButtonClearVertexShaderCache->Disable(); + m_pButtonClearPixelShaderCache->Disable(); } diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index 1a775ea357..62d9ee409b 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -507,8 +507,8 @@ void CISOProperties::CreateGUIControls(bool IsWad) EditPatch = new wxButton(m_PatchPage, ID_EDITPATCH, _("Edit...")); wxButton* const AddPatch = new wxButton(m_PatchPage, ID_ADDPATCH, _("Add...")); RemovePatch = new wxButton(m_PatchPage, ID_REMOVEPATCH, _("Remove")); - EditPatch->Enable(false); - RemovePatch->Enable(false); + EditPatch->Disable(); + RemovePatch->Disable(); wxBoxSizer* sPatchPage = new wxBoxSizer(wxVERTICAL); sPatches->Add(Patches, 1, wxEXPAND|wxALL, 0); @@ -528,8 +528,8 @@ void CISOProperties::CreateGUIControls(bool IsWad) EditCheat = new wxButton(m_CheatPage, ID_EDITCHEAT, _("Edit...")); wxButton * const AddCheat = new wxButton(m_CheatPage, ID_ADDCHEAT, _("Add...")); RemoveCheat = new wxButton(m_CheatPage, ID_REMOVECHEAT, _("Remove")); - EditCheat->Enable(false); - RemoveCheat->Enable(false); + EditCheat->Disable(); + RemoveCheat->Disable(); wxBoxSizer* sCheatPage = new wxBoxSizer(wxVERTICAL); sCheats->Add(Cheats, 1, wxEXPAND|wxALL, 0); @@ -1420,8 +1420,8 @@ void CISOProperties::PatchButtonClicked(wxCommandEvent& event) Patches->Clear(); PatchList_Load(); - EditPatch->Enable(false); - RemovePatch->Enable(false); + EditPatch->Disable(); + RemovePatch->Disable(); } void CISOProperties::ActionReplayList_Load() @@ -1500,8 +1500,8 @@ void CISOProperties::ActionReplayButtonClicked(wxCommandEvent& event) Cheats->Clear(); ActionReplayList_Load(); - EditCheat->Enable(false); - RemoveCheat->Enable(false); + EditCheat->Disable(); + RemoveCheat->Disable(); } void CISOProperties::OnChangeBannerLang(wxCommandEvent& event) diff --git a/Source/Core/DolphinWX/PostProcessingConfigDiag.cpp b/Source/Core/DolphinWX/PostProcessingConfigDiag.cpp index 15624f247c..26a200026e 100644 --- a/Source/Core/DolphinWX/PostProcessingConfigDiag.cpp +++ b/Source/Core/DolphinWX/PostProcessingConfigDiag.cpp @@ -202,7 +202,7 @@ void PostProcessingConfigDiag::ConfigGrouping::GenerateUI(PostProcessingConfigDi wxTextCtrl* text_ctrl = new wxTextCtrl(parent, wxID_ANY, string_value); // Disable the textctrl, it's only there to show the absolute value from the slider - text_ctrl->Enable(false); + text_ctrl->Disable(); // wxWidget takes over the pointer provided to it in the event handler. // This won't be a memory leak, it'll be destroyed on dialog close.