wxPython updates for new wxSTC

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/CHANGES.txt b/wxPython/CHANGES.txt
index 1d0da2e49d1428c6be066f309d130bb1ef28145c..d4eae525cbb8f9fda60d936ec6519fc6e6cf7644 100644 (file)
--- a/wxPython/CHANGES.txt
+++ b/wxPython/CHANGES.txt
@@ -29,7 +29,7 @@ resource.  The name of the new "constructor" is the original name of
 the class with a "Pre" in it.  For example, wxPreWindow, wxPreFrame,
 etc.
 
 the class with a "Pre" in it.  For example, wxPreWindow, wxPreFrame,
 etc.
 

-Updated to version 1.39 of Scintilla and updated wxStyledTextCtrl
+Updated to version 1.40 of Scintilla and updated wxStyledTextCtrl

 accordingly.
 
 Updated wxColumnSorterMixin to also be able to place sort icons on the
 accordingly.
 
 Updated wxColumnSorterMixin to also be able to place sort icons on the

diff --git a/wxPython/contrib/stc/stc_.cpp b/wxPython/contrib/stc/stc_.cpp
index e6ba8c3dfcb52280774f714e1a9ee6255a56e813..e3c1b1e79c4470489622bf0b350a98353bea2787 100644 (file)
--- a/wxPython/contrib/stc/stc_.cpp
+++ b/wxPython/contrib/stc/stc_.cpp
@@ -10273,6 +10273,7 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxSTC_MARK_CIRCLEPLUSCONNECTED", PyInt_FromLong((long) 19));
         PyDict_SetItemString(d,"wxSTC_MARK_CIRCLEMINUS", PyInt_FromLong((long) 20));
         PyDict_SetItemString(d,"wxSTC_MARK_CIRCLEMINUSCONNECTED", PyInt_FromLong((long) 21));
         PyDict_SetItemString(d,"wxSTC_MARK_CIRCLEPLUSCONNECTED", PyInt_FromLong((long) 19));
         PyDict_SetItemString(d,"wxSTC_MARK_CIRCLEMINUS", PyInt_FromLong((long) 20));
         PyDict_SetItemString(d,"wxSTC_MARK_CIRCLEMINUSCONNECTED", PyInt_FromLong((long) 21));

+        PyDict_SetItemString(d,"wxSTC_MARK_CHARACTER", PyInt_FromLong((long) 10000));

         PyDict_SetItemString(d,"wxSTC_MARKNUM_FOLDEREND", PyInt_FromLong((long) 25));
         PyDict_SetItemString(d,"wxSTC_MARKNUM_FOLDEROPENMID", PyInt_FromLong((long) 26));
         PyDict_SetItemString(d,"wxSTC_MARKNUM_FOLDERMIDTAIL", PyInt_FromLong((long) 27));
         PyDict_SetItemString(d,"wxSTC_MARKNUM_FOLDEREND", PyInt_FromLong((long) 25));
         PyDict_SetItemString(d,"wxSTC_MARKNUM_FOLDEROPENMID", PyInt_FromLong((long) 26));
         PyDict_SetItemString(d,"wxSTC_MARKNUM_FOLDERMIDTAIL", PyInt_FromLong((long) 27));


@@ -10288,6 +10289,7 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxSTC_STYLE_BRACEBAD", PyInt_FromLong((long) 35));
         PyDict_SetItemString(d,"wxSTC_STYLE_CONTROLCHAR", PyInt_FromLong((long) 36));
         PyDict_SetItemString(d,"wxSTC_STYLE_INDENTGUIDE", PyInt_FromLong((long) 37));
         PyDict_SetItemString(d,"wxSTC_STYLE_BRACEBAD", PyInt_FromLong((long) 35));
         PyDict_SetItemString(d,"wxSTC_STYLE_CONTROLCHAR", PyInt_FromLong((long) 36));
         PyDict_SetItemString(d,"wxSTC_STYLE_INDENTGUIDE", PyInt_FromLong((long) 37));

+        PyDict_SetItemString(d,"wxSTC_STYLE_LASTPREDEFINED", PyInt_FromLong((long) 39));

         PyDict_SetItemString(d,"wxSTC_STYLE_MAX", PyInt_FromLong((long) 127));
         PyDict_SetItemString(d,"wxSTC_CHARSET_ANSI", PyInt_FromLong((long) 0));
         PyDict_SetItemString(d,"wxSTC_CHARSET_DEFAULT", PyInt_FromLong((long) 1));
         PyDict_SetItemString(d,"wxSTC_STYLE_MAX", PyInt_FromLong((long) 127));
         PyDict_SetItemString(d,"wxSTC_CHARSET_ANSI", PyInt_FromLong((long) 0));
         PyDict_SetItemString(d,"wxSTC_CHARSET_DEFAULT", PyInt_FromLong((long) 1));


@@ -10453,6 +10455,7 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxSTC_LEX_EIFFEL", PyInt_FromLong((long) 23));
         PyDict_SetItemString(d,"wxSTC_LEX_EIFFELKW", PyInt_FromLong((long) 24));
         PyDict_SetItemString(d,"wxSTC_LEX_TCL", PyInt_FromLong((long) 25));
         PyDict_SetItemString(d,"wxSTC_LEX_EIFFEL", PyInt_FromLong((long) 23));
         PyDict_SetItemString(d,"wxSTC_LEX_EIFFELKW", PyInt_FromLong((long) 24));
         PyDict_SetItemString(d,"wxSTC_LEX_TCL", PyInt_FromLong((long) 25));

+        PyDict_SetItemString(d,"wxSTC_LEX_NNCRONTAB", PyInt_FromLong((long) 26));

         PyDict_SetItemString(d,"wxSTC_LEX_AUTOMATIC", PyInt_FromLong((long) 1000));
         PyDict_SetItemString(d,"wxSTC_P_DEFAULT", PyInt_FromLong((long) 0));
         PyDict_SetItemString(d,"wxSTC_P_COMMENTLINE", PyInt_FromLong((long) 1));
         PyDict_SetItemString(d,"wxSTC_LEX_AUTOMATIC", PyInt_FromLong((long) 1000));
         PyDict_SetItemString(d,"wxSTC_P_DEFAULT", PyInt_FromLong((long) 0));
         PyDict_SetItemString(d,"wxSTC_P_COMMENTLINE", PyInt_FromLong((long) 1));


@@ -10485,6 +10488,8 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxSTC_C_REGEX", PyInt_FromLong((long) 14));
         PyDict_SetItemString(d,"wxSTC_C_COMMENTLINEDOC", PyInt_FromLong((long) 15));
         PyDict_SetItemString(d,"wxSTC_C_WORD2", PyInt_FromLong((long) 16));
         PyDict_SetItemString(d,"wxSTC_C_REGEX", PyInt_FromLong((long) 14));
         PyDict_SetItemString(d,"wxSTC_C_COMMENTLINEDOC", PyInt_FromLong((long) 15));
         PyDict_SetItemString(d,"wxSTC_C_WORD2", PyInt_FromLong((long) 16));

+        PyDict_SetItemString(d,"wxSTC_C_COMMENTDOCKEYWORD", PyInt_FromLong((long) 17));
+        PyDict_SetItemString(d,"wxSTC_C_COMMENTDOCKEYWORDERROR", PyInt_FromLong((long) 18));

         PyDict_SetItemString(d,"wxSTC_H_DEFAULT", PyInt_FromLong((long) 0));
         PyDict_SetItemString(d,"wxSTC_H_TAG", PyInt_FromLong((long) 1));
         PyDict_SetItemString(d,"wxSTC_H_TAGUNKNOWN", PyInt_FromLong((long) 2));
         PyDict_SetItemString(d,"wxSTC_H_DEFAULT", PyInt_FromLong((long) 0));
         PyDict_SetItemString(d,"wxSTC_H_TAG", PyInt_FromLong((long) 1));
         PyDict_SetItemString(d,"wxSTC_H_TAGUNKNOWN", PyInt_FromLong((long) 2));


@@ -10506,7 +10511,17 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxSTC_H_QUESTION", PyInt_FromLong((long) 18));
         PyDict_SetItemString(d,"wxSTC_H_VALUE", PyInt_FromLong((long) 19));
         PyDict_SetItemString(d,"wxSTC_H_XCCOMMENT", PyInt_FromLong((long) 20));
         PyDict_SetItemString(d,"wxSTC_H_QUESTION", PyInt_FromLong((long) 18));
         PyDict_SetItemString(d,"wxSTC_H_VALUE", PyInt_FromLong((long) 19));
         PyDict_SetItemString(d,"wxSTC_H_XCCOMMENT", PyInt_FromLong((long) 20));

-        PyDict_SetItemString(d,"wxSTC_H_SGML", PyInt_FromLong((long) 21));
+        PyDict_SetItemString(d,"wxSTC_H_SGML_DEFAULT", PyInt_FromLong((long) 21));
+        PyDict_SetItemString(d,"wxSTC_H_SGML_COMMAND", PyInt_FromLong((long) 22));
+        PyDict_SetItemString(d,"wxSTC_H_SGML_1ST_PARAM", PyInt_FromLong((long) 23));
+        PyDict_SetItemString(d,"wxSTC_H_SGML_DOUBLESTRING", PyInt_FromLong((long) 24));
+        PyDict_SetItemString(d,"wxSTC_H_SGML_SIMPLESTRING", PyInt_FromLong((long) 25));
+        PyDict_SetItemString(d,"wxSTC_H_SGML_ERROR", PyInt_FromLong((long) 26));
+        PyDict_SetItemString(d,"wxSTC_H_SGML_SPECIAL", PyInt_FromLong((long) 27));
+        PyDict_SetItemString(d,"wxSTC_H_SGML_ENTITY", PyInt_FromLong((long) 28));
+        PyDict_SetItemString(d,"wxSTC_H_SGML_COMMENT", PyInt_FromLong((long) 29));
+        PyDict_SetItemString(d,"wxSTC_H_SGML_1ST_PARAM_COMMENT", PyInt_FromLong((long) 30));
+        PyDict_SetItemString(d,"wxSTC_H_SGML_BLOCK_DEFAULT", PyInt_FromLong((long) 31));

         PyDict_SetItemString(d,"wxSTC_HJ_START", PyInt_FromLong((long) 40));
         PyDict_SetItemString(d,"wxSTC_HJ_DEFAULT", PyInt_FromLong((long) 41));
         PyDict_SetItemString(d,"wxSTC_HJ_COMMENT", PyInt_FromLong((long) 42));
         PyDict_SetItemString(d,"wxSTC_HJ_START", PyInt_FromLong((long) 40));
         PyDict_SetItemString(d,"wxSTC_HJ_DEFAULT", PyInt_FromLong((long) 41));
         PyDict_SetItemString(d,"wxSTC_HJ_COMMENT", PyInt_FromLong((long) 42));


@@ -10708,6 +10723,17 @@ SWIGEXPORT(void) initstc_c() {
         PyDict_SetItemString(d,"wxSTC_EIFFEL_OPERATOR", PyInt_FromLong((long) 6));
         PyDict_SetItemString(d,"wxSTC_EIFFEL_IDENTIFIER", PyInt_FromLong((long) 7));
         PyDict_SetItemString(d,"wxSTC_EIFFEL_STRINGEOL", PyInt_FromLong((long) 8));
         PyDict_SetItemString(d,"wxSTC_EIFFEL_OPERATOR", PyInt_FromLong((long) 6));
         PyDict_SetItemString(d,"wxSTC_EIFFEL_IDENTIFIER", PyInt_FromLong((long) 7));
         PyDict_SetItemString(d,"wxSTC_EIFFEL_STRINGEOL", PyInt_FromLong((long) 8));

+        PyDict_SetItemString(d,"wxSTC_NNCRONTAB_DEFAULT", PyInt_FromLong((long) 0));
+        PyDict_SetItemString(d,"wxSTC_NNCRONTAB_COMMENT", PyInt_FromLong((long) 1));
+        PyDict_SetItemString(d,"wxSTC_NNCRONTAB_TASK", PyInt_FromLong((long) 2));
+        PyDict_SetItemString(d,"wxSTC_NNCRONTAB_SECTION", PyInt_FromLong((long) 3));
+        PyDict_SetItemString(d,"wxSTC_NNCRONTAB_KEYWORD", PyInt_FromLong((long) 4));
+        PyDict_SetItemString(d,"wxSTC_NNCRONTAB_MODIFIER", PyInt_FromLong((long) 5));
+        PyDict_SetItemString(d,"wxSTC_NNCRONTAB_ASTERISK", PyInt_FromLong((long) 6));
+        PyDict_SetItemString(d,"wxSTC_NNCRONTAB_NUMBER", PyInt_FromLong((long) 7));
+        PyDict_SetItemString(d,"wxSTC_NNCRONTAB_STRING", PyInt_FromLong((long) 8));
+        PyDict_SetItemString(d,"wxSTC_NNCRONTAB_ENVIRONMENT", PyInt_FromLong((long) 9));
+        PyDict_SetItemString(d,"wxSTC_NNCRONTAB_IDENTIFIER", PyInt_FromLong((long) 10));

         PyDict_SetItemString(d,"wxSTC_MASK_FOLDERS", PyInt_FromLong((long) ((1<<(30))|(1<<(31)))));
         PyDict_SetItemString(d,"wxSTCNameStr", PyString_FromString("wxSTCNameStr"));
         PyDict_SetItemString(d,"wxEVT_STC_CHANGE", PyInt_FromLong((long) wxEVT_STC_CHANGE));
         PyDict_SetItemString(d,"wxSTC_MASK_FOLDERS", PyInt_FromLong((long) ((1<<(30))|(1<<(31)))));
         PyDict_SetItemString(d,"wxSTCNameStr", PyString_FromString("wxSTCNameStr"));
         PyDict_SetItemString(d,"wxEVT_STC_CHANGE", PyInt_FromLong((long) wxEVT_STC_CHANGE));

diff --git a/wxPython/contrib/stc/stc_.py b/wxPython/contrib/stc/stc_.py
index 963bbe58ec9148900c6f85ac15ec7f6540f44a4b..7fd978d5a0c449cae0f505ed2d61e9c58e459bfb 100644 (file)
--- a/wxPython/contrib/stc/stc_.py
+++ b/wxPython/contrib/stc/stc_.py
@@ -1111,6 +1111,7 @@ wxSTC_MARK_CIRCLEPLUS = stc_c.wxSTC_MARK_CIRCLEPLUS
 wxSTC_MARK_CIRCLEPLUSCONNECTED = stc_c.wxSTC_MARK_CIRCLEPLUSCONNECTED
 wxSTC_MARK_CIRCLEMINUS = stc_c.wxSTC_MARK_CIRCLEMINUS
 wxSTC_MARK_CIRCLEMINUSCONNECTED = stc_c.wxSTC_MARK_CIRCLEMINUSCONNECTED
 wxSTC_MARK_CIRCLEPLUSCONNECTED = stc_c.wxSTC_MARK_CIRCLEPLUSCONNECTED
 wxSTC_MARK_CIRCLEMINUS = stc_c.wxSTC_MARK_CIRCLEMINUS
 wxSTC_MARK_CIRCLEMINUSCONNECTED = stc_c.wxSTC_MARK_CIRCLEMINUSCONNECTED

+wxSTC_MARK_CHARACTER = stc_c.wxSTC_MARK_CHARACTER

 wxSTC_MARKNUM_FOLDEREND = stc_c.wxSTC_MARKNUM_FOLDEREND
 wxSTC_MARKNUM_FOLDEROPENMID = stc_c.wxSTC_MARKNUM_FOLDEROPENMID
 wxSTC_MARKNUM_FOLDERMIDTAIL = stc_c.wxSTC_MARKNUM_FOLDERMIDTAIL
 wxSTC_MARKNUM_FOLDEREND = stc_c.wxSTC_MARKNUM_FOLDEREND
 wxSTC_MARKNUM_FOLDEROPENMID = stc_c.wxSTC_MARKNUM_FOLDEROPENMID
 wxSTC_MARKNUM_FOLDERMIDTAIL = stc_c.wxSTC_MARKNUM_FOLDERMIDTAIL


@@ -1126,6 +1127,7 @@ wxSTC_STYLE_BRACELIGHT = stc_c.wxSTC_STYLE_BRACELIGHT
 wxSTC_STYLE_BRACEBAD = stc_c.wxSTC_STYLE_BRACEBAD
 wxSTC_STYLE_CONTROLCHAR = stc_c.wxSTC_STYLE_CONTROLCHAR
 wxSTC_STYLE_INDENTGUIDE = stc_c.wxSTC_STYLE_INDENTGUIDE
 wxSTC_STYLE_BRACEBAD = stc_c.wxSTC_STYLE_BRACEBAD
 wxSTC_STYLE_CONTROLCHAR = stc_c.wxSTC_STYLE_CONTROLCHAR
 wxSTC_STYLE_INDENTGUIDE = stc_c.wxSTC_STYLE_INDENTGUIDE

+wxSTC_STYLE_LASTPREDEFINED = stc_c.wxSTC_STYLE_LASTPREDEFINED

 wxSTC_STYLE_MAX = stc_c.wxSTC_STYLE_MAX
 wxSTC_CHARSET_ANSI = stc_c.wxSTC_CHARSET_ANSI
 wxSTC_CHARSET_DEFAULT = stc_c.wxSTC_CHARSET_DEFAULT
 wxSTC_STYLE_MAX = stc_c.wxSTC_STYLE_MAX
 wxSTC_CHARSET_ANSI = stc_c.wxSTC_CHARSET_ANSI
 wxSTC_CHARSET_DEFAULT = stc_c.wxSTC_CHARSET_DEFAULT


@@ -1291,6 +1293,7 @@ wxSTC_LEX_RUBY = stc_c.wxSTC_LEX_RUBY
 wxSTC_LEX_EIFFEL = stc_c.wxSTC_LEX_EIFFEL
 wxSTC_LEX_EIFFELKW = stc_c.wxSTC_LEX_EIFFELKW
 wxSTC_LEX_TCL = stc_c.wxSTC_LEX_TCL
 wxSTC_LEX_EIFFEL = stc_c.wxSTC_LEX_EIFFEL
 wxSTC_LEX_EIFFELKW = stc_c.wxSTC_LEX_EIFFELKW
 wxSTC_LEX_TCL = stc_c.wxSTC_LEX_TCL

+wxSTC_LEX_NNCRONTAB = stc_c.wxSTC_LEX_NNCRONTAB

 wxSTC_LEX_AUTOMATIC = stc_c.wxSTC_LEX_AUTOMATIC
 wxSTC_P_DEFAULT = stc_c.wxSTC_P_DEFAULT
 wxSTC_P_COMMENTLINE = stc_c.wxSTC_P_COMMENTLINE
 wxSTC_LEX_AUTOMATIC = stc_c.wxSTC_LEX_AUTOMATIC
 wxSTC_P_DEFAULT = stc_c.wxSTC_P_DEFAULT
 wxSTC_P_COMMENTLINE = stc_c.wxSTC_P_COMMENTLINE


@@ -1323,6 +1326,8 @@ wxSTC_C_VERBATIM = stc_c.wxSTC_C_VERBATIM
 wxSTC_C_REGEX = stc_c.wxSTC_C_REGEX
 wxSTC_C_COMMENTLINEDOC = stc_c.wxSTC_C_COMMENTLINEDOC
 wxSTC_C_WORD2 = stc_c.wxSTC_C_WORD2
 wxSTC_C_REGEX = stc_c.wxSTC_C_REGEX
 wxSTC_C_COMMENTLINEDOC = stc_c.wxSTC_C_COMMENTLINEDOC
 wxSTC_C_WORD2 = stc_c.wxSTC_C_WORD2

+wxSTC_C_COMMENTDOCKEYWORD = stc_c.wxSTC_C_COMMENTDOCKEYWORD
+wxSTC_C_COMMENTDOCKEYWORDERROR = stc_c.wxSTC_C_COMMENTDOCKEYWORDERROR

 wxSTC_H_DEFAULT = stc_c.wxSTC_H_DEFAULT
 wxSTC_H_TAG = stc_c.wxSTC_H_TAG
 wxSTC_H_TAGUNKNOWN = stc_c.wxSTC_H_TAGUNKNOWN
 wxSTC_H_DEFAULT = stc_c.wxSTC_H_DEFAULT
 wxSTC_H_TAG = stc_c.wxSTC_H_TAG
 wxSTC_H_TAGUNKNOWN = stc_c.wxSTC_H_TAGUNKNOWN


@@ -1344,7 +1349,17 @@ wxSTC_H_CDATA = stc_c.wxSTC_H_CDATA
 wxSTC_H_QUESTION = stc_c.wxSTC_H_QUESTION
 wxSTC_H_VALUE = stc_c.wxSTC_H_VALUE
 wxSTC_H_XCCOMMENT = stc_c.wxSTC_H_XCCOMMENT
 wxSTC_H_QUESTION = stc_c.wxSTC_H_QUESTION
 wxSTC_H_VALUE = stc_c.wxSTC_H_VALUE
 wxSTC_H_XCCOMMENT = stc_c.wxSTC_H_XCCOMMENT

-wxSTC_H_SGML = stc_c.wxSTC_H_SGML
+wxSTC_H_SGML_DEFAULT = stc_c.wxSTC_H_SGML_DEFAULT
+wxSTC_H_SGML_COMMAND = stc_c.wxSTC_H_SGML_COMMAND
+wxSTC_H_SGML_1ST_PARAM = stc_c.wxSTC_H_SGML_1ST_PARAM
+wxSTC_H_SGML_DOUBLESTRING = stc_c.wxSTC_H_SGML_DOUBLESTRING
+wxSTC_H_SGML_SIMPLESTRING = stc_c.wxSTC_H_SGML_SIMPLESTRING
+wxSTC_H_SGML_ERROR = stc_c.wxSTC_H_SGML_ERROR
+wxSTC_H_SGML_SPECIAL = stc_c.wxSTC_H_SGML_SPECIAL
+wxSTC_H_SGML_ENTITY = stc_c.wxSTC_H_SGML_ENTITY
+wxSTC_H_SGML_COMMENT = stc_c.wxSTC_H_SGML_COMMENT
+wxSTC_H_SGML_1ST_PARAM_COMMENT = stc_c.wxSTC_H_SGML_1ST_PARAM_COMMENT
+wxSTC_H_SGML_BLOCK_DEFAULT = stc_c.wxSTC_H_SGML_BLOCK_DEFAULT

 wxSTC_HJ_START = stc_c.wxSTC_HJ_START
 wxSTC_HJ_DEFAULT = stc_c.wxSTC_HJ_DEFAULT
 wxSTC_HJ_COMMENT = stc_c.wxSTC_HJ_COMMENT
 wxSTC_HJ_START = stc_c.wxSTC_HJ_START
 wxSTC_HJ_DEFAULT = stc_c.wxSTC_HJ_DEFAULT
 wxSTC_HJ_COMMENT = stc_c.wxSTC_HJ_COMMENT


@@ -1546,6 +1561,17 @@ wxSTC_EIFFEL_CHARACTER = stc_c.wxSTC_EIFFEL_CHARACTER
 wxSTC_EIFFEL_OPERATOR = stc_c.wxSTC_EIFFEL_OPERATOR
 wxSTC_EIFFEL_IDENTIFIER = stc_c.wxSTC_EIFFEL_IDENTIFIER
 wxSTC_EIFFEL_STRINGEOL = stc_c.wxSTC_EIFFEL_STRINGEOL
 wxSTC_EIFFEL_OPERATOR = stc_c.wxSTC_EIFFEL_OPERATOR
 wxSTC_EIFFEL_IDENTIFIER = stc_c.wxSTC_EIFFEL_IDENTIFIER
 wxSTC_EIFFEL_STRINGEOL = stc_c.wxSTC_EIFFEL_STRINGEOL

+wxSTC_NNCRONTAB_DEFAULT = stc_c.wxSTC_NNCRONTAB_DEFAULT
+wxSTC_NNCRONTAB_COMMENT = stc_c.wxSTC_NNCRONTAB_COMMENT
+wxSTC_NNCRONTAB_TASK = stc_c.wxSTC_NNCRONTAB_TASK
+wxSTC_NNCRONTAB_SECTION = stc_c.wxSTC_NNCRONTAB_SECTION
+wxSTC_NNCRONTAB_KEYWORD = stc_c.wxSTC_NNCRONTAB_KEYWORD
+wxSTC_NNCRONTAB_MODIFIER = stc_c.wxSTC_NNCRONTAB_MODIFIER
+wxSTC_NNCRONTAB_ASTERISK = stc_c.wxSTC_NNCRONTAB_ASTERISK
+wxSTC_NNCRONTAB_NUMBER = stc_c.wxSTC_NNCRONTAB_NUMBER
+wxSTC_NNCRONTAB_STRING = stc_c.wxSTC_NNCRONTAB_STRING
+wxSTC_NNCRONTAB_ENVIRONMENT = stc_c.wxSTC_NNCRONTAB_ENVIRONMENT
+wxSTC_NNCRONTAB_IDENTIFIER = stc_c.wxSTC_NNCRONTAB_IDENTIFIER

 wxSTC_MASK_FOLDERS = stc_c.wxSTC_MASK_FOLDERS
 wxSTCNameStr = stc_c.wxSTCNameStr
 wxEVT_STC_CHANGE = stc_c.wxEVT_STC_CHANGE
 wxSTC_MASK_FOLDERS = stc_c.wxSTC_MASK_FOLDERS
 wxSTCNameStr = stc_c.wxSTCNameStr
 wxEVT_STC_CHANGE = stc_c.wxEVT_STC_CHANGE

diff --git a/wxPython/demo/wxStyledTextCtrl_2.py b/wxPython/demo/wxStyledTextCtrl_2.py
index a06337b36136635e8d62d1b03b8be0e54ef87b6d..2b102cc294871cac09d11ce1cf7229995377611c 100644 (file)
--- a/wxPython/demo/wxStyledTextCtrl_2.py
+++ b/wxPython/demo/wxStyledTextCtrl_2.py
@@ -145,7 +145,7 @@ class PythonSTC(wxStyledTextCtrl):
                 kw.append("this_is_a_longer_value")
                 kw.append("this_is_a_much_much_much_much_much_much_much_longer_value")
 
                 kw.append("this_is_a_longer_value")
                 kw.append("this_is_a_much_much_much_much_much_much_much_longer_value")
 

-                kw.reverse()
+                #kw.sort()

 
                 self.AutoCompSetIgnoreCase(true)
                 self.AutoCompShow(0, string.join(kw))
 
                 self.AutoCompSetIgnoreCase(true)
                 self.AutoCompShow(0, string.join(kw))

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 70e273b120f37342b4e8ddfcd40386d5c63769e1..684558bef9bdc9e2a1e7fd718b66ed5e15851cb5 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -556,14 +556,16 @@ if not GL_ONLY and BUILD_STC:
                      '%s/scintilla/src/RESearch.cxx' % STCLOC,
                      '%s/scintilla/src/ScintillaBase.cxx' % STCLOC,
                      '%s/scintilla/src/Style.cxx' % STCLOC,
                      '%s/scintilla/src/RESearch.cxx' % STCLOC,
                      '%s/scintilla/src/ScintillaBase.cxx' % STCLOC,
                      '%s/scintilla/src/Style.cxx' % STCLOC,

+                     '%s/scintilla/src/StyleContext.cxx' % STCLOC,

                      '%s/scintilla/src/UniConversion.cxx' % STCLOC,
                      '%s/scintilla/src/ViewStyle.cxx' % STCLOC,
                      '%s/scintilla/src/WindowAccessor.cxx' % STCLOC,
 
                      '%s/scintilla/src/LexAda.cxx' % STCLOC,
                      '%s/scintilla/src/LexAVE.cxx' % STCLOC,
                      '%s/scintilla/src/UniConversion.cxx' % STCLOC,
                      '%s/scintilla/src/ViewStyle.cxx' % STCLOC,
                      '%s/scintilla/src/WindowAccessor.cxx' % STCLOC,
 
                      '%s/scintilla/src/LexAda.cxx' % STCLOC,
                      '%s/scintilla/src/LexAVE.cxx' % STCLOC,

-                     '%s/scintilla/src/LexConf.cxx' % STCLOC,

                      '%s/scintilla/src/LexCPP.cxx' % STCLOC,
                      '%s/scintilla/src/LexCPP.cxx' % STCLOC,

+                     '%s/scintilla/src/LexConf.cxx' % STCLOC,
+                     '%s/scintilla/src/LexCrontab.cxx' % STCLOC,

                      '%s/scintilla/src/LexEiffel.cxx' % STCLOC,
                      '%s/scintilla/src/LexHTML.cxx' % STCLOC,
                      '%s/scintilla/src/LexLisp.cxx' % STCLOC,
                      '%s/scintilla/src/LexEiffel.cxx' % STCLOC,
                      '%s/scintilla/src/LexHTML.cxx' % STCLOC,
                      '%s/scintilla/src/LexLisp.cxx' % STCLOC,