quiet some warnings which appear on vs2015.

quieted warnings include shadowed variable names and integer extensions.
This commit is contained in:
Shawn Hoffman
2015-03-15 19:28:47 -07:00
parent 7cda374910
commit ad64336137
15 changed files with 32 additions and 34 deletions

View File

@ -1271,6 +1271,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\..\Source\VSProps\Base.props" />
<Import Project="..\..\..\..\Source\VSProps\WXWOverrides.props" />
<Import Project="..\..\..\..\Source\VSProps\ClDisableAllWarnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">

View File

@ -541,7 +541,7 @@ public:
// very first initialization function
//
// Override: very rarely
virtual bool Initialize(int& argc, wxChar **argv);
virtual bool Initialize(int& _argc, wxChar **_argv);
// a platform-dependent version of OnInit(): the code here is likely to
// depend on the toolkit. default version does nothing.

View File

@ -29,7 +29,7 @@ public:
virtual ~wxApp();
// override base class (pure) virtuals
virtual bool Initialize(int& argc, wxChar **argv);
virtual bool Initialize(int& _argc, wxChar **_argv);
virtual void CleanUp();
virtual void WakeUpIdle();