mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 00:37:51 -06:00
Fixed conflicts after merge with master
This commit is contained in:
commit
5693545d15
71 changed files with 3265 additions and 2634 deletions
|
@ -32,9 +32,9 @@ class PresetUpdater;
|
|||
class ModelObject;
|
||||
class PrintHostJobQueue;
|
||||
|
||||
namespace GUI
|
||||
{
|
||||
|
||||
namespace GUI{
|
||||
class RemovableDriveManager;
|
||||
enum FileType
|
||||
{
|
||||
FT_STL,
|
||||
|
@ -102,6 +102,9 @@ class GUI_App : public wxApp
|
|||
#if ENABLE_NON_STATIC_CANVAS_MANAGER
|
||||
GLCanvas3DManager m_canvas_mgr;
|
||||
#endif // ENABLE_NON_STATIC_CANVAS_MANAGER
|
||||
|
||||
std::unique_ptr<RemovableDriveManager> m_removable_drive_manager;
|
||||
|
||||
std::unique_ptr<ImGuiWrapper> m_imgui;
|
||||
std::unique_ptr<PrintHostJobQueue> m_printhost_job_queue;
|
||||
ConfigWizard* m_wizard; // Managed by wxWindow tree
|
||||
|
@ -192,6 +195,8 @@ public:
|
|||
|
||||
std::vector<Tab *> tabs_list;
|
||||
|
||||
RemovableDriveManager* removable_drive_manager() { return m_removable_drive_manager.get(); }
|
||||
|
||||
ImGuiWrapper* imgui() { return m_imgui.get(); }
|
||||
|
||||
PrintHostJobQueue& printhost_job_queue() { return *m_printhost_job_queue.get(); }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue