diff options
| author | Thales Lima <thaleslima.ufu@gmail.com> | 2017-10-21 11:57:45 -0200 |
|---|---|---|
| committer | Thales Lima <thaleslima.ufu@gmail.com> | 2017-10-21 11:57:45 -0200 |
| commit | b1b026397c58c45c46ca7a525fb1e98b20ddfab8 (patch) | |
| tree | 224130696322c70d8296119603b36b7fcee3cc25 /Project/ChartView.cpp | |
| parent | f6a410c1c23bb0cf75d218354cb1f7e21c420fb3 (diff) | |
| download | PSP.git-b1b026397c58c45c46ca7a525fb1e98b20ddfab8.tar.gz PSP.git-b1b026397c58c45c46ca7a525fb1e98b20ddfab8.tar.xz PSP.git-b1b026397c58c45c46ca7a525fb1e98b20ddfab8.zip | |
Several changes and bugfixes to compile the program on linux (ubuntu-xenial-amb64)
Diffstat (limited to 'Project/ChartView.cpp')
| -rw-r--r-- | Project/ChartView.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Project/ChartView.cpp b/Project/ChartView.cpp index 0a5d73c..f1fd600 100644 --- a/Project/ChartView.cpp +++ b/Project/ChartView.cpp @@ -33,7 +33,7 @@ ChartView::ChartView(wxWindow* parent, std::vector<ElementPlotData> epdList, std // Create color property. m_pgPropColor = m_pgMgr->Insert(m_pgPropLineProp, 1, new wxColourProperty(_("Color"))); m_pgPropColor->SetEditor(wxT("ChoiceAndButton")); - m_pgPropColor->SetValue(static_cast<wxVariant>(*wxBLACK)); + m_pgPropColor->SetValue(static_cast<wxVariant>(static_cast<wxAny>(*wxBLACK))); // Set margins and axis limit to composed mode. m_pgPropMargins->SetValue(wxT("<composed>")); @@ -144,7 +144,7 @@ void ChartView::OnPropertyGridChange(wxPropertyGridEvent& event) if(isPlotting) { wxColour colour = GetNextColour(); data->SetColour(colour); - m_pgPropColor->SetValue(static_cast<wxVariant>(colour)); + m_pgPropColor->SetValue(static_cast<wxVariant>(static_cast<wxAny>(colour))); m_treeCtrl->SetItemBold(m_treeCtrl->GetSelection(), true); } else { m_treeCtrl->SetItemBold(m_treeCtrl->GetSelection(), false); @@ -356,7 +356,7 @@ void ChartView::OnTreeItemActivated(wxTreeEvent& event) if(isPlotting) { wxColour colour = GetNextColour(); data->SetColour(colour); - m_pgPropColor->SetValue(static_cast<wxVariant>(colour)); + m_pgPropColor->SetValue(static_cast<wxVariant>(static_cast<wxAny>(colour))); m_treeCtrl->SetItemBold(m_treeCtrl->GetSelection(), true); } else { m_treeCtrl->SetItemBold(m_treeCtrl->GetSelection(), false); |