Several changes and bugfixes to compile the program on linux (ubuntu-xenial-amb64)

1 files changed, 10 insertions, 10 deletions

diff --git a/Project/ControlEditor.cpp b/Project/ControlEditor.cpp
index 0bb6ed5..5b0ab75 100644
--- a/Project/ControlEditor.cpp
+++ b/Project/ControlEditor.cpp
@@ -155,55 +155,55 @@ void ControlEditor::BuildControlElementPanel()
     wxString exePath = exeFileName.GetPath();
 
     ControlElementButton* ioButton = new ControlElementButton(
-        m_panelControlElements, _("In/Out"), wxImage(exePath + "\\..\\data\\images\\control\\io.png"), ID_IO);
+        m_panelControlElements, _("In/Out"), wxImage(exePath + wxFileName::DirName("\\..\\data\\images\\control\\io.png", wxPATH_WIN).GetPath()), ID_IO);
     wrapSizer->Add(ioButton, 0, wxALL, 5);
     ioButton->Bind(wxEVT_LEFT_DOWN, &ControlEditor::LeftClickDown, this);
 
     ControlElementButton* tfButton =
         new ControlElementButton(m_panelControlElements, _("Transfer fcn"),
-                                 wxImage(exePath + "\\..\\data\\images\\control\\transferFunc.png"), ID_TF);
+                                 wxImage(exePath + wxFileName::DirName("\\..\\data\\images\\control\\transferFunc.png", wxPATH_WIN).GetPath()), ID_TF);
     wrapSizer->Add(tfButton, 0, wxALL, 5);
     tfButton->Bind(wxEVT_LEFT_DOWN, &ControlEditor::LeftClickDown, this);
 
     ControlElementButton* sumButton = new ControlElementButton(
-        m_panelControlElements, _("Sum"), wxImage(exePath + "\\..\\data\\images\\control\\sum.png"), ID_SUM);
+        m_panelControlElements, _("Sum"), wxImage(exePath + wxFileName::DirName("\\..\\data\\images\\control\\sum.png", wxPATH_WIN).GetPath()), ID_SUM);
     wrapSizer->Add(sumButton, 0, wxALL, 5);
     sumButton->Bind(wxEVT_LEFT_DOWN, &ControlEditor::LeftClickDown, this);
 
     ControlElementButton* constButton = new ControlElementButton(
-        m_panelControlElements, _("Constant"), wxImage(exePath + "\\..\\data\\images\\control\\value.png"), ID_CONST);
+        m_panelControlElements, _("Constant"), wxImage(exePath + wxFileName::DirName("\\..\\data\\images\\control\\value.png", wxPATH_WIN).GetPath()), ID_CONST);
     wrapSizer->Add(constButton, 0, wxALL, 5);
     constButton->Bind(wxEVT_LEFT_DOWN, &ControlEditor::LeftClickDown, this);
 
     ControlElementButton* gainButton = new ControlElementButton(
-        m_panelControlElements, _("Gain"), wxImage(exePath + "\\..\\data\\images\\control\\gain.png"), ID_GAIN);
+        m_panelControlElements, _("Gain"), wxImage(exePath + wxFileName::DirName("\\..\\data\\images\\control\\gain.png", wxPATH_WIN).GetPath()), ID_GAIN);
     wrapSizer->Add(gainButton, 0, wxALL, 5);
     gainButton->Bind(wxEVT_LEFT_DOWN, &ControlEditor::LeftClickDown, this);
 
     ControlElementButton* limButton =
         new ControlElementButton(m_panelControlElements, _("Limiter"),
-                                 wxImage(exePath + "\\..\\data\\images\\control\\limiter.png"), ID_LIMITER);
+                                 wxImage(exePath + wxFileName::DirName("\\..\\data\\images\\control\\limiter.png", wxPATH_WIN).GetPath()), ID_LIMITER);
     wrapSizer->Add(limButton, 0, wxALL, 5);
     limButton->Bind(wxEVT_LEFT_DOWN, &ControlEditor::LeftClickDown, this);
 
     ControlElementButton* rateLimButton =
         new ControlElementButton(m_panelControlElements, _("Rate limiter"),
-                                 wxImage(exePath + "\\..\\data\\images\\control\\rateLimiter.png"), ID_RATELIM);
+                                 wxImage(exePath + wxFileName::DirName("\\..\\data\\images\\control\\rateLimiter.png", wxPATH_WIN).GetPath()), ID_RATELIM);
     wrapSizer->Add(rateLimButton, 0, wxALL, 5);
     rateLimButton->Bind(wxEVT_LEFT_DOWN, &ControlEditor::LeftClickDown, this);
 
     ControlElementButton* multButton = new ControlElementButton(
-        m_panelControlElements, _("Multiplier"), wxImage(exePath + "\\..\\data\\images\\control\\mult.png"), ID_MULT);
+        m_panelControlElements, _("Multiplier"), wxImage(exePath + wxFileName::DirName("\\..\\data\\images\\control\\mult.png", wxPATH_WIN).GetPath()), ID_MULT);
     wrapSizer->Add(multButton, 0, wxALL, 5);
     multButton->Bind(wxEVT_LEFT_DOWN, &ControlEditor::LeftClickDown, this);
 
     ControlElementButton* divButton = new ControlElementButton(
-        m_panelControlElements, _("Divider"), wxImage(exePath + "\\..\\data\\images\\control\\div.png"), ID_MATH_DIV);
+        m_panelControlElements, _("Divider"), wxImage(exePath + wxFileName::DirName("\\..\\data\\images\\control\\div.png", wxPATH_WIN).GetPath()), ID_MATH_DIV);
     wrapSizer->Add(divButton, 0, wxALL, 5);
     divButton->Bind(wxEVT_LEFT_DOWN, &ControlEditor::LeftClickDown, this);
 
     ControlElementButton* satButton = new ControlElementButton(
-        m_panelControlElements, _("Exponential"), wxImage(exePath + "\\..\\data\\images\\control\\sat.png"), ID_EXP);
+        m_panelControlElements, _("Exponential"), wxImage(exePath + wxFileName::DirName("\\..\\data\\images\\control\\sat.png", wxPATH_WIN).GetPath()), ID_EXP);
     wrapSizer->Add(satButton, 0, wxALL, 5);
     satButton->Bind(wxEVT_LEFT_DOWN, &ControlEditor::LeftClickDown, this);
 }