From 5b860a2338a8329e119a53fdb9acb08867b24891 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Fri, 23 Aug 2019 13:57:49 +0200
Subject: [PATCH 1/2] Added missed include for OSX build

---
 src/slic3r/GUI/KBShortcutsDialog.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp
index 936a25e22a4..2d5454ce99b 100644
--- a/src/slic3r/GUI/KBShortcutsDialog.cpp
+++ b/src/slic3r/GUI/KBShortcutsDialog.cpp
@@ -3,6 +3,7 @@
 #include "libslic3r/Utils.hpp"
 #include "GUI.hpp"
 #include <wx/scrolwin.h>
+#include <wx/display.h>
 #include "GUI_App.hpp"
 #include "wxExtensions.hpp"
 

From 3ce564a87dde90c2860e3b9855de95654ed63cfe Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Fri, 23 Aug 2019 15:32:47 +0200
Subject: [PATCH 2/2] Fixed assert on Linux

---
 src/slic3r/GUI/Field.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp
index 2bee0018c9e..97a32e74129 100644
--- a/src/slic3r/GUI/Field.cpp
+++ b/src/slic3r/GUI/Field.cpp
@@ -1056,6 +1056,7 @@ void ColourPicker::set_undef_value(wxColourPickerCtrl* field)
     wxButton* btn = dynamic_cast<wxButton*>(field->GetPickerCtrl());
     wxBitmap bmp = btn->GetBitmap();
     wxMemoryDC dc(bmp);
+    if (!dc.IsOk()) return;
     dc.SetTextForeground(*wxWHITE);
     dc.SetFont(wxGetApp().normal_font());