Merge pull request #9 from NREL/headerInit

Move member variable initialization from header to CTOR initializer l…
NREL · Jul 10, 2017 · 62e4f87 · 62e4f87
2 parents 26360f9 + 4399250
commit 62e4f87
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/include/wex/dview/dvtimeseriesctrl.h b/include/wex/dview/dvtimeseriesctrl.h
@@ -237,19 +237,19 @@ class wxDVTimeSeriesCtrl : public wxPanel
 
 	void OnTimer(wxTimerEvent& event);
 
-	double TopYMax = 0;
-	double TopYMin = 0;
-	double TopY2Max = 0;
-	double TopY2Min = 0;
-	double BottomYMax = 0;
-	double BottomYMin = 0;
-	double BottomY2Max = 0;
-	double BottomY2Min = 0;
+	double TopYMax;
+	double TopYMin;
+	double TopY2Max;
+	double TopY2Min;
+	double BottomYMax;
+	double BottomYMin;
+	double BottomY2Max;
+	double BottomY2Min;
 
-	wxTimer * m_timer = nullptr;
+	wxTimer * m_timer;
 
 	std::vector<std::pair<int, int> > m_selections;
-	unsigned m_counter = 0;
+	unsigned m_counter;
 
 	DECLARE_EVENT_TABLE();
 };

diff --git a/src/dview/dvtimeseriesctrl.cpp b/src/dview/dvtimeseriesctrl.cpp
@@ -804,7 +804,17 @@ END_EVENT_TABLE()
 
 /*Constructors and Destructors*/
 wxDVTimeSeriesCtrl::wxDVTimeSeriesCtrl(wxWindow *parent, wxWindowID id, wxDVTimeSeriesType seriesType, wxDVStatType statType)
-: wxPanel(parent, id)
+: wxPanel(parent, id),
+TopYMax(0),
+TopYMin(0),
+TopY2Max(0),
+TopY2Min(0),
+BottomYMax(0),
+BottomYMin(0),
+BottomY2Max(0),
+BottomY2Min(0),
+m_timer(nullptr),
+m_counter(0)
 {
 	SetBackgroundColour(*wxWHITE);
 	m_srchCtrl = NULL;