avoid shadowed variable warnings with VS2015

2015-07-24 20:56:11 -07:00
parent 64308117e8
commit 36e31e515e
18 changed files with 88 additions and 90 deletions
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -1974,10 +1974,10 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
    {
        case WXK_RETURN:
            {
-                wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);
-                InitCommandEvent(event);
-                event.SetString(GetValue());
-                if ( HandleWindowEvent(event) )
+                wxCommandEvent evt(wxEVT_TEXT_ENTER, m_windowId);
+                InitCommandEvent(evt);
+                evt.SetString(GetValue());
+                if ( HandleWindowEvent(evt) )
                if ( !HasFlag(wxTE_MULTILINE) )
                    return;
                //else: multiline controls need Enter for themselves