diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index a6a252dc82..19f2ebbe8f 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -232,7 +232,7 @@ void CConfigMain::UpdateGUI() EnableCheats->Disable(); CPUEngine->Disable(); - _NTSCJ->Disable(); + ForceNTSCJ->Disable(); // Disable stuff on AudioPage DSPEngine->Disable(); @@ -347,7 +347,7 @@ void CConfigMain::InitializeGUIValues() for (unsigned int a = 0; a < (sizeof(CPUCores) / sizeof(CPUCore)); ++a) if (CPUCores[a].CPUid == startup_params.iCPUCore) CPUEngine->SetSelection(a); - _NTSCJ->SetValue(startup_params.bForceNTSCJ); + ForceNTSCJ->SetValue(startup_params.bForceNTSCJ); // Display - Interface @@ -480,7 +480,7 @@ void CConfigMain::InitializeGUITooltips() Framelimit->SetToolTip(_("Limits the game speed to the specified number of frames per second (full speed is 60 for NTSC and 50 for PAL).")); // General - Advanced - _NTSCJ->SetToolTip(_("Forces NTSC-J mode for using the Japanese ROM font.\nIf left unchecked, Dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games.")); + ForceNTSCJ->SetToolTip(_("Forces NTSC-J mode for using the Japanese ROM font.\nIf left unchecked, Dolphin defaults to NTSC-U and automatically enables this setting when playing Japanese games.")); // Display - Interface ConfirmStop->SetToolTip(_("Show a confirmation box before stopping a game.")); @@ -547,7 +547,7 @@ void CConfigMain::CreateGUIControls() Framelimit = new wxChoice(GeneralPage, ID_FRAMELIMIT, wxDefaultPosition, wxDefaultSize, arrayStringFor_Framelimit); // Core Settings - Advanced CPUEngine = new wxRadioBox(GeneralPage, ID_CPUENGINE, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, arrayStringFor_CPUEngine, 0, wxRA_SPECIFY_ROWS); - _NTSCJ = new wxCheckBox(GeneralPage, ID_NTSCJ, _("Force Console as NTSC-J")); + ForceNTSCJ = new wxCheckBox(GeneralPage, ID_NTSCJ, _("Force Console as NTSC-J")); // Populate the General settings wxBoxSizer* sFramelimit = new wxBoxSizer(wxHORIZONTAL); @@ -562,7 +562,7 @@ void CConfigMain::CreateGUIControls() wxStaticBoxSizer* const sbAdvanced = new wxStaticBoxSizer(wxVERTICAL, GeneralPage, _("Advanced Settings")); sbAdvanced->Add(CPUEngine, 0, wxALL, 5); - sbAdvanced->Add(_NTSCJ, 0, wxALL, 5); + sbAdvanced->Add(ForceNTSCJ, 0, wxALL, 5); wxBoxSizer* const sGeneralPage = new wxBoxSizer(wxVERTICAL); sGeneralPage->Add(sbBasic, 0, wxEXPAND | wxALL, 5); @@ -906,7 +906,7 @@ void CConfigMain::CoreSettingsChanged(wxCommandEvent& event) } break; case ID_NTSCJ: - startup_params.bForceNTSCJ = _NTSCJ->IsChecked(); + startup_params.bForceNTSCJ = ForceNTSCJ->IsChecked(); break; case ID_ENABLEOVERCLOCK: SConfig::GetInstance().m_OCEnable = EnableOC->IsChecked(); diff --git a/Source/Core/DolphinWX/ConfigMain.h b/Source/Core/DolphinWX/ConfigMain.h index f542187ac5..ef7265ad9f 100644 --- a/Source/Core/DolphinWX/ConfigMain.h +++ b/Source/Core/DolphinWX/ConfigMain.h @@ -146,7 +146,7 @@ private: // Advanced wxRadioBox* CPUEngine; - wxCheckBox* _NTSCJ; + wxCheckBox* ForceNTSCJ; wxSlider* OCSlider; wxStaticText* OCText; wxCheckBox* EnableOC; diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index ff82e1cd65..dc95d0d7e8 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -432,7 +432,7 @@ CFrame::CFrame(wxFrame* parent, m_GameListCtrl = new CGameListCtrl(m_Panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxSUNKEN_BORDER | wxLC_ALIGN_LEFT); - m_GameListCtrl->Bind(wxEVT_LIST_ITEM_ACTIVATED, &CFrame::OnGameListCtrl_ItemActivated, this); + m_GameListCtrl->Bind(wxEVT_LIST_ITEM_ACTIVATED, &CFrame::OnGameListCtrlItemActivated, this); wxBoxSizer *sizerPanel = new wxBoxSizer(wxHORIZONTAL); sizerPanel->Add(m_GameListCtrl, 1, wxEXPAND | wxALL); @@ -864,7 +864,7 @@ bool CFrame::UIHasFocus() return (focusWindow != nullptr); } -void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED(event)) +void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event)) { // Show all platforms and regions if... // 1. All platforms are set to hide diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index e1a7eabfd7..74bab5bbdb 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -349,7 +349,7 @@ private: void OnConnectWiimote(wxCommandEvent& event); void GameListChanged(wxCommandEvent& event); - void OnGameListCtrl_ItemActivated(wxListEvent& event); + void OnGameListCtrlItemActivated(wxListEvent& event); void OnRenderParentResize(wxSizeEvent& event); void StartGame(const std::string& filename); void OnChangeColumnsVisible(wxCommandEvent& event);