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 #2315 from lioncash/code 

DolphinWX: Remove superfluous code in FrameTools
This commit is contained in:
Lioncash 2015-04-23 02:05:14 -04:00
parent ad95454d04 819f4d994c
commit a39985fe08
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -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) if (SConfig::GetInstance().m_SIDevice[i] != SIDEVICE_NONE && SConfig::GetInstance().m_SIDevice[i] != SIDEVICE_GC_GBA)
{ {
g_TASInputDlg[i]->CreateGCLayout(); 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)); 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)) 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]->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)); 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. // let's make the read-only flag consistent at the start of a movie.
Movie::SetReadOnly(true); Movie::SetReadOnly(true);
GetMenuBar()->FindItem(IDM_RECORD_READ_ONLY)->Check(true); GetMenuBar()->FindItem(IDM_RECORD_READ_ONLY)->Check();
} }
if (Movie::PlayInput(WxStrToStr(path))) if (Movie::PlayInput(WxStrToStr(path)))
@ -1846,9 +1846,9 @@ void CFrame::UpdateGUI()
{ {
if (m_ToolBar) if (m_ToolBar)
m_ToolBar->EnableTool(IDM_PLAY, true); m_ToolBar->EnableTool(IDM_PLAY, true);
GetMenuBar()->FindItem(IDM_PLAY)->Enable(true); GetMenuBar()->FindItem(IDM_PLAY)->Enable();
GetMenuBar()->FindItem(IDM_RECORD)->Enable(true); GetMenuBar()->FindItem(IDM_RECORD)->Enable();
GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(true); GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable();
} }
// Prepare to load last selected file, enable play button // Prepare to load last selected file, enable play button
else if (!SConfig::GetInstance().m_LastFilename.empty() && else if (!SConfig::GetInstance().m_LastFilename.empty() &&
@ -1856,9 +1856,9 @@ void CFrame::UpdateGUI()
{ {
if (m_ToolBar) if (m_ToolBar)
m_ToolBar->EnableTool(IDM_PLAY, true); m_ToolBar->EnableTool(IDM_PLAY, true);
GetMenuBar()->FindItem(IDM_PLAY)->Enable(true); GetMenuBar()->FindItem(IDM_PLAY)->Enable();
GetMenuBar()->FindItem(IDM_RECORD)->Enable(true); GetMenuBar()->FindItem(IDM_RECORD)->Enable();
GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(true); GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable();
} }
else else
{ {
@ -1882,9 +1882,9 @@ void CFrame::UpdateGUI()
{ {
if (m_ToolBar) if (m_ToolBar)
m_ToolBar->EnableTool(IDM_PLAY, true); m_ToolBar->EnableTool(IDM_PLAY, true);
GetMenuBar()->FindItem(IDM_PLAY)->Enable(true); GetMenuBar()->FindItem(IDM_PLAY)->Enable();
GetMenuBar()->FindItem(IDM_RECORD)->Enable(true); GetMenuBar()->FindItem(IDM_RECORD)->Enable();
GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable(true); GetMenuBar()->FindItem(IDM_PLAY_RECORD)->Enable();
} }
} }
else if (Initialized) else if (Initialized)
@ -2019,12 +2019,10 @@ void CFrame::DoToggleToolbar(bool _show)
void CFrame::OnToggleStatusbar(wxCommandEvent& event) void CFrame::OnToggleStatusbar(wxCommandEvent& event)
{ {
SConfig::GetInstance().m_InterfaceStatusbar = event.IsChecked(); 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) void CFrame::OnChangeColumnsVisible(wxCommandEvent& event)