From fd137b1876295f195573d61a3691aca379a0e358 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 5 Feb 2016 22:32:23 +0100
Subject: [PATCH] Get rid of an unused member field in the XRC sample

This fixes MSVC 14 warning about a local variable shadowing a class member and
makes the code less confusing.
---
 samples/xrc/objrefdlg.cpp | 4 ++--
 samples/xrc/objrefdlg.h   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/samples/xrc/objrefdlg.cpp b/samples/xrc/objrefdlg.cpp
index 1c0bf9c6c2..086641feeb 100644
--- a/samples/xrc/objrefdlg.cpp
+++ b/samples/xrc/objrefdlg.cpp
@@ -120,7 +120,7 @@ void ObjrefDialog::OnNotebookPageChanged( wxNotebookEvent &event )
         case icons_page:
             {
                 wxNotebookPage *page = nb->GetPage(icons_page);
-                text = XRCCTRL(*page, "log_text", wxTextCtrl);
+                wxTextCtrl* const text = XRCCTRL(*page, "log_text", wxTextCtrl);
                 if (text)
                     delete wxLog::SetActiveTarget(new wxLogTextCtrl(text));
                 break;
@@ -130,7 +130,7 @@ void ObjrefDialog::OnNotebookPageChanged( wxNotebookEvent &event )
             {
                 wxNotebookPage *page = nb->GetPage(calc_page);
                 result_txt = XRCCTRL(*page, "result", wxTextCtrl);
-                text = XRCCTRL(*page, "log_text", wxTextCtrl);
+                wxTextCtrl* const text = XRCCTRL(*page, "log_text", wxTextCtrl);
                 if (text)
                     delete wxLog::SetActiveTarget(new wxLogTextCtrl(text));
 
diff --git a/samples/xrc/objrefdlg.h b/samples/xrc/objrefdlg.h
index cccff88521..d2a7f0987e 100644
--- a/samples/xrc/objrefdlg.h
+++ b/samples/xrc/objrefdlg.h
@@ -63,7 +63,6 @@ private:
     void ClearCalculator();
 
     wxNotebook *nb;
-    wxTextCtrl *text;
     wxTextCtrl *result_txt;
     int current;
     int previous;