From 27ea6aea5c5181e9e6ad33f9c4e5fdad5e6fedec Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Thu, 18 Feb 2016 22:43:46 +0100 Subject: [PATCH] Fix MSVC14 warnings about a shadowed variable in the widgets sample. Just to suppress some harmless warnings. --- samples/widgets/widgets.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index 68d8d10fcb..9cc7de5cec 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -717,15 +717,15 @@ void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event) // create the pages on demand, otherwise the sample startup is too slow as // it creates hundreds of controls - WidgetsPage *page = CurrentPage(); - if ( page->GetChildren().empty() ) + WidgetsPage *curPage = CurrentPage(); + if ( curPage->GetChildren().empty() ) { - wxWindowUpdateLocker noUpdates(page); - page->CreateContent(); - //page->Layout(); - page->GetSizer()->Fit(page); + wxWindowUpdateLocker noUpdates(curPage); + curPage->CreateContent(); + //curPage->Layout(); + curPage->GetSizer()->Fit(curPage); - WidgetsBookCtrl *book = wxStaticCast(page->GetParent(), WidgetsBookCtrl); + WidgetsBookCtrl *book = wxStaticCast(curPage->GetParent(), WidgetsBookCtrl); wxSize size; for ( size_t i = 0; i < book->GetPageCount(); ++i ) { @@ -735,10 +735,10 @@ void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event) size.IncTo(page->GetSize()); } } - page->SetSize(size); + curPage->SetSize(size); } // re-apply the attributes to the widget(s) - page->SetUpWidget(); + curPage->SetUpWidget(); event.Skip(); }