diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-04-23 02:05:14 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-04-23 02:05:14 -0400 |
| commit | a39985fe08758ac6fe1149cdafdf33583d14d0a3 (patch) | |
| tree | 973d4dc1246de1c1a16ac587ce3184d2da9faf25 /Source/Core | |
| parent | ad95454d044408cba7846e0719407b0c6e69983e (diff) | |
| parent | 819f4d994c2fc716525cda3f28754f7490953dfd (diff) | |
Merge pull request #2315 from lioncash/code
DolphinWX: Remove superfluous code in FrameTools
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index d20ee3a65a..dde3cd4e4f 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -740,14 +740,14 @@ void CFrame::OnTASInput(wxCommandEvent& event) if (SConfig::GetInstance().m_SIDevice[i] != SIDEVICE_NONE && SConfig::GetInstance().m_SIDevice[i] != SIDEVICE_GC_GBA) { g_TASInputDlg[i]->CreateGCLayout(); - g_TASInputDlg[i]->Show(true); + g_TASInputDlg[i]->Show(); g_TASInputDlg[i]->SetTitle(wxString::Format(_("TAS Input - Controller %d"), i + 1)); } if (g_wiimote_sources[i] == WIIMOTE_SRC_EMU && !(Core::IsRunning() && !SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)) { g_TASInputDlg[i+4]->CreateWiiLayout(i); - g_TASInputDlg[i+4]->Show(true); + g_TASInputDlg[i+4]->Show(); g_TASInputDlg[i+4]->SetTitle(wxString::Format(_("TAS Input - Wiimote %d"), i + 1)); } } @@ -848,7 +848,7 @@ void CFrame::OnPlayRecording(wxCommandEvent& WXUNUSED (event)) { // let's make the read-only flag consistent at the start of a movie. Movie::SetReadOnly(true); - GetMenuBar()->FindItem(IDM_RECORD_READ_ONLY)->Check(true); + GetMenuBar()->FindItem(IDM_RECORD_READ_ONLY)->Check(); } if (Movie::PlayInput(WxStrToStr(path))) @@ -1846,9 +1846,9 @@ void CFrame::UpdateGUI() { if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, true); - GetMenuBar()->FindItem(IDM_PLAY)->Enable(true); - GetMenuBar()->FindItem(IDM_RECORD)->Enable(true); - GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(true); + GetMenuBar()->FindItem(IDM_PLAY)->Enable(); + GetMenuBar()->FindItem(IDM_RECORD)->Enable(); + GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(); } // Prepare to load last selected file, enable play button else if (!SConfig::GetInstance().m_LastFilename.empty() && @@ -1856,9 +1856,9 @@ void CFrame::UpdateGUI() { if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, true); - GetMenuBar()->FindItem(IDM_PLAY)->Enable(true); - GetMenuBar()->FindItem(IDM_RECORD)->Enable(true); - GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(true); + GetMenuBar()->FindItem(IDM_PLAY)->Enable(); + GetMenuBar()->FindItem(IDM_RECORD)->Enable(); + GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(); } else { @@ -1882,9 +1882,9 @@ void CFrame::UpdateGUI() { if (m_ToolBar) m_ToolBar->EnableTool(IDM_PLAY, true); - GetMenuBar()->FindItem(IDM_PLAY)->Enable(true); - GetMenuBar()->FindItem(IDM_RECORD)->Enable(true); - GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(true); + GetMenuBar()->FindItem(IDM_PLAY)->Enable(); + GetMenuBar()->FindItem(IDM_RECORD)->Enable(); + GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(); } } else if (Initialized) @@ -2019,12 +2019,10 @@ void CFrame::DoToggleToolbar(bool _show) void CFrame::OnToggleStatusbar(wxCommandEvent& event) { SConfig::GetInstance().m_InterfaceStatusbar = event.IsChecked(); - if (SConfig::GetInstance().m_InterfaceStatusbar == true) - GetStatusBar()->Show(); - else - GetStatusBar()->Hide(); - this->SendSizeEvent(); + GetStatusBar()->Show(event.IsChecked()); + + SendSizeEvent(); } void CFrame::OnChangeColumnsVisible(wxCommandEvent& event) |