From adf6f72a1b0f99f82efe689f3f28bd74eae5caaf Mon Sep 17 00:00:00 2001
From: supermerill <merill@free.fr>
Date: Mon, 23 Nov 2020 02:14:28 +0100
Subject: [PATCH] more build fix for arch linux

---
 src/libslic3r/ExPolygon.cpp      | 3 ++-
 src/slic3r/GUI/FreeCADDialog.cpp | 1 -
 src/slic3r/GUI/FreeCADDialog.hpp | 1 +
 src/slic3r/GUI/GCodeViewer.cpp   | 4 ++++
 src/slic3r/GUI/GUI_Preview.cpp   | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/libslic3r/ExPolygon.cpp b/src/libslic3r/ExPolygon.cpp
index 503f7d1ba..4c86a42a9 100644
--- a/src/libslic3r/ExPolygon.cpp
+++ b/src/libslic3r/ExPolygon.cpp
@@ -1,7 +1,8 @@
 #include "BoundingBox.hpp"
 #include "ExPolygon.hpp"
 
-#include "Exception.hpp"#include "MedialAxis.hpp"
+#include "Exception.hpp"
+#include "MedialAxis.hpp"
 #include "Geometry.hpp"
 #include "Polygon.hpp"
 #include "Line.hpp"
diff --git a/src/slic3r/GUI/FreeCADDialog.cpp b/src/slic3r/GUI/FreeCADDialog.cpp
index f2ebc8c42..87356dc04 100644
--- a/src/slic3r/GUI/FreeCADDialog.cpp
+++ b/src/slic3r/GUI/FreeCADDialog.cpp
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 
 #include <wx/wx.h>
-#include <wx/combobox.h>
 #include <wx/scrolwin.h>
 #include <wx/display.h>
 #include <wx/file.h>
diff --git a/src/slic3r/GUI/FreeCADDialog.hpp b/src/slic3r/GUI/FreeCADDialog.hpp
index 22a864e8b..b510617fe 100644
--- a/src/slic3r/GUI/FreeCADDialog.hpp
+++ b/src/slic3r/GUI/FreeCADDialog.hpp
@@ -7,6 +7,7 @@
 
 #include "GUI_App.hpp"
 
+#include <wx/combobox.h>
 #include <wx/gbsizer.h>
 #include <wx/stc/stc.h>
 
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index 3625e5482..bf8df1879 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -20,8 +20,12 @@
 #include <imgui/imgui_internal.h>
 
 #include <GL/glew.h>
+#include <boost/locale/generator.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/cstdio.hpp>
+#include <boost/nowide/fstream.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ini_parser.hpp>
 #include <wx/progdlg.h>
 #include <wx/numformatter.h>
 
diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp
index 8cb52e260..f9716e008 100644
--- a/src/slic3r/GUI/GUI_Preview.cpp
+++ b/src/slic3r/GUI/GUI_Preview.cpp
@@ -216,7 +216,7 @@ bool Preview::init(wxWindow* parent, Model* model)
 #ifdef _WIN32 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 #else
-    SetBackgroundColour(Get*Parent()->GetBackgroundColour());
+    SetBackgroundColour(GetParent()->GetBackgroundColour());
 #endif // _WIN32 
 
     //get display size to see if we have to compress the labels