Keep wxSTC_LEX_ASP and _PHP available for now.

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

diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h
index 3a1132d020e6e493c72d55ff8cfecf7c7284d385..c4815d274c84d553b035a39107091d6966362dbc 100644 (file)
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -382,6 +382,10 @@
 #define wxSTC_LEX_CSOUND 74
 #define wxSTC_LEX_FREEBASIC 75
 
+// These are deprecated, STC_LEX_HTML should be used instead.
+#define wxSTC_LEX_ASP 29
+#define wxSTC_LEX_PHP 30
+
 // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 // value assigned in sequence from SCLEX_AUTOMATIC+1.
 #define wxSTC_LEX_AUTOMATIC 1000

diff --git a/contrib/src/stc/scintilla/include/Scintilla.iface b/contrib/src/stc/scintilla/include/Scintilla.iface
index a35f352e923382b56dc5e87085c405c1597221d8..9f7e5c01c9cdfd65d099ee73cd49fed44d155252 100644 (file)
--- a/contrib/src/stc/scintilla/include/Scintilla.iface
+++ b/contrib/src/stc/scintilla/include/Scintilla.iface
@@ -1821,6 +1821,11 @@ val SCLEX_FLAGSHIP=73
 val SCLEX_CSOUND=74
 val SCLEX_FREEBASIC=75
 
+# These are deprecated, STC_LEX_HTML should be used instead.
+val SCLEX_ASP=29
+val SCLEX_PHP=30
+
+
 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 # value assigned in sequence from SCLEX_AUTOMATIC+1.
 val SCLEX_AUTOMATIC=1000

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 3a1132d020e6e493c72d55ff8cfecf7c7284d385..c4815d274c84d553b035a39107091d6966362dbc 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -382,6 +382,10 @@
 #define wxSTC_LEX_CSOUND 74
 #define wxSTC_LEX_FREEBASIC 75
 
+// These are deprecated, STC_LEX_HTML should be used instead.
+#define wxSTC_LEX_ASP 29
+#define wxSTC_LEX_PHP 30
+
 // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 // value assigned in sequence from SCLEX_AUTOMATIC+1.
 #define wxSTC_LEX_AUTOMATIC 1000

diff --git a/src/stc/scintilla/include/Scintilla.iface b/src/stc/scintilla/include/Scintilla.iface
index a35f352e923382b56dc5e87085c405c1597221d8..9f7e5c01c9cdfd65d099ee73cd49fed44d155252 100644 (file)
--- a/src/stc/scintilla/include/Scintilla.iface
+++ b/src/stc/scintilla/include/Scintilla.iface
@@ -1821,6 +1821,11 @@ val SCLEX_FLAGSHIP=73
 val SCLEX_CSOUND=74
 val SCLEX_FREEBASIC=75
 
+# These are deprecated, STC_LEX_HTML should be used instead.
+val SCLEX_ASP=29
+val SCLEX_PHP=30
+
+
 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 # value assigned in sequence from SCLEX_AUTOMATIC+1.
 val SCLEX_AUTOMATIC=1000