Cleaned up warnings (Warning level 4) in settings pages

This commit is contained in:
zilmar 2012-10-05 19:14:32 +10:00
parent cfbf35fb5e
commit 53561c68c0
10 changed files with 54 additions and 58 deletions

View File

@ -173,7 +173,7 @@ LRESULT CSettingConfig::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*
return TRUE;
}
LRESULT CSettingConfig::OnClicked (WORD wNotifyCode, WORD wID, HWND , BOOL& bHandled)
LRESULT CSettingConfig::OnClicked (WORD /*wNotifyCode*/, WORD wID, HWND , BOOL& /*bHandled*/)
{
switch(wID)
{
@ -246,9 +246,8 @@ void CSettingConfig::ApplySettings( bool UpdateScreen )
CSettingTypeApplication::Flush();
}
LRESULT CSettingConfig::OnPageListItemChanged(NMHDR* phdr)
LRESULT CSettingConfig::OnPageListItemChanged(NMHDR* /*phdr*/)
{
NMLISTVIEW* pnmlv = (NMLISTVIEW*) phdr;
HTREEITEM hItem = m_PagesTreeList.GetSelectedItem();
CSettingsPage * Page = (CSettingsPage * )m_PagesTreeList.GetItemData(hItem);
@ -265,7 +264,7 @@ LRESULT CSettingConfig::OnPageListItemChanged(NMHDR* phdr)
return 0; // retval ignored
}
LRESULT CSettingConfig::OnSettingPageChanged ( UINT /*uMsg*/, WPARAM wPage, LPARAM /*lParam*/)
LRESULT CSettingConfig::OnSettingPageChanged ( UINT /*uMsg*/, WPARAM /*wPage*/, LPARAM /*lParam*/)
{
::EnableWindow(GetDlgItem(IDAPPLY),true);
::EnableWindow(GetDlgItem(IDC_RESET_PAGE), m_CurrentPage->EnableReset());

View File

@ -44,7 +44,7 @@ COptionsDirectoriesPage::COptionsDirectoriesPage (HWND hParent, const RECT & rcD
UpdatePageSettings();
}
int CALLBACK COptionsDirectoriesPage::SelectDirCallBack (HWND hwnd,DWORD uMsg,DWORD lp, DWORD lpData)
int CALLBACK COptionsDirectoriesPage::SelectDirCallBack (HWND hwnd,DWORD uMsg,DWORD /*lp*/, DWORD lpData)
{
switch(uMsg)
{
@ -90,62 +90,62 @@ void COptionsDirectoriesPage::SelectDirectory( LanguageStringID Title, CModified
}
}
void COptionsDirectoriesPage::PluginDirChanged ( UINT Code, int id, HWND ctl )
void COptionsDirectoriesPage::PluginDirChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
if (m_InUpdateSettings) { return; }
m_PluginDir.SetChanged(true);
SendMessage(GetParent(),PSM_CHANGED,(WPARAM)m_hWnd,0);
}
void COptionsDirectoriesPage::AutoSaveDirChanged ( UINT Code, int id, HWND ctl )
void COptionsDirectoriesPage::AutoSaveDirChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
if (m_InUpdateSettings) { return; }
m_AutoSaveDir.SetChanged(true);
SendMessage(GetParent(),PSM_CHANGED,(WPARAM)m_hWnd,0);
}
void COptionsDirectoriesPage::InstantSaveDirChanged ( UINT Code, int id, HWND ctl )
void COptionsDirectoriesPage::InstantSaveDirChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
if (m_InUpdateSettings) { return; }
m_InstantSaveDir.SetChanged(true);
SendMessage(GetParent(),PSM_CHANGED,(WPARAM)m_hWnd,0);
}
void COptionsDirectoriesPage::SnapShotDirChanged ( UINT Code, int id, HWND ctl )
void COptionsDirectoriesPage::SnapShotDirChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
if (m_InUpdateSettings) { return; }
m_ScreenShotDir.SetChanged(true);
SendMessage(GetParent(),PSM_CHANGED,(WPARAM)m_hWnd,0);
}
void COptionsDirectoriesPage::TextureDirChanged ( UINT Code, int id, HWND ctl )
void COptionsDirectoriesPage::TextureDirChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
if (m_InUpdateSettings) { return; }
m_TextureDir.SetChanged(true);
SendMessage(GetParent(),PSM_CHANGED,(WPARAM)m_hWnd,0);
}
void COptionsDirectoriesPage::SelectPluginDir ( UINT Code, int id, HWND ctl )
void COptionsDirectoriesPage::SelectPluginDir ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
SelectDirectory(DIR_SELECT_PLUGIN,m_PluginDir,m_PluginDefault, m_PluginSelected);
}
void COptionsDirectoriesPage::SelectAutoDir ( UINT Code, int id, HWND ctl )
void COptionsDirectoriesPage::SelectAutoDir ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
SelectDirectory(DIR_SELECT_AUTO,m_AutoSaveDir,m_AutoSaveDefault, m_AutoSaveSelected);
}
void COptionsDirectoriesPage::SelectInstantDir ( UINT Code, int id, HWND ctl )
void COptionsDirectoriesPage::SelectInstantDir ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
SelectDirectory(DIR_SELECT_INSTANT,m_InstantSaveDir,m_InstantDefault, m_InstantSelected);
}
void COptionsDirectoriesPage::SelectSnapShotDir ( UINT Code, int id, HWND ctl )
void COptionsDirectoriesPage::SelectSnapShotDir ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
SelectDirectory(DIR_SELECT_SCREEN,m_ScreenShotDir,m_ScreenShotDefault, m_ScreenShotSelected);
}
void COptionsDirectoriesPage::SelectTextureDir ( UINT Code, int id, HWND ctl )
void COptionsDirectoriesPage::SelectTextureDir ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
SelectDirectory(DIR_SELECT_TEXTURE,m_TextureDir,m_TextureDefault, m_TextureSelected);
}
@ -190,7 +190,7 @@ void COptionsDirectoriesPage::UpdatePageSettings()
m_InUpdateSettings = false;
}
void COptionsDirectoriesPage::UseSelectedClicked ( UINT Code, int id, HWND ctl )
void COptionsDirectoriesPage::UseSelectedClicked ( UINT /*Code*/, int id, HWND /*ctl*/ )
{
CModifiedButton * Button = NULL;
switch (id)

View File

@ -29,7 +29,7 @@ CGameGeneralPage::CGameGeneralPage (HWND hParent, const RECT & rcDispay )
if (ComboBox)
{
ComboBox->SetTextField(GetDlgItem(IDC_SAVE_TYPE_TEXT));
ComboBox->AddItem(GS(SAVE_FIRST_USED), SaveChip_Auto );
ComboBox->AddItem(GS(SAVE_FIRST_USED), (WPARAM)SaveChip_Auto );
ComboBox->AddItem(GS(SAVE_4K_EEPROM), SaveChip_Eeprom_4K );
ComboBox->AddItem(GS(SAVE_16K_EEPROM), SaveChip_Eeprom_16K );
ComboBox->AddItem(GS(SAVE_SRAM), SaveChip_Sram );

View File

@ -272,7 +272,7 @@ void CGamePluginPage::ApplyComboBoxes ( void )
}
}
bool CGamePluginPage::ResetComboBox ( CModifiedComboBox & ComboBox, SettingID Type )
bool CGamePluginPage::ResetComboBox ( CModifiedComboBox & ComboBox, SettingID /*Type*/ )
{
if (!ComboBox.IsChanged())
{
@ -297,7 +297,7 @@ bool CGamePluginPage::ResetComboBox ( CModifiedComboBox & ComboBox, SettingID Ty
return false;
}
void CGamePluginPage::HleGfxChanged ( UINT Code, int id, HWND ctl )
void CGamePluginPage::HleGfxChanged ( UINT /*Code*/, int id, HWND /*ctl*/ )
{
for (ButtonList::iterator iter = m_ButtonList.begin(); iter != m_ButtonList.end(); iter ++)
{
@ -321,7 +321,7 @@ void CGamePluginPage::HleGfxChanged ( UINT Code, int id, HWND ctl )
}
}
void CGamePluginPage::HleAudioChanged ( UINT Code, int id, HWND ctl )
void CGamePluginPage::HleAudioChanged ( UINT /*Code*/, int id, HWND /*ctl*/ )
{
for (ButtonList::iterator iter = m_ButtonList.begin(); iter != m_ButtonList.end(); iter ++)
{

View File

@ -32,15 +32,15 @@ public:
void ResetPage ( void );
private:
void GfxPluginAbout ( UINT Code, int id, HWND ctl ) { ShowAboutButton(GFX_LIST); }
void AudioPluginAbout ( UINT Code, int id, HWND ctl ) { ShowAboutButton(AUDIO_LIST); }
void ControllerPluginAbout ( UINT Code, int id, HWND ctl ) { ShowAboutButton(CONT_LIST); }
void RspPluginAbout ( UINT Code, int id, HWND ctl ) { ShowAboutButton(RSP_LIST); }
void GfxPluginAbout ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { ShowAboutButton(GFX_LIST); }
void AudioPluginAbout ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { ShowAboutButton(AUDIO_LIST); }
void ControllerPluginAbout ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { ShowAboutButton(CONT_LIST); }
void RspPluginAbout ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { ShowAboutButton(RSP_LIST); }
void GfxPluginChanged ( UINT Code, int id, HWND ctl ) { PluginItemChanged(GFX_LIST,GFX_ABOUT); }
void AudioPluginChanged ( UINT Code, int id, HWND ctl ) { PluginItemChanged(AUDIO_LIST,AUDIO_ABOUT); }
void ControllerPluginChanged ( UINT Code, int id, HWND ctl ) { PluginItemChanged(CONT_LIST,CONT_ABOUT); }
void RspPluginChanged ( UINT Code, int id, HWND ctl ) { PluginItemChanged(RSP_LIST,RSP_ABOUT); }
void GfxPluginChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { PluginItemChanged(GFX_LIST,GFX_ABOUT); }
void AudioPluginChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { PluginItemChanged(AUDIO_LIST,AUDIO_ABOUT); }
void ControllerPluginChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { PluginItemChanged(CONT_LIST,CONT_ABOUT); }
void RspPluginChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { PluginItemChanged(RSP_LIST,RSP_ABOUT); }
void HleGfxChanged ( UINT Code, int id, HWND ctl );
void HleAudioChanged ( UINT Code, int id, HWND ctl );

View File

@ -85,7 +85,7 @@ void COptionsGameBrowserPage::FixCtrlState ( void )
::EnableWindow(GetDlgItem(IDC_RECURSION),bEnabled);
}
void COptionsGameBrowserPage::AddFieldClicked ( UINT Code, int id, HWND ctl )
void COptionsGameBrowserPage::AddFieldClicked ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
int index = m_Avaliable.GetCurSel();
if (index < 0)
@ -111,7 +111,7 @@ void COptionsGameBrowserPage::AddFieldClicked ( UINT Code, int id, HWND ctl )
SendMessage(GetParent(),PSM_CHANGED ,(WPARAM)m_hWnd,0);
}
void COptionsGameBrowserPage::RemoveFieldClicked ( UINT Code, int id, HWND ctl )
void COptionsGameBrowserPage::RemoveFieldClicked ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
int index = SendMessage(GetDlgItem(IDC_USING),LB_GETCURSEL,0,0);
if (index < 0)
@ -138,7 +138,7 @@ void COptionsGameBrowserPage::RemoveFieldClicked ( UINT Code, int id, HWND ctl )
SendMessage(GetParent(),PSM_CHANGED ,(WPARAM)m_hWnd,0);
}
void COptionsGameBrowserPage::MoveFieldUpClicked ( UINT Code, int id, HWND ctl )
void COptionsGameBrowserPage::MoveFieldUpClicked ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
int index = m_Using.GetCurSel();
if (index <= 0)
@ -157,7 +157,7 @@ void COptionsGameBrowserPage::MoveFieldUpClicked ( UINT Code, int id, HWND ctl )
SendMessage(GetParent(),PSM_CHANGED ,(WPARAM)m_hWnd,0);
}
void COptionsGameBrowserPage::MoveFieldDownClicked ( UINT Code, int id, HWND ctl )
void COptionsGameBrowserPage::MoveFieldDownClicked ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
int index = m_Using.GetCurSel();
if (index < 0 || index >= (m_Using.GetCount() - 1))
@ -197,7 +197,7 @@ void COptionsGameBrowserPage::ApplySettings( bool UpdateScreen )
}
bColChanged = true;
} else {
int Item, listCount = m_Using.GetCount();
size_t Item, listCount = m_Using.GetCount();
for (Item = 0; Item < listCount; Item ++ )
{
int Pos = m_Using.GetItemData(Item);

View File

@ -62,7 +62,7 @@ void COptionsShortCutsPage::CheckResetEnable ( void )
m_EnableReset = false;
}
void COptionsShortCutsPage::OnCpuStateChanged(UINT Code, int id, HWND ctl)
void COptionsShortCutsPage::OnCpuStateChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/)
{
ACCESS_MODE AccessLevel = (ACCESS_MODE)m_CpuState.GetItemData(m_CpuState.GetCurSel());
@ -80,7 +80,7 @@ void COptionsShortCutsPage::OnCpuStateChanged(UINT Code, int id, HWND ctl)
HTREEITEM hParent = m_MenuItems.GetChildItem(TVI_ROOT);
while (hParent)
{
if (m_MenuItems.GetItemData(hParent) == Item->second.Section())
if (m_MenuItems.GetItemData(hParent) == (DWORD_PTR)Item->second.Section())
{
break;
}
@ -115,7 +115,7 @@ void COptionsShortCutsPage::OnCpuStateChanged(UINT Code, int id, HWND ctl)
}
}
void COptionsShortCutsPage::OnRemoveClicked ( UINT Code, int id, HWND ctl )
void COptionsShortCutsPage::OnRemoveClicked ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
HTREEITEM hSelectedItem = m_MenuItems.GetSelectedItem();
if (hSelectedItem == NULL)
@ -131,8 +131,6 @@ void COptionsShortCutsPage::OnRemoveClicked ( UINT Code, int id, HWND ctl )
}
CShortCutItem * ShortCut = (CShortCutItem *)m_MenuItems.GetItemData(hSelectedItem);
ACCESS_MODE AccessLevel = (ACCESS_MODE)m_CpuState.GetItemData(m_CpuState.GetCurSel());
//Make sure an item is selected
int index = m_CurrentKeys.GetCurSel();
@ -150,12 +148,12 @@ void COptionsShortCutsPage::OnRemoveClicked ( UINT Code, int id, HWND ctl )
SendMessage(GetParent(),PSM_CHANGED ,(WPARAM)m_hWnd,0);
}
void COptionsShortCutsPage::OnDetectKeyClicked ( UINT Code, int id, HWND ctl )
void COptionsShortCutsPage::OnDetectKeyClicked ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
CloseHandle(CreateThread(NULL,0,(LPTHREAD_START_ROUTINE)stInputGetKeys,this,0,NULL));
}
void COptionsShortCutsPage::OnAssignClicked ( UINT Code, int id, HWND ctl )
void COptionsShortCutsPage::OnAssignClicked ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
//Get the virtual key info
int index = m_VirtualKeyList.GetCurSel();
@ -203,7 +201,7 @@ void COptionsShortCutsPage::OnAssignClicked ( UINT Code, int id, HWND ctl )
SendMessage(GetParent(),PSM_CHANGED ,(WPARAM)m_hWnd,0);
}
void COptionsShortCutsPage::OnShortCutChanged ( UINT Code, int id, HWND ctl )
void COptionsShortCutsPage::OnShortCutChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ )
{
//Get the virtual key info
int index = m_VirtualKeyList.GetCurSel();
@ -264,7 +262,7 @@ void COptionsShortCutsPage::RefreshShortCutOptions ( HTREEITEM hItem )
}
BOOL CALLBACK KeyPromptDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
BOOL CALLBACK KeyPromptDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM /*lParam*/)
{
switch (uMsg)
{
@ -300,11 +298,10 @@ void COptionsShortCutsPage::InputGetKeys (void)
}
if (msg.message == WM_KEYDOWN || msg.message == WM_SYSKEYDOWN ) {
int nVirtKey = (int)msg.wParam;
DWORD lKeyData = msg.lParam;
if (nVirtKey == VK_SHIFT) { continue; }
if (nVirtKey == VK_CONTROL) { continue; }
if (nVirtKey == VK_MENU) { continue; }
SendDlgItemMessage(IDC_VIRTUALKEY,CB_SETCURSEL,-1,0);
SendDlgItemMessage(IDC_VIRTUALKEY,CB_SETCURSEL,(WPARAM)-1,0);
for (int count = 0; count < SendDlgItemMessage(IDC_VIRTUALKEY,CB_GETCOUNT,0,0); count++) {
int Data = (int)SendDlgItemMessage(IDC_VIRTUALKEY,CB_GETITEMDATA,count,0);
if (Data != nVirtKey) { continue; }
@ -341,7 +338,7 @@ void COptionsShortCutsPage::ShowPage()
ShowWindow(SW_SHOW);
}
void COptionsShortCutsPage::ApplySettings( bool UpdateScreen )
void COptionsShortCutsPage::ApplySettings( bool /*UpdateScreen*/ )
{
m_ShortCuts.Save();
_Settings->SaveBool(Info_ShortCutsChanged,true);

View File

@ -283,7 +283,7 @@ bool COptionPluginPage::ResetComboBox ( CModifiedComboBox & ComboBox, SettingID
return false;
}
void COptionPluginPage::HleGfxChanged ( UINT Code, int id, HWND ctl )
void COptionPluginPage::HleGfxChanged ( UINT /*Code*/, int id, HWND /*ctl*/ )
{
for (ButtonList::iterator iter = m_ButtonList.begin(); iter != m_ButtonList.end(); iter ++)
{
@ -307,7 +307,7 @@ void COptionPluginPage::HleGfxChanged ( UINT Code, int id, HWND ctl )
}
}
void COptionPluginPage::HleAudioChanged ( UINT Code, int id, HWND ctl )
void COptionPluginPage::HleAudioChanged ( UINT /*Code*/, int id, HWND /*ctl*/ )
{
for (ButtonList::iterator iter = m_ButtonList.begin(); iter != m_ButtonList.end(); iter ++)
{

View File

@ -32,15 +32,15 @@ public:
void ResetPage ( void );
private:
void GfxPluginAbout ( UINT Code, int id, HWND ctl ) { ShowAboutButton(GFX_LIST); }
void AudioPluginAbout ( UINT Code, int id, HWND ctl ) { ShowAboutButton(AUDIO_LIST); }
void ControllerPluginAbout ( UINT Code, int id, HWND ctl ) { ShowAboutButton(CONT_LIST); }
void RspPluginAbout ( UINT Code, int id, HWND ctl ) { ShowAboutButton(RSP_LIST); }
void GfxPluginAbout ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { ShowAboutButton(GFX_LIST); }
void AudioPluginAbout ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { ShowAboutButton(AUDIO_LIST); }
void ControllerPluginAbout ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { ShowAboutButton(CONT_LIST); }
void RspPluginAbout ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { ShowAboutButton(RSP_LIST); }
void GfxPluginChanged ( UINT Code, int id, HWND ctl ) { PluginItemChanged(GFX_LIST,GFX_ABOUT); }
void AudioPluginChanged ( UINT Code, int id, HWND ctl ) { PluginItemChanged(AUDIO_LIST,AUDIO_ABOUT); }
void ControllerPluginChanged ( UINT Code, int id, HWND ctl ) { PluginItemChanged(CONT_LIST,CONT_ABOUT); }
void RspPluginChanged ( UINT Code, int id, HWND ctl ) { PluginItemChanged(RSP_LIST,RSP_ABOUT); }
void GfxPluginChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { PluginItemChanged(GFX_LIST,GFX_ABOUT); }
void AudioPluginChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { PluginItemChanged(AUDIO_LIST,AUDIO_ABOUT); }
void ControllerPluginChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { PluginItemChanged(CONT_LIST,CONT_ABOUT); }
void RspPluginChanged ( UINT /*Code*/, int /*id*/, HWND /*ctl*/ ) { PluginItemChanged(RSP_LIST,RSP_ABOUT); }
void HleGfxChanged ( UINT Code, int id, HWND ctl );
void HleAudioChanged ( UINT Code, int id, HWND ctl );

View File

@ -55,7 +55,7 @@ protected:
return true;
}
void CheckBoxChanged ( UINT Code, int id, HWND ctl )
void CheckBoxChanged ( UINT /*Code*/, int id, HWND /*ctl*/ )
{
for (ButtonList::iterator iter = m_ButtonList.begin(); iter != m_ButtonList.end(); iter ++)
{
@ -273,7 +273,7 @@ protected:
UpdateTextBoxes();
}
void ComboBoxChanged ( UINT Code, int id, HWND ctl )
void ComboBoxChanged ( UINT /*Code*/, int id, HWND /*ctl*/ )
{
for (ComboBoxTxtList::iterator cbtxt_iter = m_ComboBoxTxtList.begin(); cbtxt_iter != m_ComboBoxTxtList.end(); cbtxt_iter ++)
{
@ -299,7 +299,7 @@ protected:
}
}
void EditBoxChanged ( UINT Code, int id, HWND ctl )
void EditBoxChanged ( UINT /*Code*/, int id, HWND /*ctl*/ )
{
if (m_UpdatingTxt)
{