From 201d7aa5e85797808535dd7098697b3dd2e7f470 Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Fri, 11 Jan 2019 17:06:46 +0100
Subject: [PATCH] Mac: Disable auto window menu, fix upload queue window size

---
 src/slic3r/GUI/MainFrame.cpp        | 4 ++++
 src/slic3r/GUI/PrintHostDialogs.cpp | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index e7b44aab0..bea46682f 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -220,6 +220,10 @@ bool MainFrame::can_delete_all() const
 
 void MainFrame::init_menubar()
 {
+#ifdef __APPLE__
+    wxMenuBar::SetAutoWindowMenu(false);
+#endif
+
     // File menu
     wxMenu* fileMenu = new wxMenu;
     {
diff --git a/src/slic3r/GUI/PrintHostDialogs.cpp b/src/slic3r/GUI/PrintHostDialogs.cpp
index c2a94181e..5790823a1 100644
--- a/src/slic3r/GUI/PrintHostDialogs.cpp
+++ b/src/slic3r/GUI/PrintHostDialogs.cpp
@@ -93,7 +93,8 @@ PrintHostQueueDialog::PrintHostQueueDialog(wxWindow *parent)
 {
     enum { HEIGHT = 800, WIDTH = 400, SPACING = 5 };
 
-    SetMinSize(wxSize(HEIGHT, WIDTH));
+    SetSize(wxSize(HEIGHT, WIDTH));
+    SetSize(GetMinSize());
 
     auto *topsizer = new wxBoxSizer(wxVERTICAL);