diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index 868003a45..096fa096e 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -34,7 +34,7 @@ // Enables shortcut keys for gizmos #define ENABLE_GIZMOS_SHORTCUT (1 && ENABLE_1_42_0) // Scene's GUI made using imgui library -#define ENABLE_IMGUI (1 && ENABLE_1_42_0) +#define ENABLE_IMGUI (1 && !__APPLE__ && ENABLE_1_42_0) #endif // _technologies_h_ diff --git a/src/slic3r/GUI/GLGizmo.hpp b/src/slic3r/GUI/GLGizmo.hpp index c3c914d99..2f7b2e208 100644 --- a/src/slic3r/GUI/GLGizmo.hpp +++ b/src/slic3r/GUI/GLGizmo.hpp @@ -139,7 +139,7 @@ public: void render(const GLCanvas3D::Selection& selection) const { on_render(selection); } void render_for_picking(const GLCanvas3D::Selection& selection) const { on_render_for_picking(selection); } -#ifndef ENABLE_IMGUI +#if !ENABLE_IMGUI virtual void create_external_gizmo_widgets(wxWindow *parent); #endif // not ENABLE_IMGUI @@ -485,7 +485,7 @@ private: bool is_mesh_update_necessary() const; void update_mesh(); -#ifndef ENABLE_IMGUI +#if !ENABLE_IMGUI void render_tooltip_texture() const; mutable GLTexture m_tooltip_texture; mutable GLTexture m_reset_texture; @@ -508,7 +508,7 @@ protected: }; -#ifndef ENABLE_IMGUI +#if !ENABLE_IMGUI class GLGizmoCutPanel; #endif // not ENABLE_IMGUI @@ -526,17 +526,17 @@ class GLGizmoCut : public GLGizmoBase bool m_keep_upper; bool m_keep_lower; bool m_rotate_lower; -#ifndef ENABLE_IMGUI +#if !ENABLE_IMGUI GLGizmoCutPanel *m_panel; #endif // not ENABLE_IMGUI public: explicit GLGizmoCut(GLCanvas3D& parent); -#ifndef ENABLE_IMGUI +#if !ENABLE_IMGUI virtual void create_external_gizmo_widgets(wxWindow *parent); #endif // not ENABLE_IMGUI -#ifndef ENABLE_IMGUI +#if !ENABLE_IMGUI #endif // not ENABLE_IMGUI protected: diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 5ef906d29..8791e815b 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -915,7 +915,7 @@ struct Plater::priv // GUI elements wxNotebook *notebook; Sidebar *sidebar; -#ifndef ENABLE_IMGUI +#if !ENABLE_IMGUI wxPanel *panel3d; #endif // not ENABLE_IMGUI wxGLCanvas *canvas3Dwidget; // TODO: Use GLCanvas3D when we can @@ -1043,7 +1043,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) })) , notebook(new wxNotebook(q, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM)) , sidebar(new Sidebar(q)) -#ifdef ENABLE_IMGUI +#if ENABLE_IMGUI , canvas3Dwidget(GLCanvas3DManager::create_wxglcanvas(notebook)) #else , panel3d(new wxPanel(notebook, wxID_ANY)) @@ -1076,7 +1076,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) this->canvas3D = _3DScene::get_canvas(this->canvas3Dwidget); this->canvas3D->allow_multisample(GLCanvas3DManager::can_multisample()); -#ifdef ENABLE_IMGUI +#if ENABLE_IMGUI notebook->AddPage(canvas3Dwidget, _(L("3D"))); #else auto *panel3dsizer = new wxBoxSizer(wxVERTICAL); @@ -1935,7 +1935,7 @@ void Plater::priv::fix_through_netfabb(const int obj_idx) void Plater::priv::on_notebook_changed(wxBookCtrlEvent&) { const auto current_id = notebook->GetCurrentPage()->GetId(); -#ifdef ENABLE_IMGUI +#if ENABLE_IMGUI if (current_id == canvas3Dwidget->GetId()) { #else if (current_id == panel3d->GetId()) {