Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Scintilla compilation on CentOS 6 and other older systems

Browse Source 
Closes https://github.com/wxWidgets/wxWidgets/pull/510
This commit is contained in:
VZ
2017-06-28 02:16:11 +02:00
committed by GitHub
parent cd3b1f25ad 147d965f12
commit 30369f03ae
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/stc/gen_iface.py
View File

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

1
src/stc/scintilla/lexers/LexProgress.cxx
View File

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