From 47354beacc7e6b8bab07a3564ece53f800e939c3 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sat, 28 Apr 2018 18:53:14 -0500 Subject: [PATCH] Added stdexcept include, convert VAR_ABS_PATH and VAR_REL to wxStrings. --- src/GUI/misc_ui.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/GUI/misc_ui.cpp b/src/GUI/misc_ui.cpp index 8183ec020..c585117b9 100644 --- a/src/GUI/misc_ui.cpp +++ b/src/GUI/misc_ui.cpp @@ -3,6 +3,7 @@ #include #include +#include namespace Slic3r { namespace GUI { @@ -19,9 +20,9 @@ void check_version(bool manual) { const wxString var(const wxString& in) { // TODO replace center string with path to VAR in actual distribution later if (VAR_ABS) { - return VAR_ABS_PATH + "/" + in; + return wxString(VAR_ABS_PATH) + "/" + in; } else { - return bin() + VAR_REL + "/" + in; + return bin() + wxString(VAR_REL) + "/" + in; } }