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

4
src/msw/notebook.cpp
View File

@@ -1289,8 +1289,8 @@ wxColour wxNotebook::GetThemeBackgroundColour() const
WCHAR szwThemeColor[256];
if (S_OK == wxUxThemeEngine::Get()->GetCurrentThemeName(szwThemeFile, 1024, szwThemeColor, 256, NULL, 0))
{
wxString themeFile(szwThemeFile), themeColor(szwThemeColor);
if (themeFile.Find(wxT("Aero")) != -1 && themeColor == wxT("NormalColor"))
wxString themeFile(szwThemeFile);
if (themeFile.Find(wxT("Aero")) != -1 && wxString(szwThemeColor) == wxT("NormalColor"))
s_AeroStatus = 1;
else
s_AeroStatus = 0;