Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer

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());
 

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"