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

Get rid of an unused member field in the XRC sample

Browse Source 
This fixes MSVC 14 warning about a local variable shadowing a class member and
makes the code less confusing.
This commit is contained in:
Vadim Zeitlin
2016-02-05 22:32:23 +01:00
parent 43340b3526
commit fd137b1876
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/xrc/objrefdlg.cpp
View File

@@ -120,7 +120,7 @@ void ObjrefDialog::OnNotebookPageChanged( wxNotebookEvent &event )
case icons_page: case icons_page:
{ {
wxNotebookPage *page = nb->GetPage(icons_page); wxNotebookPage *page = nb->GetPage(icons_page);
text = XRCCTRL(*page, "log_text", wxTextCtrl); wxTextCtrl* const text = XRCCTRL(*page, "log_text", wxTextCtrl);
if (text) if (text)
delete wxLog::SetActiveTarget(new wxLogTextCtrl(text)); delete wxLog::SetActiveTarget(new wxLogTextCtrl(text));
break; break;
@@ -130,7 +130,7 @@ void ObjrefDialog::OnNotebookPageChanged( wxNotebookEvent &event )
{ {
wxNotebookPage *page = nb->GetPage(calc_page); wxNotebookPage *page = nb->GetPage(calc_page);
result_txt = XRCCTRL(*page, "result", wxTextCtrl); result_txt = XRCCTRL(*page, "result", wxTextCtrl);
text = XRCCTRL(*page, "log_text", wxTextCtrl); wxTextCtrl* const text = XRCCTRL(*page, "log_text", wxTextCtrl);
if (text) if (text)
delete wxLog::SetActiveTarget(new wxLogTextCtrl(text)); delete wxLog::SetActiveTarget(new wxLogTextCtrl(text));

1
samples/xrc/objrefdlg.h
View File

@@ -63,7 +63,6 @@ private:
void ClearCalculator(); void ClearCalculator();
wxNotebook *nb; wxNotebook *nb;
wxTextCtrl *text;
wxTextCtrl *result_txt; wxTextCtrl *result_txt;
int current; int current;
int previous; int previous;