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

Fix MSVC14 warnings about a shadowed variable in the propgrid sample.

Browse Source 
Just to suppress some harmless warnings.
This commit is contained in:
Artur Wieczorek
2016-02-18 18:42:06 +01:00
parent a8b1894628
commit 51f7074caf
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
samples/propgrid/tests.cpp
View File

@@ -575,12 +575,11 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
wxVariant values = page->GetPropertyValues();
unsigned int i;
for ( i = 0; i < (unsigned int)values.GetCount(); i++ )
for (unsigned int j = 0; j < (unsigned int)values.GetCount(); j++ )
{
wxVariant& v = values[i];
wxVariant& v = values[j];
t.Printf(wxT("%i: name=\"%s\" type=\"%s\"\n"),(int)i,
t.Printf(wxT("%i: name=\"%s\" type=\"%s\"\n"),(int)j,
v.GetName().c_str(),v.GetType().c_str());
text += t;
@@ -821,7 +820,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
CreateGrid( -1, wxPG_EX_MULTIPLE_SELECTION);
pgman = m_pPropGridManager;
wxPropertyGrid* pg = pgman->GetGrid();
pg = pgman->GetGrid();
wxPGProperty* prop1 = pg->GetProperty(wxT("Label"));
wxPGProperty* prop2 = pg->GetProperty(wxT("Cell Text Colour"));
@@ -875,7 +874,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
// Test label editing
RT_START_TEST(LABEL_EDITING)
wxPropertyGrid* pg = pgman->GetGrid();
pg = pgman->GetGrid();
// Just mostly test that these won't crash
pg->MakeColumnEditable(0, true);