Merge branch 'develop' of https://github.com/NREL/wex into develop

NREL · Dec 2, 2020 · 586ec06 · 586ec06
2 parents e7d5e3a + 67bf9ab
commit 586ec06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/codeedit.cpp b/src/codeedit.cpp
@@ -303,6 +303,7 @@ void wxCodeEditCtrl::SetLanguage(Language lang) {
     // first, revert to standard style
     m_lang = NONE;
 
+    SetStyleBits(8);
     SetLayoutCache(wxSTC_CACHE_PAGE);
     SetLexer(wxSTC_LEX_NULL);
 

diff --git a/src/plot/ploutdev.cpp b/src/plot/ploutdev.cpp
@@ -527,7 +527,7 @@ void wxPLGraphicsOutputDevice::TextColour(const wxColour &c) {
     m_textColour = c;
 }
 
-#define FREETYPE_TEXT 1
+//#define FREETYPE_TEXT 1
 #define FT_FONT_FACE_DEFAULT 0
 
 #include <wex/utils.h>