Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MSVC14 warnings about a shadowed variable in the widgets sample.

Browse Source 
Just to suppress some harmless warnings.
This commit is contained in:
Artur Wieczorek
2016-02-18 22:43:46 +01:00
parent 51f7074caf
commit 27ea6aea5c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
samples/widgets/widgets.cpp
View File

@@ -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();
}