Merge branch 'master' of https://github.com/wxWidgets/wxWidgets

samples/drawing/drawing.cpp

@@ -1788,7 +1788,7 @@ void MyCanvas::Draw(wxDC& pdc)
             return;
         }
 
-        gdc.SetBackground(GetBackgroundColour());
+        gdc.SetBackground(wxBrush(GetBackgroundColour(),wxBRUSHSTYLE_SOLID));
         gdc.SetGraphicsContext(context);
     }
 

src/msw/graphicsd2d.cpp

@@ -2614,7 +2614,7 @@ wxD2DFontData::wxD2DFontData(wxGraphicsRenderer* renderer, ID2D1Factory* d2dFact
     wxCHECK_RET( n > 0, wxS("Failed to obtain font info") );
 
     // Ensure the LOGFONT object contains the correct font face name
-    if (lstrlen(logfont.lfFaceName) == 0)
+    if (logfont.lfFaceName[0] == L'\0')
     {
         // The length of the font name must not exceed LF_FACESIZE TCHARs,
         // including the terminating NULL.

src/stc/gen_iface.py

@@ -72,14 +72,14 @@ FUNC_FOR_CMD = 1
 GENERATE_PROVISIONAL_ITEMS = 0
 
 # No wxSTC value will be generated for the following Scintilla values.
-notMappedSciValues = {
+notMappedSciValues = set([
     'SC_TECHNOLOGY_DIRECTWRITERETAIN',
     'SC_TECHNOLOGY_DIRECTWRITEDC',
     'INDIC0_MASK',
     'INDIC1_MASK',
     'INDIC2_MASK',
     'INDICS_MASK'
-}
+])
 
 # Map some generic typenames to wx types, using return value syntax
 retTypeMap = {

src/stc/scintilla/lexers/LexProgress.cxx

@@ -25,6 +25,7 @@ Differentiate between labels and variables
 #include <string>
 #include <vector>
 #include <map>
+#include <algorithm>
 
 #include "ILexer.h"
 #include "Scintilla.h"