Revert Github commit of MacOS testing

NREL · Nov 30, 2021 · 56ccda7 · 56ccda7
1 parent 932027a
commit 56ccda7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/metro.cpp b/src/metro.cpp
@@ -77,8 +77,7 @@ wxMetroThemeProvider::~wxMetroThemeProvider() {
 }
 
 wxFont wxMetroThemeProvider::Font(int style, int size) {
-//    wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-    wxFont font(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT));
+    wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     if (size > 1)
         font.SetPointSize(size);
@@ -92,8 +91,6 @@ wxFont wxMetroThemeProvider::Font(int style, int size) {
     if (wxFontEnumerator::IsValidFacename(face))
         font.SetFaceName(face);
 #else
- //   font.SetFamily(wxFONTFAMILY_MODERN);
-
     if (style == wxMT_SEMIBOLD)
         font.SetWeight(wxFONTWEIGHT_BOLD);
 #endif

diff --git a/src/utils.cpp b/src/utils.cpp
@@ -986,14 +986,11 @@ double wxGetScreenHDScale() {
 
 void wxDevicePPIToScale(const wxSize &ppi, double *xs, double *ys) {
     // don't try to scale on linux...
-//#ifdef __WXGTK__
-//    *xs = *ys = 1.0;
-//#else
-#if defined(__WXMSW__)
+#ifdef __WXGTK__
+    *xs = *ys = 1.0;
+#else
     *xs = ppi.x / DPI_NOMINAL;
     *ys = ppi.y / DPI_NOMINAL;
-#else
-    *xs = *ys = 1.0;
 #endif
 }