From 24d736f736f62a02a87e115cccf3e78cd52f7561 Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Thu, 24 Jan 2019 11:53:37 +0100
Subject: [PATCH 1/2] PrintHostDialogs: Disable smart substitutions on Mac
---
src/slic3r/GUI/PrintHostDialogs.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/slic3r/GUI/PrintHostDialogs.cpp b/src/slic3r/GUI/PrintHostDialogs.cpp
index 5790823a1..d6b5f3469 100644
--- a/src/slic3r/GUI/PrintHostDialogs.cpp
+++ b/src/slic3r/GUI/PrintHostDialogs.cpp
@@ -30,6 +30,10 @@ PrintHostSendDialog::PrintHostSendDialog(const fs::path &path)
, txt_filename(new wxTextCtrl(this, wxID_ANY, path.filename().wstring()))
, box_print(new wxCheckBox(this, wxID_ANY, _(L("Start printing after upload"))))
{
+#ifdef __APPLE__
+ txt_filename->OSXDisableAllSmartSubstitutions();
+#endif
+
auto *label_dir_hint = new wxStaticText(this, wxID_ANY, _(L("Use forward slashes ( / ) as a directory separator if needed.")));
label_dir_hint->Wrap(CONTENT_WIDTH);
From 28f1a6f2561d915443e20b7e8e911d8821be4c69 Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Thu, 24 Jan 2019 19:58:34 +0100
Subject: [PATCH 2/2] Build: Fix wx-config status message
---
src/CMakeLists.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fd5a735d7..b5948674a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,7 +50,6 @@ if (SLIC3R_GUI)
if(WIN32)
message(STATUS "WXWIN environment set to: $ENV{WXWIN}")
elseif(UNIX)
- message(STATUS "wx-config path: ${wxWidgets_CONFIG_EXECUTABLE}")
set(wxWidgets_USE_UNICODE ON)
if(SLIC3R_STATIC)
set(wxWidgets_USE_STATIC ON)
@@ -72,6 +71,10 @@ if (SLIC3R_GUI)
find_package(wxWidgets 3.1 REQUIRED COMPONENTS base core adv html gl)
endif ()
+ if(UNIX)
+ message(STATUS "wx-config path: ${wxWidgets_CONFIG_EXECUTABLE}")
+ endif()
+
include(${wxWidgets_USE_FILE})
endif()