Solved errors and warning for building against wxWidgets 3.1.3

include/wx/axis/numberaxis.h

@@ -35,7 +35,7 @@ class WXDLLIMPEXP_FREECHART NumberAxis : public LabelAxis
     }
 
     wxDEPRECATED_MSG("Do not use this function, instead use SetMajorInterval.")
-    void SetLabelCount(size_t labelCount) {}
+    void SetLabelCount(size_t WXUNUSED(labelCount)) {}
 
     /**
      * Set whether to use integer values instead of doubles.

include/wx/multiplot.h

@@ -54,7 +54,7 @@ class WXDLLIMPEXP_FREECHART MultiPlot : public Plot, public PlotObserver
 
     virtual void DrawData(ChartDC& cdc, wxRect rc);
 
-    virtual void DrawBackground(ChartDC& cdc, wxRect rc) {}; // Does nothing in a multi plot?
+    virtual void DrawBackground(ChartDC& WXUNUSED(cdc), wxRect WXUNUSED(rc)) {}; // Does nothing in a multi plot?
 
 private:
     PlotArray m_subPlots;

include/wx/pie/pieplot.h

@@ -68,7 +68,7 @@ class WXDLLIMPEXP_FREECHART PiePlot : public Plot, public DatasetObserver
 
     virtual void DrawData(ChartDC& cdc, wxRect rc);
 
-    virtual void DrawBackground(ChartDC& cdc, wxRect rc) {}; // Does nothing in a pie plot?
+    virtual void DrawBackground(ChartDC& WXUNUSED(cdc), wxRect WXUNUSED(rc)) {}; // Does nothing in a pie plot?
 
 private:
 

sample/combinedaxisdemos.cpp

@@ -59,7 +59,10 @@ class CombinedAxisDemo1 : public ChartDemo
         XYSimpleDataset *dataset1 = new XYSimpleDataset();
 
         // and add serie to it
-        dataset1->AddSerie((double *) data1, WXSIZEOF(data1));
+        wxVector<wxRealPoint> datapoints1;
+        for (size_t i = 0; i < WXSIZEOF(data1); i++)
+            datapoints1.push_back(wxRealPoint(data1[i][0], data1[i][1]));
+        dataset1->AddSerie(new XYSerie(datapoints1));
 
         // set line renderer to dataset
         dataset1->SetRenderer(new XYLineRenderer());
@@ -94,7 +97,10 @@ class CombinedAxisDemo1 : public ChartDemo
         XYSimpleDataset *dataset2 = new XYSimpleDataset();
 
         // and add serie to it
-        dataset2->AddSerie((double *) data2, WXSIZEOF(data2));
+        wxVector<wxRealPoint> datapoints2;
+        for (size_t i = 0; i < WXSIZEOF(data2); i++)
+            datapoints2.push_back(wxRealPoint(data2[i][0], data2[i][1]));
+        dataset2->AddSerie(new XYSerie(datapoints2));
 
         // set line renderer to dataset
         dataset2->SetRenderer(new XYLineRenderer());
@@ -170,7 +176,10 @@ class CombinedAxisDemo2 : public ChartDemo
         XYSimpleDataset *dataset1 = new XYSimpleDataset();
 
         // and add serie to it
-        dataset1->AddSerie((double *) data1, WXSIZEOF(data1));
+        wxVector<wxRealPoint> datapoints1;
+        for (size_t i = 0; i < WXSIZEOF(data1); i++)
+            datapoints1.push_back(wxRealPoint(data1[i][0], data1[i][1]));
+        dataset1->AddSerie(new XYSerie(datapoints1));
 
         // set line renderer to dataset
         dataset1->SetRenderer(new XYLineRenderer());
@@ -202,7 +211,10 @@ class CombinedAxisDemo2 : public ChartDemo
         XYSimpleDataset *dataset2 = new XYSimpleDataset();
 
         // and add serie to it
-        dataset2->AddSerie((double *) data2, WXSIZEOF(data2));
+        wxVector<wxRealPoint> datapoints2;
+        for (size_t i = 0; i < WXSIZEOF(data2); i++)
+            datapoints2.push_back(wxRealPoint(data2[i][0], data2[i][1]));
+        dataset2->AddSerie(new XYSerie(datapoints2));
 
         // set histogram renderer to dataset
         XYHistoRenderer *renderer2 = new XYHistoRenderer();

sample/markersdemos.cpp

@@ -44,7 +44,10 @@ class MarkersDemo1 : public ChartDemo
         XYSimpleDataset *dataset = new XYSimpleDataset();
 
         // and add serie to it
-        dataset->AddSerie((double *) data, WXSIZEOF(data));
+        wxVector<wxRealPoint> datapoints;
+        for (size_t i = 0; i < WXSIZEOF(data); i++)
+            datapoints.push_back(wxRealPoint(data[i][0], data[i][1]));
+        dataset->AddSerie(new XYSerie(datapoints));
 
         // set line renderer to dataset
         dataset->SetRenderer(new XYLineRenderer());
@@ -97,7 +100,10 @@ class MarkersDemo2 : public ChartDemo
         XYSimpleDataset *dataset = new XYSimpleDataset();
 
         // and add serie to it
-        dataset->AddSerie((double *) data, WXSIZEOF(data));
+        wxVector<wxRealPoint> datapoints;
+        for (size_t i = 0; i < WXSIZEOF(data); i++)
+            datapoints.push_back(wxRealPoint(data[i][0], data[i][1]));
+        dataset->AddSerie(new XYSerie(datapoints));
 
         // set line renderer to dataset
         dataset->SetRenderer(new XYLineRenderer());

sample/multipleaxisdemos.cpp

@@ -62,12 +62,18 @@ class MultipleAxisDemo1 : public ChartDemo
         // create first dataset
         XYSimpleDataset *dataset1 = new XYSimpleDataset();
         // add serie to it
-        dataset1->AddSerie((double *) values1, WXSIZEOF(values1));
+        wxVector<wxRealPoint> datapoints1;
+        for (size_t i = 0; i < WXSIZEOF(values1); i++)
+            datapoints1.push_back(wxRealPoint(values1[i][0], values1[i][1]));
+        dataset1->AddSerie(new XYSerie(datapoints1));
 
         // create second dataset
         XYSimpleDataset *dataset2 = new XYSimpleDataset();
         // add serie to it
-        dataset2->AddSerie((double *) values2, WXSIZEOF(values2));
+        wxVector<wxRealPoint> datapoints2;
+        for (size_t i = 0; i < WXSIZEOF(values2); i++)
+            datapoints2.push_back(wxRealPoint(values2[i][0], values2[i][1]));
+        dataset2->AddSerie(new XYSerie(datapoints2));
 
         // create renderer for first dataset
         XYLineRenderer *renderer1 = new XYLineRenderer();
@@ -167,12 +173,18 @@ class MultipleAxisDemo2 : public ChartDemo
         // create first dataset
         XYSimpleDataset *dataset1 = new XYSimpleDataset();
         // add serie to it
-        dataset1->AddSerie((double *) values1, WXSIZEOF(values1));
+        wxVector<wxRealPoint> datapoints1;
+        for (size_t i = 0; i < WXSIZEOF(values1); i++)
+            datapoints1.push_back(wxRealPoint(values1[i][0], values1[i][1]));
+        dataset1->AddSerie(new XYSerie(datapoints1));
 
         // create second dataset
         XYSimpleDataset *dataset2 = new XYSimpleDataset();
         // add serie to it
-        dataset2->AddSerie((double *) values2, WXSIZEOF(values2));
+        wxVector<wxRealPoint> datapoints2;
+        for (size_t i = 0; i < WXSIZEOF(values2); i++)
+            datapoints2.push_back(wxRealPoint(values2[i][0], values2[i][1]));
+        dataset2->AddSerie(new XYSerie(datapoints2));
 
         // create renderer for first dataset
         XYLineRenderer *renderer1 = new XYLineRenderer();

sample/xydemos.cpp

@@ -129,8 +129,8 @@ class XYDemo2 : public ChartDemo
         plot->LinkDataHorizontalAxis(0, 0);
 
         // set serie names to be displayed on legend
-        dataset->SetSerieName(0, wxT("Serie 0"));
-        dataset->SetSerieName(1, wxT("Serie 1"));
+        dataset->GetSerie(0)->SetName(wxT("Serie 0"));
+        dataset->GetSerie(1)->SetName(wxT("Serie 1"));
 
         // set legend
         plot->SetLegend(new Legend(wxCENTER, wxRIGHT));
@@ -195,8 +195,8 @@ class XYDemo3 : public ChartDemo
         plot->LinkDataHorizontalAxis(0, 0);
 
         // set serie names to be displayed on legend
-        dataset->SetSerieName(0, wxT("First"));
-        dataset->SetSerieName(1, wxT("Second"));
+        dataset->GetSerie(0)->SetName(wxT("First"));
+        dataset->GetSerie(1)->SetName(wxT("Second"));
 
         // set legend to plot
         plot->SetLegend(new Legend(wxCENTER, wxRIGHT));
@@ -300,7 +300,7 @@ class DynamicUpdater : public wxEvtHandler
     NumberAxis* m_axis;
     wxTimer m_timer;
 
-    void OnTimer(wxTimerEvent &ev)
+    void OnTimer(wxTimerEvent &WXUNUSED(ev))
     {
         double first_x = m_dataset->GetSerie(0)->GetX(0);
 
@@ -725,9 +725,9 @@ class XYDemo10 : public ChartDemo
         plot->LinkDataHorizontalAxis(0, 0);
 
         // set serie names to be displayed on legend
-        dataset->SetSerieName(0, wxT("First"));
-        dataset->SetSerieName(1, wxT("Second"));
-        dataset->SetSerieName(2, wxT("Third"));
+        dataset->GetSerie(0)->SetName(wxT("First"));
+        dataset->GetSerie(1)->SetName(wxT("Second"));
+        dataset->GetSerie(2)->SetName(wxT("Third"));
 
         // set legend
         plot->SetLegend(new Legend(wxBOTTOM, wxCENTER));
@@ -805,8 +805,8 @@ class XYDemo11 : public ChartDemo
         plot->LinkDataHorizontalAxis(0, 0);
 
         // set serie names to be displayed on legend
-        dataset->SetSerieName(0, wxT("Serie 0"));
-        dataset->SetSerieName(1, wxT("Serie 1"));
+        dataset->GetSerie(0)->SetName(wxT("Serie 0"));
+        dataset->GetSerie(1)->SetName(wxT("Serie 1"));
 
         // set legend
         plot->SetLegend(new Legend(wxCENTER, wxRIGHT));

src/axisplot.cpp

@@ -111,7 +111,7 @@ bool AxisPlot::HasData()
     return m_datasets.Count() != 0;
 }
 
-void AxisPlot::ChartPanelChanged(wxChartPanel *oldPanel, wxChartPanel *newPanel)
+void AxisPlot::ChartPanelChanged(wxChartPanel *WXUNUSED(oldPanel), wxChartPanel *WXUNUSED(newPanel))
 {
     m_redrawDataArea = true;
     FirePlotNeedRedraw();
@@ -184,7 +184,7 @@ void AxisPlot::SetLegend(Legend *legend)
     FirePlotNeedRedraw();
 }
 
-void AxisPlot::SetCrosshair(Crosshair *crosshair)
+void AxisPlot::SetCrosshair(Crosshair *WXUNUSED(crosshair))
 {
     /*// TODO
     if (m_crosshair != NULL && GetChartPanel() != NULL) {
@@ -553,7 +553,7 @@ void AxisPlot::ChartEnterWindow()
 }
 */
 
-void AxisPlot::ChartMouseDown(wxPoint &pt, int key)
+void AxisPlot::ChartMouseDown(wxPoint& WXUNUSED(pt), int WXUNUSED(key))
 {
 
 }
@@ -574,4 +574,4 @@ void AxisPlot::ChartMouseDrag(wxPoint &pt)
 void AxisPlot::ChartMouseWheel(int rotation)
 {
 }
-*/
+*/

src/chart.cpp

@@ -135,7 +135,7 @@ void Chart::SetChartPanel(wxChartPanel *chartPanel)
 //    return rc;
 //}
 
-void Chart::Draw(ChartDC &cdc, wxRect &rc, bool antialias)
+void Chart::Draw(ChartDC &cdc, wxRect &rc, bool WXUNUSED(antialias))
 {
     // draw chart background
     m_background->Draw(cdc.GetDC(), rc);

src/chartpanel.cpp

@@ -53,23 +53,23 @@ void ChartPanelObserver::ChartEnterWindow()
 {
 }
 
-void ChartPanelObserver::ChartMouseDown(wxPoint &pt, int key)
+void ChartPanelObserver::ChartMouseDown(wxPoint &WXUNUSED(pt), int WXUNUSED(key))
 {
 }
 
-void ChartPanelObserver::ChartMouseUp(wxPoint &pt, int key)
+void ChartPanelObserver::ChartMouseUp(wxPoint &WXUNUSED(pt), int WXUNUSED(key))
 {
 }
 
-void ChartPanelObserver::ChartMouseMove(wxPoint &pt)
+void ChartPanelObserver::ChartMouseMove(wxPoint &WXUNUSED(pt))
 {
 }
 
-void ChartPanelObserver::ChartMouseDrag(wxPoint &pt)
+void ChartPanelObserver::ChartMouseDrag(wxPoint &WXUNUSED(pt))
 {
 }
 
-void ChartPanelObserver::ChartMouseWheel(int rotation)
+void ChartPanelObserver::ChartMouseWheel(int WXUNUSED(rotation))
 {
 }
 
@@ -264,7 +264,7 @@ void wxChartPanel::OnScrollWin(wxScrollWinEvent &ev)
     ev.Skip();
 }
 
-void wxChartPanel::OnMouseEvents(wxMouseEvent &ev)
+void wxChartPanel::OnMouseEvents(wxMouseEvent &WXUNUSED(ev))
 {
     if (m_mode == NULL) {
         return ;

src/chartsplitpanel.cpp

@@ -52,12 +52,12 @@ void wxChartSplitPanel::AddPlot(Plot *plot, int pos, bool allowRemove)
     m_auiManager->Update();
 }
 
-void wxChartSplitPanel::RemovePlot(Plot *plot)
+void wxChartSplitPanel::RemovePlot(Plot *WXUNUSED(plot))
 {
     // TODO
 }
 
-void wxChartSplitPanel::RemovePlot(size_t nPlot)
+void wxChartSplitPanel::RemovePlot(size_t WXUNUSED(nPlot))
 {
     // TODO
 }

src/crosshair.cpp

@@ -9,7 +9,7 @@
 
 #include "wx/crosshair.h"
 
-Crosshair::Crosshair(int style, wxPen *pen)
+Crosshair::Crosshair(int WXUNUSED(style), wxPen *WXUNUSED(pen))
 {
 
 }
@@ -19,7 +19,7 @@ Crosshair::~Crosshair()
 
 }
 
-void Crosshair::Draw(wxDC &dc, wxRect rcData)//, wxCoord x, wxCoord y)
+void Crosshair::Draw(wxDC& WXUNUSED(dc), wxRect WXUNUSED(rcData))//, wxCoord x, wxCoord y)
 {
     // TODO
     /*
@@ -30,14 +30,14 @@ void Crosshair::Draw(wxDC &dc, wxRect rcData)//, wxCoord x, wxCoord y)
     */
 }
 
-void Crosshair::ChartMouseDown(wxPoint &pt, int key)
+void Crosshair::ChartMouseDown(wxPoint& WXUNUSED(pt), int WXUNUSED(key))
 {
 }
 
-void Crosshair::ChartMouseUp(wxPoint &pt, int key)
+void Crosshair::ChartMouseUp(wxPoint& WXUNUSED(pt), int WXUNUSED(key))
 {
 }
 
-void Crosshair::ChartMouseMove(wxPoint &pt)
+void Crosshair::ChartMouseMove(wxPoint& WXUNUSED(pt))
 {
 }

src/dataset.cpp

@@ -145,8 +145,13 @@ void DatasetArray::Add(Dataset *dataset)
 
 void DatasetArray::Remove(Dataset *dataset)
 {
-    SAFE_UNREF(dataset);
-    DatasetArrayBase::Remove(dataset);
+    for (size_t n = 0; n < Count(); n++) {
+        if (dataset == Item(n)) {
+            SAFE_UNREF(dataset);
+            DatasetArrayBase::RemoveAt(n);
+            break;
+        }
+    }
 }
 
 void DatasetArray::RemoveAt(size_t index, size_t count)

src/xy/xydynamicdataset.cpp

@@ -96,7 +96,7 @@ void XYDynamicSerie::AddXY(const wxRealPoint& xy)
 
 void XYDynamicSerie::AddXY(const wxRealPointArray& data)
 {
-    WX_APPEND_ARRAY(m_data, data)
+    WX_APPEND_ARRAY(m_data, data);
 
     if (m_dataset != NULL) {
         m_dataset->DatasetChanged();

src/xy/xysimpledataset.cpp

@@ -108,7 +108,11 @@ XYSimpleDataset::~XYSimpleDataset()
 
 void XYSimpleDataset::AddSerie(double *data, size_t count)
 {
-    AddSerie(new XYSerie(data, count));
+    wxVector<wxRealPoint> newdata;
+    for (size_t i = 0; i < count; i++)
+        newdata.push_back(wxRealPoint(data[i * 2], data[(i * 2) + 1]));
+
+    AddSerie(new XYSerie(newdata));
 }
 
 void XYSimpleDataset::AddSerie(XYSerie *serie)