From 39c8fe121ab28a8c9e242ea781bf17c10dcc07b6 Mon Sep 17 00:00:00 2001 From: "avihal@gmail.com" Date: Sat, 16 Apr 2011 20:36:53 +0000 Subject: [PATCH] CDVD plugin submenu disable: code cleanup to allow easier future modifications. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4580 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/MainFrame.cpp | 2 +- pcsx2/gui/MainFrame.h | 2 +- pcsx2/gui/MainMenuClicks.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pcsx2/gui/MainFrame.cpp b/pcsx2/gui/MainFrame.cpp index 3a772809c8..c053f68a72 100644 --- a/pcsx2/gui/MainFrame.cpp +++ b/pcsx2/gui/MainFrame.cpp @@ -65,7 +65,7 @@ void MainEmuFrame::UpdateIsoSrcSelection() sMenuBar.Check( cdsrc, true ); m_statusbar.SetStatusText( CDVD_SourceLabels[g_Conf->CdvdSource], 1 ); - m_menuCDVD.Enable( GetPluginMenuId_Settings(PluginId_CDVD), cdsrc == MenuId_Src_Plugin ); + EnableCdvdPluginSubmenu( cdsrc == MenuId_Src_Plugin ); //sMenuBar.SetLabel( MenuId_Src_Iso, wxsFormat( L"%s -> %s", _("Iso"), // exists ? Path::GetFilename(g_Conf->CurrentIso).c_str() : _("Empty") ) ); diff --git a/pcsx2/gui/MainFrame.h b/pcsx2/gui/MainFrame.h index 21b73cc8ad..4e9ece5693 100644 --- a/pcsx2/gui/MainFrame.h +++ b/pcsx2/gui/MainFrame.h @@ -144,7 +144,7 @@ public: void UpdateIsoSrcSelection(); void RemoveCdvdMenu(); void EnableMenuItem( int id, bool enable ); - int GetCdvdPluginSubmenuItemId(); + void EnableCdvdPluginSubmenu(bool isEnable = true); bool Destroy(); diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp index 3294edac7e..c5f68f5f53 100644 --- a/pcsx2/gui/MainMenuClicks.cpp +++ b/pcsx2/gui/MainMenuClicks.cpp @@ -168,7 +168,7 @@ wxWindowID SwapOrReset_Iso( wxWindow* owner, IScopedCoreThread& core_control, co core_control.AllowResume(); } - GetMainFrame().EnableMenuItem( GetMainFrame().GetCdvdPluginSubmenuItemId(), g_Conf->CdvdSource == CDVDsrc_Plugin ); + GetMainFrame().EnableCdvdPluginSubmenu( g_Conf->CdvdSource == CDVDsrc_Plugin ); return result; } @@ -217,7 +217,7 @@ wxWindowID SwapOrReset_CdvdSrc( wxWindow* owner, CDVD_SourceType newsrc ) sApp.SysExecute( g_Conf->CdvdSource ); } - GetMainFrame().EnableMenuItem( GetMainFrame().GetCdvdPluginSubmenuItemId(), g_Conf->CdvdSource == CDVDsrc_Plugin ); + GetMainFrame().EnableCdvdPluginSubmenu( g_Conf->CdvdSource == CDVDsrc_Plugin ); return result; } @@ -353,9 +353,9 @@ void MainEmuFrame::_DoBootCdvd() sApp.SysExecute( g_Conf->CdvdSource ); } -int MainEmuFrame::GetCdvdPluginSubmenuItemId() +void MainEmuFrame::EnableCdvdPluginSubmenu(bool isEnable) { - return GetPluginMenuId_Settings(PluginId_CDVD); + EnableMenuItem( GetPluginMenuId_Settings(PluginId_CDVD), isEnable ); } void MainEmuFrame::Menu_CdvdSource_Click( wxCommandEvent &event )