diff --git a/uppsrc/ScatterCtrl/Processing.cpp b/uppsrc/ScatterCtrl/Processing.cpp index 6873b3586..6da6413f4 100644 --- a/uppsrc/ScatterCtrl/Processing.cpp +++ b/uppsrc/ScatterCtrl/Processing.cpp @@ -12,7 +12,7 @@ void PropertiesDlg::Init(ScatterCtrl& scatter) CtrlLayoutExit(*this, t_("Scatter properties")); Sizeable().Zoomable(); - this->scatter = &scatter; + this->pscatter = &scatter; tab.Add(measures, t_("Measures")); tab.Add(texts, t_("Texts")); @@ -33,15 +33,15 @@ void PropertiesDlg::Set(int itab) void PropertiesDlg::OnTab() { if (tab.IsAt(measures)) - measures.Init(*scatter); + measures.Init(*pscatter); else if (tab.IsAt(texts)) - texts.Init(*scatter); + texts.Init(*pscatter); else if (tab.IsAt(legend)) - legend.Init(*scatter); + legend.Init(*pscatter); else if (tab.IsAt(series)) - series.Init(*scatter); + series.Init(*pscatter); else if (tab.IsAt(general)) - general.Init(*scatter); + general.Init(*pscatter); } void ProcessingDlg::Init(ScatterCtrl& scatter) @@ -56,7 +56,7 @@ void ProcessingDlg::Init(ScatterCtrl& scatter) splitter.SetPos(1500, 0); Sizeable().Zoomable(); - this->scatter = &scatter; + this->pscatter = &scatter; list.list.Reset(); list.list.SetLineCy(EditField::GetStdHeight()); diff --git a/uppsrc/ScatterCtrl/Properties.h b/uppsrc/ScatterCtrl/Properties.h index 65d700256..92a8e2172 100644 --- a/uppsrc/ScatterCtrl/Properties.h +++ b/uppsrc/ScatterCtrl/Properties.h @@ -211,13 +211,13 @@ public: void OnTab(); void Perform(); virtual void Close() { - if (scatter->GetCount() == 0) + if (pscatter->GetCount() == 0) RejectBreak(IDOK); TopWindow::Close(); } private: - ScatterCtrl* scatter; + ScatterCtrl* pscatter; MeasuresTab measures; TextsTab texts; LegendTab legend; @@ -296,7 +296,7 @@ public: virtual ~ProcessingDlg() {}; private: - ScatterCtrl* scatter; + ScatterCtrl* pscatter; Upp::Array tabs; WithProcessingLeft list; WithProcessingRight right;