Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid shadowed variable warnings with VS2015

Browse Source
This commit is contained in:
Paul Cornett
2015-07-24 20:56:11 -07:00
parent 64308117e8
commit 36e31e515e
18 changed files with 88 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/filedlg.cpp
View File

@@ -663,7 +663,7 @@ int wxFileDialog::ShowModal()
const wxChar* extension = filterBuffer.t_str();
int maxFilter = (int)(of.nFilterIndex*2L) - 1;
for( int i = 0; i < maxFilter; i++ ) // get extension
for( int j = 0; j < maxFilter; j++ ) // get extension
extension = extension + wxStrlen( extension ) + 1;
// use dummy name a to avoid assert in AppendExtension
@@ -725,11 +725,11 @@ int wxFileDialog::ShowModal()
m_fileNames.Add(toke.GetNextToken());
#endif // OFN_EXPLORER
wxString dir(m_dir);
m_path = m_dir;
if ( m_dir.Last() != wxT('\\') )
dir += wxT('\\');
m_path += wxT('\\');
m_path = dir + m_fileName;
m_path += m_fileName;
m_filterIndex = (int)of.nFilterIndex - 1;
}
else
@@ -745,7 +745,7 @@ int wxFileDialog::ShowModal()
const wxChar* extension = filterBuffer.t_str();
int maxFilter = (int)(of.nFilterIndex*2L) - 1;
for( int i = 0; i < maxFilter; i++ ) // get extension
for( int j = 0; j < maxFilter; j++ ) // get extension
extension = extension + wxStrlen( extension ) + 1;
m_fileName = AppendExtension(fileNameBuffer, extension);