From e7c8349d9bb583103d3f3d3d17257ab9e6ff5a55 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 5 Mar 2016 18:17:19 +0100 Subject: [PATCH] Avoid MSVC 14 warning about variable hiding in dataview sample The warning is harmless but it was indeed confusing to call "parent" both a local variable and a function parameter, so don't do it. --- samples/dataview/dataview.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp index 70a543f6a9..a51a3146e6 100644 --- a/samples/dataview/dataview.cpp +++ b/samples/dataview/dataview.cpp @@ -739,14 +739,14 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l ilist->Add( wxIcon(wx_small_xpm) ); tc->AssignImageList( ilist ); - wxDataViewItem parent = + const wxDataViewItem root = tc->AppendContainer( wxDataViewItem(0), "The Root", 0 ); - tc->AppendItem( parent, "Child 1", 0 ); - tc->AppendItem( parent, "Child 2", 0 ); - tc->AppendItem( parent, "Child 3, very long, long, long, long", 0 ); + tc->AppendItem( root, "Child 1", 0 ); + tc->AppendItem( root, "Child 2", 0 ); + tc->AppendItem( root, "Child 3, very long, long, long, long", 0 ); wxDataViewItem cont = - tc->AppendContainer( parent, "Container child", 0 ); + tc->AppendContainer( root, "Container child", 0 ); tc->AppendItem( cont, "Child 4", 0 ); tc->AppendItem( cont, "Child 5", 0 );