From c258375fe298083e2d10f270db5039d6ca7e3e04 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Wed, 9 Jan 2019 15:40:12 +0100 Subject: [PATCH] Trying to redefine GUI_App::MacOpenFiles to get events from the Finder --- src/slic3r/GUI/GUI_App.cpp | 11 +++++++++++ src/slic3r/GUI/GUI_App.hpp | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index ce7ea8bac..b2282a5ee 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -742,6 +742,17 @@ void GUI_App::load_current_presets() } } +#ifdef __APPLE__ +// wxWidgets override to get an event on open files. +void GUI_App::MacOpenFiles(const wxArrayString &fileNames) +{ + std::vector files; + for (size_t i = 0; i < fileNames.Len(); ++ i) + files.emplace_back(fileNames[i].ToUTF8().data()); + this->plater()->load_files(files, true, true); +} +#endif /* __APPLE */ + Sidebar& GUI_App::sidebar() { return plater_->sidebar(); diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index e388910d7..4944bbd2d 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -144,6 +144,11 @@ public: void delete_tab_from_list(Tab* tab); void load_current_presets(); +#ifdef __APPLE__ + // wxWidgets override to get an event on open files. + void MacOpenFiles(const wxArrayString &fileNames) override; +#endif /* __APPLE */ + Sidebar& sidebar(); ObjectManipulation* obj_manipul(); ObjectSettings* obj_settings();