From 8bf0f75e83846ba2588c75a3f4330175b9a87117 Mon Sep 17 00:00:00 2001
From: Lukas Matena <lukasmatena@seznam.cz>
Date: Wed, 30 Sep 2020 17:33:08 +0200
Subject: [PATCH] Fixed compilation with wxWidgets 3.0
---
src/slic3r/GUI/GCodeViewer.cpp | 2 ++
src/slic3r/GUI/GUI_Utils.hpp | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp
index 0e3378e9a..8ab17717c 100644
--- a/src/slic3r/GUI/GCodeViewer.cpp
+++ b/src/slic3r/GUI/GCodeViewer.cpp
@@ -22,6 +22,8 @@
#include <GL/glew.h>
#include <boost/log/trivial.hpp>
#include <boost/nowide/cstdio.hpp>
+#include <wx/progdlg.h>
+#include <wx/numformatter.h>
#include <array>
#include <algorithm>
diff --git a/src/slic3r/GUI/GUI_Utils.hpp b/src/slic3r/GUI/GUI_Utils.hpp
index a68a0a88a..ad6bca720 100644
--- a/src/slic3r/GUI/GUI_Utils.hpp
+++ b/src/slic3r/GUI/GUI_Utils.hpp
@@ -116,7 +116,7 @@ public:
this->Bind(EVT_DPI_CHANGED_SLICER, [this](const DpiChangedEvent& evt) {
m_scale_factor = (float)evt.dpi / (float)DPI_DEFAULT;
- m_new_font_point_size = get_default_font_for_dpi(evt.dpi).GetPointSize();
+ m_new_font_point_size = get_default_font_for_dpi(this, evt.dpi).GetPointSize();
if (!m_can_rescale)
return;