Merge branch 'master' of https://github.com/Prusa3d/Slic3r

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()
 

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);