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

deps/wxWidgets/wxWidgets.cmake

@@ -19,6 +19,7 @@ prusaslicer_add_cmake_project(wxWidgets
         -DwxBUILD_PRECOMP=ON
         ${_wx_toolkit}
         "-DCMAKE_DEBUG_POSTFIX:STRING="
+        -DwxBUILD_DEBUG_LEVEL=0
         -DwxUSE_DETECT_SM=OFF
         -DwxUSE_UNICODE=ON
         -DwxUSE_OPENGL=ON

src/slic3r/GUI/GUI_Utils.cpp

@@ -134,11 +134,8 @@ wxFont get_default_font_for_dpi(int dpi)
         NONCLIENTMETRICS nm;
         memset(&nm, 0, sizeof(NONCLIENTMETRICS));
         nm.cbSize = sizeof(NONCLIENTMETRICS);
-		if (SystemParametersInfoForDpi_fn(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &nm, 0, dpi)) {
-            wxNativeFontInfo info;
-            info.lf = nm.lfMessageFont;
-            return wxFont(info);
-        }
+        if (SystemParametersInfoForDpi_fn(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &nm, 0, dpi))
+            return wxFont(wxNativeFontInfo(nm.lfMessageFont));
     }
     // Then try to guesstimate the font DPI scaling on Windows 8.
     // Let's hope that the font returned by the SystemParametersInfo(), which is used by wxWidgets internally, makes sense.