avoid shadowed variable warnings with VS2015

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

View File

@@ -2819,17 +2819,17 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
case WM_MOVING:
{
LPRECT pRect = (LPRECT)lParam;
wxRect rc;
rc.SetLeft(pRect->left);
rc.SetTop(pRect->top);
rc.SetRight(pRect->right);
rc.SetBottom(pRect->bottom);
processed = HandleMoving(rc);
wxRect rect;
rect.SetLeft(pRect->left);
rect.SetTop(pRect->top);
rect.SetRight(pRect->right);
rect.SetBottom(pRect->bottom);
processed = HandleMoving(rect);
if (processed) {
pRect->left = rc.GetLeft();
pRect->top = rc.GetTop();
pRect->right = rc.GetRight();
pRect->bottom = rc.GetBottom();
pRect->left = rect.GetLeft();
pRect->top = rect.GetTop();
pRect->right = rect.GetRight();
pRect->bottom = rect.GetBottom();
}
}
break;
@@ -2849,17 +2849,17 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
case WM_SIZING:
{
LPRECT pRect = (LPRECT)lParam;
wxRect rc;
rc.SetLeft(pRect->left);
rc.SetTop(pRect->top);
rc.SetRight(pRect->right);
rc.SetBottom(pRect->bottom);
processed = HandleSizing(rc);
wxRect rect;
rect.SetLeft(pRect->left);
rect.SetTop(pRect->top);
rect.SetRight(pRect->right);
rect.SetBottom(pRect->bottom);
processed = HandleSizing(rect);
if (processed) {
pRect->left = rc.GetLeft();
pRect->top = rc.GetTop();
pRect->right = rc.GetRight();
pRect->bottom = rc.GetBottom();
pRect->left = rect.GetLeft();
pRect->top = rect.GetTop();
pRect->right = rect.GetRight();
pRect->bottom = rect.GetBottom();
}
}
break;