From 55a9ef31af3fe876bdf9355a506ea71c46307cde Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Thu, 17 Jan 2019 16:47:01 +0100 Subject: [PATCH 1/3] Fix string conversions in PlaceholderParser --- src/libslic3r/PlaceholderParser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libslic3r/PlaceholderParser.cpp b/src/libslic3r/PlaceholderParser.cpp index 42caa999e0f..443b5e8f97c 100644 --- a/src/libslic3r/PlaceholderParser.cpp +++ b/src/libslic3r/PlaceholderParser.cpp @@ -270,9 +270,9 @@ namespace client { std::string out; switch (type) { - case TYPE_BOOL: out = std::to_string(data.b); break; - case TYPE_INT: out = std::to_string(data.i); break; - case TYPE_DOUBLE: out = std::to_string(data.d); break; + case TYPE_BOOL: out = boost::lexical_cast(data.b); break; + case TYPE_INT: out = boost::lexical_cast(data.i); break; + case TYPE_DOUBLE: out = boost::lexical_cast(data.d); break; case TYPE_STRING: out = *data.s; break; default: break; } From 759868c1a555276da3f6be8b0fc09144ae643b98 Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Thu, 17 Jan 2019 16:10:32 +0100 Subject: [PATCH 2/3] Fix build against wx 3.1.2 on Windows --- src/slic3r/GUI/wxExtensions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index 096db2c5f2c..52eb3180dd3 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -288,7 +288,7 @@ bool PrusaCollapsiblePaneMSW::Create(wxWindow *parent, wxWindowID id, const wxSt { if (!wxControl::Create(parent, id, pos, size, style, val, name)) return false; - m_pStaticLine = NULL; + // m_pStaticLine = NULL; m_strLabel = label; // sizer containing the expand button and possibly a static line From e7ce7e4ae0373242553924cdbeeab9fbd28d1499 Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Thu, 17 Jan 2019 19:00:08 +0100 Subject: [PATCH 3/3] Revert "Fix string conversions in PlaceholderParser" This reverts commit 570cc6e16710ccade37e7c02223bae8d856d12f0. Not an improvement --- src/libslic3r/PlaceholderParser.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libslic3r/PlaceholderParser.cpp b/src/libslic3r/PlaceholderParser.cpp index 443b5e8f97c..42caa999e0f 100644 --- a/src/libslic3r/PlaceholderParser.cpp +++ b/src/libslic3r/PlaceholderParser.cpp @@ -270,9 +270,9 @@ namespace client { std::string out; switch (type) { - case TYPE_BOOL: out = boost::lexical_cast(data.b); break; - case TYPE_INT: out = boost::lexical_cast(data.i); break; - case TYPE_DOUBLE: out = boost::lexical_cast(data.d); break; + case TYPE_BOOL: out = std::to_string(data.b); break; + case TYPE_INT: out = std::to_string(data.i); break; + case TYPE_DOUBLE: out = std::to_string(data.d); break; case TYPE_STRING: out = *data.s; break; default: break; }