solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix harmless variable shadowing warning in the display sample

Browse source 
Use different names to avoid warning C4456 given by MSVC 14.
This commit is contained in:
Vadim Zeitlin 2018-09-30 15:37:46 +02:00
parent 58a1ee1633
commit 6883cd4b96
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
samples/display/display.cpp
View file

@ -235,8 +235,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
wxPanel *panel = new wxPanel(this, wxID_ANY);
m_book = new wxBookCtrl(panel, wxID_ANY);
const size_t count = wxDisplay::GetCount();
for ( size_t nDpy = 0; nDpy < count; nDpy++ )
const size_t countDpy = wxDisplay::GetCount();
for ( size_t nDpy = 0; nDpy < countDpy; nDpy++ )
{
wxDisplay display(nDpy);
@ -288,8 +288,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
#if wxUSE_DISPLAY
wxChoice *choiceModes = new wxChoice(page, Display_ChangeMode);
const wxArrayVideoModes modes = display.GetModes();
const size_t count = modes.GetCount();
for ( size_t nMode = 0; nMode < count; nMode++ )
const size_t countModes = modes.GetCount();
for ( size_t nMode = 0; nMode < countModes; nMode++ )
{
const wxVideoMode& mode = modes[nMode];