Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / stc / stc.h

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 7e314a10f90b2f3f5b536d9f78f671027fd9894f..434783c223b5d28deba4fa5a480934a8e6027de1 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -12,7 +12,6 @@
 // Author:      Robin Dunn
 //
 // Created:     13-Jan-2000
 // Author:      Robin Dunn
 //
 // Created:     13-Jan-2000

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -56,14 +55,13 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #endif
 #endif
 
 #endif
 #endif
 

-

 //----------------------------------------------------------------------
 // STC constants generated section {{{
 
 #define wxSTC_INVALID_POSITION -1
 
 //----------------------------------------------------------------------
 // STC constants generated section {{{
 
 #define wxSTC_INVALID_POSITION -1
 

-// Define start of Scintilla messages to be greater than all Windows edit (EM_*) messages
-// as many EM_ messages can be used although that use is deprecated.
+/// Define start of Scintilla messages to be greater than all Windows edit (EM_*) messages
+/// as many EM_ messages can be used although that use is deprecated.

 #define wxSTC_START 2000
 #define wxSTC_OPTIONAL_START 3000
 #define wxSTC_LEXER_START 4000
 #define wxSTC_START 2000
 #define wxSTC_OPTIONAL_START 3000
 #define wxSTC_LEXER_START 4000


@@ -74,12 +72,9 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_EOL_CR 1
 #define wxSTC_EOL_LF 2
 
 #define wxSTC_EOL_CR 1
 #define wxSTC_EOL_LF 2
 

-// The SC_CP_UTF8 value can be used to enter Unicode mode.
-// This is the same value as CP_UTF8 in Windows
+/// The SC_CP_UTF8 value can be used to enter Unicode mode.
+/// This is the same value as CP_UTF8 in Windows

 #define wxSTC_CP_UTF8 65001
 #define wxSTC_CP_UTF8 65001

-
-// The SC_CP_DBCS value can be used to indicate a DBCS mode for GTK+.
-#define wxSTC_CP_DBCS 1

 #define wxSTC_MARKER_MAX 31
 #define wxSTC_MARK_CIRCLE 0
 #define wxSTC_MARK_ROUNDRECT 1
 #define wxSTC_MARKER_MAX 31
 #define wxSTC_MARK_CIRCLE 0
 #define wxSTC_MARK_ROUNDRECT 1


@@ -91,7 +86,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MARK_MINUS 7
 #define wxSTC_MARK_PLUS 8
 
 #define wxSTC_MARK_MINUS 7
 #define wxSTC_MARK_PLUS 8
 

-// Shapes used for outlining column.
+/// Shapes used for outlining column.

 #define wxSTC_MARK_VLINE 9
 #define wxSTC_MARK_LCORNER 10
 #define wxSTC_MARK_TCORNER 11
 #define wxSTC_MARK_VLINE 9
 #define wxSTC_MARK_LCORNER 10
 #define wxSTC_MARK_TCORNER 11


@@ -106,7 +101,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MARK_CIRCLEMINUS 20
 #define wxSTC_MARK_CIRCLEMINUSCONNECTED 21
 
 #define wxSTC_MARK_CIRCLEMINUS 20
 #define wxSTC_MARK_CIRCLEMINUSCONNECTED 21
 

-// Invisible mark that only sets the line background color.
+/// Invisible mark that only sets the line background colour.

 #define wxSTC_MARK_BACKGROUND 22
 #define wxSTC_MARK_DOTDOTDOT 23
 #define wxSTC_MARK_ARROWS 24
 #define wxSTC_MARK_BACKGROUND 22
 #define wxSTC_MARK_DOTDOTDOT 23
 #define wxSTC_MARK_ARROWS 24


@@ -115,9 +110,10 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MARK_LEFTRECT 27
 #define wxSTC_MARK_AVAILABLE 28
 #define wxSTC_MARK_UNDERLINE 29
 #define wxSTC_MARK_LEFTRECT 27
 #define wxSTC_MARK_AVAILABLE 28
 #define wxSTC_MARK_UNDERLINE 29

+#define wxSTC_MARK_RGBAIMAGE 30

 #define wxSTC_MARK_CHARACTER 10000
 
 #define wxSTC_MARK_CHARACTER 10000
 

-// Markers used for outlining column.
+/// Markers used for outlining column.

 #define wxSTC_MARKNUM_FOLDEREND 25
 #define wxSTC_MARKNUM_FOLDEROPENMID 26
 #define wxSTC_MARKNUM_FOLDERMIDTAIL 27
 #define wxSTC_MARKNUM_FOLDEREND 25
 #define wxSTC_MARKNUM_FOLDEROPENMID 26
 #define wxSTC_MARKNUM_FOLDERMIDTAIL 27


@@ -133,8 +129,8 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MARGIN_TEXT 4
 #define wxSTC_MARGIN_RTEXT 5
 
 #define wxSTC_MARGIN_TEXT 4
 #define wxSTC_MARGIN_RTEXT 5
 

-// Styles in range 32..38 are predefined for parts of the UI and are not used as normal styles.
-// Style 39 is for future use.
+/// Styles in range 32..38 are predefined for parts of the UI and are not used as normal styles.
+/// Style 39 is for future use.

 #define wxSTC_STYLE_DEFAULT 32
 #define wxSTC_STYLE_LINENUMBER 33
 #define wxSTC_STYLE_BRACELIGHT 34
 #define wxSTC_STYLE_DEFAULT 32
 #define wxSTC_STYLE_LINENUMBER 33
 #define wxSTC_STYLE_BRACELIGHT 34


@@ -145,8 +141,8 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_STYLE_LASTPREDEFINED 39
 #define wxSTC_STYLE_MAX 255
 
 #define wxSTC_STYLE_LASTPREDEFINED 39
 #define wxSTC_STYLE_MAX 255
 

-// Character set identifiers are used in StyleSetCharacterSet.
-// The values are the same as the Windows *_CHARSET values.
+/// Character set identifiers are used in StyleSetCharacterSet.
+/// The values are the same as the Windows *_CHARSET values.

 #define wxSTC_CHARSET_ANSI 0
 #define wxSTC_CHARSET_DEFAULT 1
 #define wxSTC_CHARSET_BALTIC 186
 #define wxSTC_CHARSET_ANSI 0
 #define wxSTC_CHARSET_DEFAULT 1
 #define wxSTC_CHARSET_BALTIC 186


@@ -171,8 +167,12 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_CASE_MIXED 0
 #define wxSTC_CASE_UPPER 1
 #define wxSTC_CASE_LOWER 2
 #define wxSTC_CASE_MIXED 0
 #define wxSTC_CASE_UPPER 1
 #define wxSTC_CASE_LOWER 2

+#define wxSTC_FONT_SIZE_MULTIPLIER 100
+#define wxSTC_WEIGHT_NORMAL 400
+#define wxSTC_WEIGHT_SEMIBOLD 600
+#define wxSTC_WEIGHT_BOLD 700

 
 

-// Indicator style enumeration and some constants
+/// Indicator style enumeration and some constants

 #define wxSTC_INDIC_PLAIN 0
 #define wxSTC_INDIC_SQUIGGLE 1
 #define wxSTC_INDIC_TT 2
 #define wxSTC_INDIC_PLAIN 0
 #define wxSTC_INDIC_SQUIGGLE 1
 #define wxSTC_INDIC_TT 2


@@ -181,6 +181,11 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_INDIC_HIDDEN 5
 #define wxSTC_INDIC_BOX 6
 #define wxSTC_INDIC_ROUNDBOX 7
 #define wxSTC_INDIC_HIDDEN 5
 #define wxSTC_INDIC_BOX 6
 #define wxSTC_INDIC_ROUNDBOX 7

+#define wxSTC_INDIC_STRAIGHTBOX 8
+#define wxSTC_INDIC_DASH 9
+#define wxSTC_INDIC_DOTS 10
+#define wxSTC_INDIC_SQUIGGLELOW 11
+#define wxSTC_INDIC_DOTBOX 12

 #define wxSTC_INDIC_MAX 31
 #define wxSTC_INDIC_CONTAINER 8
 #define wxSTC_INDIC0_MASK 0x20
 #define wxSTC_INDIC_MAX 31
 #define wxSTC_INDIC_CONTAINER 8
 #define wxSTC_INDIC0_MASK 0x20


@@ -192,19 +197,19 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_IV_LOOKFORWARD 2
 #define wxSTC_IV_LOOKBOTH 3
 
 #define wxSTC_IV_LOOKFORWARD 2
 #define wxSTC_IV_LOOKBOTH 3
 

-// PrintColourMode - use same colours as screen.
+/// PrintColourMode - use same colours as screen.

 #define wxSTC_PRINT_NORMAL 0
 
 #define wxSTC_PRINT_NORMAL 0
 

-// PrintColourMode - invert the light value of each style for printing.
+/// PrintColourMode - invert the light value of each style for printing.

 #define wxSTC_PRINT_INVERTLIGHT 1
 
 #define wxSTC_PRINT_INVERTLIGHT 1
 

-// PrintColourMode - force black text on white background for printing.
+/// PrintColourMode - force black text on white background for printing.

 #define wxSTC_PRINT_BLACKONWHITE 2
 
 #define wxSTC_PRINT_BLACKONWHITE 2
 

-// PrintColourMode - text stays coloured, but all background is forced to be white for printing.
+/// PrintColourMode - text stays coloured, but all background is forced to be white for printing.

 #define wxSTC_PRINT_COLOURONWHITE 3
 
 #define wxSTC_PRINT_COLOURONWHITE 3
 

-// PrintColourMode - only the default-background is forced to be white for printing.
+/// PrintColourMode - only the default-background is forced to be white for printing.

 #define wxSTC_PRINT_COLOURONWHITEDEFAULTBG 4
 #define wxSTC_FIND_WHOLEWORD 2
 #define wxSTC_FIND_MATCHCASE 4
 #define wxSTC_PRINT_COLOURONWHITEDEFAULTBG 4
 #define wxSTC_FIND_WHOLEWORD 2
 #define wxSTC_FIND_MATCHCASE 4


@@ -227,6 +232,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_WRAPVISUALFLAG_NONE 0x0000
 #define wxSTC_WRAPVISUALFLAG_END 0x0001
 #define wxSTC_WRAPVISUALFLAG_START 0x0002
 #define wxSTC_WRAPVISUALFLAG_NONE 0x0000
 #define wxSTC_WRAPVISUALFLAG_END 0x0001
 #define wxSTC_WRAPVISUALFLAG_START 0x0002

+#define wxSTC_WRAPVISUALFLAG_MARGIN 0x0004

 #define wxSTC_WRAPVISUALFLAGLOC_DEFAULT 0x0000
 #define wxSTC_WRAPVISUALFLAGLOC_END_BY_TEXT 0x0001
 #define wxSTC_WRAPVISUALFLAGLOC_START_BY_TEXT 0x0002
 #define wxSTC_WRAPVISUALFLAGLOC_DEFAULT 0x0000
 #define wxSTC_WRAPVISUALFLAGLOC_END_BY_TEXT 0x0001
 #define wxSTC_WRAPVISUALFLAGLOC_START_BY_TEXT 0x0002


@@ -238,12 +244,14 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_CACHE_PAGE 2
 #define wxSTC_CACHE_DOCUMENT 3
 
 #define wxSTC_CACHE_PAGE 2
 #define wxSTC_CACHE_DOCUMENT 3
 

-// Control font anti-aliasing.
+/// Control font anti-aliasing.

 #define wxSTC_EFF_QUALITY_MASK 0xF
 #define wxSTC_EFF_QUALITY_DEFAULT 0
 #define wxSTC_EFF_QUALITY_NON_ANTIALIASED 1
 #define wxSTC_EFF_QUALITY_ANTIALIASED 2
 #define wxSTC_EFF_QUALITY_LCD_OPTIMIZED 3
 #define wxSTC_EFF_QUALITY_MASK 0xF
 #define wxSTC_EFF_QUALITY_DEFAULT 0
 #define wxSTC_EFF_QUALITY_NON_ANTIALIASED 1
 #define wxSTC_EFF_QUALITY_ANTIALIASED 2
 #define wxSTC_EFF_QUALITY_LCD_OPTIMIZED 3

+#define wxSTC_MULTIPASTE_ONCE 0
+#define wxSTC_MULTIPASTE_EACH 1

 #define wxSTC_EDGE_NONE 0
 #define wxSTC_EDGE_LINE 1
 #define wxSTC_EDGE_BACKGROUND 2
 #define wxSTC_EDGE_NONE 0
 #define wxSTC_EDGE_LINE 1
 #define wxSTC_EDGE_BACKGROUND 2


@@ -251,47 +259,56 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_STATUS_FAILURE 1
 #define wxSTC_STATUS_BADALLOC 2
 #define wxSTC_CURSORNORMAL -1
 #define wxSTC_STATUS_FAILURE 1
 #define wxSTC_STATUS_BADALLOC 2
 #define wxSTC_CURSORNORMAL -1

+#define wxSTC_CURSORARROW 2

 #define wxSTC_CURSORWAIT 4
 #define wxSTC_CURSORWAIT 4

+#define wxSTC_CURSORREVERSEARROW 7

 
 

-// Constants for use with SetVisiblePolicy, similar to SetCaretPolicy.
+/// Constants for use with SetVisiblePolicy, similar to SetCaretPolicy.

 #define wxSTC_VISIBLE_SLOP 0x01
 #define wxSTC_VISIBLE_STRICT 0x04
 
 #define wxSTC_VISIBLE_SLOP 0x01
 #define wxSTC_VISIBLE_STRICT 0x04
 

-// Caret policy, used by SetXCaretPolicy and SetYCaretPolicy.
-// If CARET_SLOP is set, we can define a slop value: caretSlop.
-// This value defines an unwanted zone (UZ) where the caret is... unwanted.
-// This zone is defined as a number of pixels near the vertical margins,
-// and as a number of lines near the horizontal margins.
-// By keeping the caret away from the edges, it is seen within its context,
-// so it is likely that the identifier that the caret is on can be completely seen,
-// and that the current line is seen with some of the lines following it which are
-// often dependent on that line.
+/// Caret policy, used by SetXCaretPolicy and SetYCaretPolicy.
+/// If CARET_SLOP is set, we can define a slop value: caretSlop.
+/// This value defines an unwanted zone (UZ) where the caret is... unwanted.
+/// This zone is defined as a number of pixels near the vertical margins,
+/// and as a number of lines near the horizontal margins.
+/// By keeping the caret away from the edges, it is seen within its context,
+/// so it is likely that the identifier that the caret is on can be completely seen,
+/// and that the current line is seen with some of the lines following it which are
+/// often dependent on that line.

 #define wxSTC_CARET_SLOP 0x01
 
 #define wxSTC_CARET_SLOP 0x01
 

-// If CARET_STRICT is set, the policy is enforced... strictly.
-// The caret is centred on the display if slop is not set,
-// and cannot go in the UZ if slop is set.
+/// If CARET_STRICT is set, the policy is enforced... strictly.
+/// The caret is centred on the display if slop is not set,
+/// and cannot go in the UZ if slop is set.

 #define wxSTC_CARET_STRICT 0x04
 
 #define wxSTC_CARET_STRICT 0x04
 

-// If CARET_JUMPS is set, the display is moved more energetically
-// so the caret can move in the same direction longer before the policy is applied again.
+/// If CARET_JUMPS is set, the display is moved more energetically
+/// so the caret can move in the same direction longer before the policy is applied again.

 #define wxSTC_CARET_JUMPS 0x10
 
 #define wxSTC_CARET_JUMPS 0x10
 

-// If CARET_EVEN is not set, instead of having symmetrical UZs,
-// the left and bottom UZs are extended up to right and top UZs respectively.
-// This way, we favour the displaying of useful information: the begining of lines,
-// where most code reside, and the lines after the caret, eg. the body of a function.
+/// If CARET_EVEN is not set, instead of having symmetrical UZs,
+/// the left and bottom UZs are extended up to right and top UZs respectively.
+/// This way, we favour the displaying of useful information: the begining of lines,
+/// where most code reside, and the lines after the caret, eg. the body of a function.

 #define wxSTC_CARET_EVEN 0x08
 #define wxSTC_SEL_STREAM 0
 #define wxSTC_SEL_RECTANGLE 1
 #define wxSTC_SEL_LINES 2
 #define wxSTC_SEL_THIN 3
 #define wxSTC_CARET_EVEN 0x08
 #define wxSTC_SEL_STREAM 0
 #define wxSTC_SEL_RECTANGLE 1
 #define wxSTC_SEL_LINES 2
 #define wxSTC_SEL_THIN 3

+#define wxSTC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE 0
+#define wxSTC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE 1
+#define wxSTC_CARETSTICKY_OFF 0
+#define wxSTC_CARETSTICKY_ON 1
+#define wxSTC_CARETSTICKY_WHITESPACE 2

 #define wxSTC_ALPHA_TRANSPARENT 0
 #define wxSTC_ALPHA_OPAQUE 255
 #define wxSTC_ALPHA_NOALPHA 256
 #define wxSTC_CARETSTYLE_INVISIBLE 0
 #define wxSTC_CARETSTYLE_LINE 1
 #define wxSTC_CARETSTYLE_BLOCK 2
 #define wxSTC_ALPHA_TRANSPARENT 0
 #define wxSTC_ALPHA_OPAQUE 255
 #define wxSTC_ALPHA_NOALPHA 256
 #define wxSTC_CARETSTYLE_INVISIBLE 0
 #define wxSTC_CARETSTYLE_LINE 1
 #define wxSTC_CARETSTYLE_BLOCK 2

+#define wxSTC_MARGINOPTION_NONE 0
+#define wxSTC_MARGINOPTION_SUBLINESELECT 1

 #define wxSTC_ANNOTATION_HIDDEN 0
 #define wxSTC_ANNOTATION_STANDARD 1
 #define wxSTC_ANNOTATION_BOXED 2
 #define wxSTC_ANNOTATION_HIDDEN 0
 #define wxSTC_ANNOTATION_STANDARD 1
 #define wxSTC_ANNOTATION_BOXED 2


@@ -299,14 +316,19 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_SCVS_NONE 0
 #define wxSTC_SCVS_RECTANGULARSELECTION 1
 #define wxSTC_SCVS_USERACCESSIBLE 2
 #define wxSTC_SCVS_NONE 0
 #define wxSTC_SCVS_RECTANGULARSELECTION 1
 #define wxSTC_SCVS_USERACCESSIBLE 2

+#define wxSTC_TECHNOLOGY_DEFAULT 0
+#define wxSTC_TECHNOLOGY_DIRECTWRITE 1

 
 

-// Maximum value of keywordSet parameter of SetKeyWords.
+/// Maximum value of keywordSet parameter of SetKeyWords.

 #define wxSTC_KEYWORDSET_MAX 8
 #define wxSTC_KEYWORDSET_MAX 8

-
-// Notifications
-// Type of modification and the action which caused the modification.
-// These are defined as a bit mask to make it easy to specify which notifications are wanted.
-// One bit is set from each of SC_MOD_* and SC_PERFORMED_*.
+#define wxSTC_TYPE_BOOLEAN 0
+#define wxSTC_TYPE_INTEGER 1
+#define wxSTC_TYPE_STRING 2
+
+/// Notifications
+/// Type of modification and the action which caused the modification.
+/// These are defined as a bit mask to make it easy to specify which notifications are wanted.
+/// One bit is set from each of SC_MOD_* and SC_PERFORMED_*.

 #define wxSTC_MOD_INSERTTEXT 0x1
 #define wxSTC_MOD_DELETETEXT 0x2
 #define wxSTC_MOD_CHANGESTYLE 0x4
 #define wxSTC_MOD_INSERTTEXT 0x1
 #define wxSTC_MOD_DELETETEXT 0x2
 #define wxSTC_MOD_CHANGESTYLE 0x4


@@ -326,11 +348,16 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MOD_CHANGEMARGIN 0x10000
 #define wxSTC_MOD_CHANGEANNOTATION 0x20000
 #define wxSTC_MOD_CONTAINER 0x40000
 #define wxSTC_MOD_CHANGEMARGIN 0x10000
 #define wxSTC_MOD_CHANGEANNOTATION 0x20000
 #define wxSTC_MOD_CONTAINER 0x40000

-#define wxSTC_MODEVENTMASKALL 0x7FFFF
-
-// Symbolic key codes and modifier flags.
-// ASCII and other printable characters below 256.
-// Extended keys above 300.
+#define wxSTC_MOD_LEXERSTATE 0x80000
+#define wxSTC_MODEVENTMASKALL 0xFFFFF
+#define wxSTC_UPDATE_CONTENT 0x1
+#define wxSTC_UPDATE_SELECTION 0x2
+#define wxSTC_UPDATE_V_SCROLL 0x4
+#define wxSTC_UPDATE_H_SCROLL 0x8
+
+/// Symbolic key codes and modifier flags.
+/// ASCII and other printable characters below 256.
+/// Extended keys above 300.

 #define wxSTC_KEY_DOWN 300
 #define wxSTC_KEY_UP 301
 #define wxSTC_KEY_LEFT 302
 #define wxSTC_KEY_DOWN 300
 #define wxSTC_KEY_UP 301
 #define wxSTC_KEY_LEFT 302


@@ -356,8 +383,9 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_SCMOD_CTRL 2
 #define wxSTC_SCMOD_ALT 4
 #define wxSTC_SCMOD_SUPER 8
 #define wxSTC_SCMOD_CTRL 2
 #define wxSTC_SCMOD_ALT 4
 #define wxSTC_SCMOD_SUPER 8

+#define wxSTC_SCMOD_META 16

 
 

-// For SciLexer.h
+/// For SciLexer.h

 #define wxSTC_LEX_CONTAINER 0
 #define wxSTC_LEX_NULL 1
 #define wxSTC_LEX_PYTHON 2
 #define wxSTC_LEX_CONTAINER 0
 #define wxSTC_LEX_NULL 1
 #define wxSTC_LEX_PYTHON 2


@@ -455,12 +483,21 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_LEX_NIMROD 96
 #define wxSTC_LEX_SML 97
 #define wxSTC_LEX_MARKDOWN 98
 #define wxSTC_LEX_NIMROD 96
 #define wxSTC_LEX_SML 97
 #define wxSTC_LEX_MARKDOWN 98

-
-// When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
-// value assigned in sequence from SCLEX_AUTOMATIC+1.
+#define wxSTC_LEX_TXT2TAGS 99
+#define wxSTC_LEX_A68K 100
+#define wxSTC_LEX_MODULA 101
+#define wxSTC_LEX_COFFEESCRIPT 102
+#define wxSTC_LEX_TCMD 103
+#define wxSTC_LEX_AVS 104
+#define wxSTC_LEX_ECL 105
+#define wxSTC_LEX_OSCRIPT 106
+#define wxSTC_LEX_VISUALPROLOG 107
+
+/// 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
 
 #define wxSTC_LEX_AUTOMATIC 1000
 

-// Lexical states for SCLEX_PYTHON
+/// Lexical states for SCLEX_PYTHON

 #define wxSTC_P_DEFAULT 0
 #define wxSTC_P_COMMENTLINE 1
 #define wxSTC_P_NUMBER 2
 #define wxSTC_P_DEFAULT 0
 #define wxSTC_P_COMMENTLINE 1
 #define wxSTC_P_NUMBER 2


@@ -478,7 +515,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_P_WORD2 14
 #define wxSTC_P_DECORATOR 15
 
 #define wxSTC_P_WORD2 14
 #define wxSTC_P_DECORATOR 15
 

-// Lexical states for SCLEX_CPP
+/// Lexical states for SCLEX_CPP

 #define wxSTC_C_DEFAULT 0
 #define wxSTC_C_COMMENT 1
 #define wxSTC_C_COMMENTLINE 2
 #define wxSTC_C_DEFAULT 0
 #define wxSTC_C_COMMENT 1
 #define wxSTC_C_COMMENTLINE 2


@@ -499,8 +536,12 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_C_COMMENTDOCKEYWORD 17
 #define wxSTC_C_COMMENTDOCKEYWORDERROR 18
 #define wxSTC_C_GLOBALCLASS 19
 #define wxSTC_C_COMMENTDOCKEYWORD 17
 #define wxSTC_C_COMMENTDOCKEYWORDERROR 18
 #define wxSTC_C_GLOBALCLASS 19

+#define wxSTC_C_STRINGRAW 20
+#define wxSTC_C_TRIPLEVERBATIM 21
+#define wxSTC_C_HASHQUOTEDSTRING 22
+#define wxSTC_C_PREPROCESSORCOMMENT 23

 
 

-// Lexical states for SCLEX_D
+/// Lexical states for SCLEX_D

 #define wxSTC_D_DEFAULT 0
 #define wxSTC_D_COMMENT 1
 #define wxSTC_D_COMMENTLINE 2
 #define wxSTC_D_DEFAULT 0
 #define wxSTC_D_COMMENT 1
 #define wxSTC_D_COMMENTLINE 2


@@ -525,7 +566,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_D_WORD6 21
 #define wxSTC_D_WORD7 22
 
 #define wxSTC_D_WORD6 21
 #define wxSTC_D_WORD7 22
 

-// Lexical states for SCLEX_TCL
+/// Lexical states for SCLEX_TCL

 #define wxSTC_TCL_DEFAULT 0
 #define wxSTC_TCL_COMMENT 1
 #define wxSTC_TCL_COMMENTLINE 2
 #define wxSTC_TCL_DEFAULT 0
 #define wxSTC_TCL_COMMENT 1
 #define wxSTC_TCL_COMMENTLINE 2


@@ -549,7 +590,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_TCL_COMMENT_BOX 20
 #define wxSTC_TCL_BLOCK_COMMENT 21
 
 #define wxSTC_TCL_COMMENT_BOX 20
 #define wxSTC_TCL_BLOCK_COMMENT 21
 

-// Lexical states for SCLEX_HTML, SCLEX_XML
+/// Lexical states for SCLEX_HTML, SCLEX_XML

 #define wxSTC_H_DEFAULT 0
 #define wxSTC_H_TAG 1
 #define wxSTC_H_TAGUNKNOWN 2
 #define wxSTC_H_DEFAULT 0
 #define wxSTC_H_TAG 1
 #define wxSTC_H_TAGUNKNOWN 2


@@ -562,7 +603,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_H_COMMENT 9
 #define wxSTC_H_ENTITY 10
 
 #define wxSTC_H_COMMENT 9
 #define wxSTC_H_ENTITY 10
 

-// XML and ASP
+/// XML and ASP

 #define wxSTC_H_TAGEND 11
 #define wxSTC_H_XMLSTART 12
 #define wxSTC_H_XMLEND 13
 #define wxSTC_H_TAGEND 11
 #define wxSTC_H_XMLSTART 12
 #define wxSTC_H_XMLEND 13


@@ -572,13 +613,13 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_H_CDATA 17
 #define wxSTC_H_QUESTION 18
 
 #define wxSTC_H_CDATA 17
 #define wxSTC_H_QUESTION 18
 

-// More HTML
+/// More HTML

 #define wxSTC_H_VALUE 19
 
 #define wxSTC_H_VALUE 19
 

-// X-Code
+/// X-Code

 #define wxSTC_H_XCCOMMENT 20
 
 #define wxSTC_H_XCCOMMENT 20
 

-// SGML
+/// SGML

 #define wxSTC_H_SGML_DEFAULT 21
 #define wxSTC_H_SGML_COMMAND 22
 #define wxSTC_H_SGML_1ST_PARAM 23
 #define wxSTC_H_SGML_DEFAULT 21
 #define wxSTC_H_SGML_COMMAND 22
 #define wxSTC_H_SGML_1ST_PARAM 23


@@ -591,7 +632,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_H_SGML_1ST_PARAM_COMMENT 30
 #define wxSTC_H_SGML_BLOCK_DEFAULT 31
 
 #define wxSTC_H_SGML_1ST_PARAM_COMMENT 30
 #define wxSTC_H_SGML_BLOCK_DEFAULT 31
 

-// Embedded Javascript
+/// Embedded Javascript

 #define wxSTC_HJ_START 40
 #define wxSTC_HJ_DEFAULT 41
 #define wxSTC_HJ_COMMENT 42
 #define wxSTC_HJ_START 40
 #define wxSTC_HJ_DEFAULT 41
 #define wxSTC_HJ_COMMENT 42


@@ -606,7 +647,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_HJ_STRINGEOL 51
 #define wxSTC_HJ_REGEX 52
 
 #define wxSTC_HJ_STRINGEOL 51
 #define wxSTC_HJ_REGEX 52
 

-// ASP Javascript
+/// ASP Javascript

 #define wxSTC_HJA_START 55
 #define wxSTC_HJA_DEFAULT 56
 #define wxSTC_HJA_COMMENT 57
 #define wxSTC_HJA_START 55
 #define wxSTC_HJA_DEFAULT 56
 #define wxSTC_HJA_COMMENT 57


@@ -621,7 +662,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_HJA_STRINGEOL 66
 #define wxSTC_HJA_REGEX 67
 
 #define wxSTC_HJA_STRINGEOL 66
 #define wxSTC_HJA_REGEX 67
 

-// Embedded VBScript
+/// Embedded VBScript

 #define wxSTC_HB_START 70
 #define wxSTC_HB_DEFAULT 71
 #define wxSTC_HB_COMMENTLINE 72
 #define wxSTC_HB_START 70
 #define wxSTC_HB_DEFAULT 71
 #define wxSTC_HB_COMMENTLINE 72


@@ -631,7 +672,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_HB_IDENTIFIER 76
 #define wxSTC_HB_STRINGEOL 77
 
 #define wxSTC_HB_IDENTIFIER 76
 #define wxSTC_HB_STRINGEOL 77
 

-// ASP VBScript
+/// ASP VBScript

 #define wxSTC_HBA_START 80
 #define wxSTC_HBA_DEFAULT 81
 #define wxSTC_HBA_COMMENTLINE 82
 #define wxSTC_HBA_START 80
 #define wxSTC_HBA_DEFAULT 81
 #define wxSTC_HBA_COMMENTLINE 82


@@ -641,7 +682,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_HBA_IDENTIFIER 86
 #define wxSTC_HBA_STRINGEOL 87
 
 #define wxSTC_HBA_IDENTIFIER 86
 #define wxSTC_HBA_STRINGEOL 87
 

-// Embedded Python
+/// Embedded Python

 #define wxSTC_HP_START 90
 #define wxSTC_HP_DEFAULT 91
 #define wxSTC_HP_COMMENTLINE 92
 #define wxSTC_HP_START 90
 #define wxSTC_HP_DEFAULT 91
 #define wxSTC_HP_COMMENTLINE 92


@@ -656,10 +697,10 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_HP_OPERATOR 101
 #define wxSTC_HP_IDENTIFIER 102
 
 #define wxSTC_HP_OPERATOR 101
 #define wxSTC_HP_IDENTIFIER 102
 

-// PHP
+/// PHP

 #define wxSTC_HPHP_COMPLEX_VARIABLE 104
 
 #define wxSTC_HPHP_COMPLEX_VARIABLE 104
 

-// ASP Python
+/// ASP Python

 #define wxSTC_HPA_START 105
 #define wxSTC_HPA_DEFAULT 106
 #define wxSTC_HPA_COMMENTLINE 107
 #define wxSTC_HPA_START 105
 #define wxSTC_HPA_DEFAULT 106
 #define wxSTC_HPA_COMMENTLINE 107


@@ -674,7 +715,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_HPA_OPERATOR 116
 #define wxSTC_HPA_IDENTIFIER 117
 
 #define wxSTC_HPA_OPERATOR 116
 #define wxSTC_HPA_IDENTIFIER 117
 

-// PHP
+/// PHP

 #define wxSTC_HPHP_DEFAULT 118
 #define wxSTC_HPHP_HSTRING 119
 #define wxSTC_HPHP_SIMPLESTRING 120
 #define wxSTC_HPHP_DEFAULT 118
 #define wxSTC_HPHP_HSTRING 119
 #define wxSTC_HPHP_SIMPLESTRING 120


@@ -686,7 +727,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_HPHP_HSTRING_VARIABLE 126
 #define wxSTC_HPHP_OPERATOR 127
 
 #define wxSTC_HPHP_HSTRING_VARIABLE 126
 #define wxSTC_HPHP_OPERATOR 127
 

-// Lexical states for SCLEX_PERL
+/// Lexical states for SCLEX_PERL

 #define wxSTC_PL_DEFAULT 0
 #define wxSTC_PL_ERROR 1
 #define wxSTC_PL_COMMENTLINE 2
 #define wxSTC_PL_DEFAULT 0
 #define wxSTC_PL_ERROR 1
 #define wxSTC_PL_COMMENTLINE 2


@@ -722,8 +763,18 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_PL_SUB_PROTOTYPE 40
 #define wxSTC_PL_FORMAT_IDENT 41
 #define wxSTC_PL_FORMAT 42
 #define wxSTC_PL_SUB_PROTOTYPE 40
 #define wxSTC_PL_FORMAT_IDENT 41
 #define wxSTC_PL_FORMAT 42

-
-// Lexical states for SCLEX_RUBY
+#define wxSTC_PL_STRING_VAR 43
+#define wxSTC_PL_XLAT 44
+#define wxSTC_PL_REGEX_VAR 54
+#define wxSTC_PL_REGSUBST_VAR 55
+#define wxSTC_PL_BACKTICKS_VAR 57
+#define wxSTC_PL_HERE_QQ_VAR 61
+#define wxSTC_PL_HERE_QX_VAR 62
+#define wxSTC_PL_STRING_QQ_VAR 64
+#define wxSTC_PL_STRING_QX_VAR 65
+#define wxSTC_PL_STRING_QR_VAR 66
+
+/// Lexical states for SCLEX_RUBY

 #define wxSTC_RB_DEFAULT 0
 #define wxSTC_RB_ERROR 1
 #define wxSTC_RB_COMMENTLINE 2
 #define wxSTC_RB_DEFAULT 0
 #define wxSTC_RB_ERROR 1
 #define wxSTC_RB_COMMENTLINE 2


@@ -759,7 +810,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_RB_STDERR 40
 #define wxSTC_RB_UPPER_BOUND 41
 
 #define wxSTC_RB_STDERR 40
 #define wxSTC_RB_UPPER_BOUND 41
 

-// Lexical states for SCLEX_VB, SCLEX_VBSCRIPT, SCLEX_POWERBASIC
+/// Lexical states for SCLEX_VB, SCLEX_VBSCRIPT, SCLEX_POWERBASIC

 #define wxSTC_B_DEFAULT 0
 #define wxSTC_B_COMMENT 1
 #define wxSTC_B_NUMBER 2
 #define wxSTC_B_DEFAULT 0
 #define wxSTC_B_COMMENT 1
 #define wxSTC_B_NUMBER 2


@@ -780,7 +831,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_B_HEXNUMBER 17
 #define wxSTC_B_BINNUMBER 18
 
 #define wxSTC_B_HEXNUMBER 17
 #define wxSTC_B_BINNUMBER 18
 

-// Lexical states for SCLEX_PROPERTIES
+/// Lexical states for SCLEX_PROPERTIES

 #define wxSTC_PROPS_DEFAULT 0
 #define wxSTC_PROPS_COMMENT 1
 #define wxSTC_PROPS_SECTION 2
 #define wxSTC_PROPS_DEFAULT 0
 #define wxSTC_PROPS_COMMENT 1
 #define wxSTC_PROPS_SECTION 2


@@ -788,14 +839,22 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_PROPS_DEFVAL 4
 #define wxSTC_PROPS_KEY 5
 
 #define wxSTC_PROPS_DEFVAL 4
 #define wxSTC_PROPS_KEY 5
 

-// Lexical states for SCLEX_LATEX
+/// Lexical states for SCLEX_LATEX

 #define wxSTC_L_DEFAULT 0
 #define wxSTC_L_COMMAND 1
 #define wxSTC_L_TAG 2
 #define wxSTC_L_MATH 3
 #define wxSTC_L_COMMENT 4
 #define wxSTC_L_DEFAULT 0
 #define wxSTC_L_COMMAND 1
 #define wxSTC_L_TAG 2
 #define wxSTC_L_MATH 3
 #define wxSTC_L_COMMENT 4

-
-// Lexical states for SCLEX_LUA
+#define wxSTC_L_TAG2 5
+#define wxSTC_L_MATH2 6
+#define wxSTC_L_COMMENT2 7
+#define wxSTC_L_VERBATIM 8
+#define wxSTC_L_SHORTCMD 9
+#define wxSTC_L_SPECIAL 10
+#define wxSTC_L_CMDOPT 11
+#define wxSTC_L_ERROR 12
+
+/// Lexical states for SCLEX_LUA

 #define wxSTC_LUA_DEFAULT 0
 #define wxSTC_LUA_COMMENT 1
 #define wxSTC_LUA_COMMENTLINE 2
 #define wxSTC_LUA_DEFAULT 0
 #define wxSTC_LUA_COMMENT 1
 #define wxSTC_LUA_COMMENTLINE 2


@@ -816,8 +875,9 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_LUA_WORD6 17
 #define wxSTC_LUA_WORD7 18
 #define wxSTC_LUA_WORD8 19
 #define wxSTC_LUA_WORD6 17
 #define wxSTC_LUA_WORD7 18
 #define wxSTC_LUA_WORD8 19

+#define wxSTC_LUA_LABEL 20

 
 

-// Lexical states for SCLEX_ERRORLIST
+/// Lexical states for SCLEX_ERRORLIST

 #define wxSTC_ERR_DEFAULT 0
 #define wxSTC_ERR_PYTHON 1
 #define wxSTC_ERR_GCC 2
 #define wxSTC_ERR_DEFAULT 0
 #define wxSTC_ERR_PYTHON 1
 #define wxSTC_ERR_GCC 2


@@ -841,7 +901,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_ERR_JAVA_STACK 20
 #define wxSTC_ERR_VALUE 21
 
 #define wxSTC_ERR_JAVA_STACK 20
 #define wxSTC_ERR_VALUE 21
 

-// Lexical states for SCLEX_BATCH
+/// Lexical states for SCLEX_BATCH

 #define wxSTC_BAT_DEFAULT 0
 #define wxSTC_BAT_COMMENT 1
 #define wxSTC_BAT_WORD 2
 #define wxSTC_BAT_DEFAULT 0
 #define wxSTC_BAT_COMMENT 1
 #define wxSTC_BAT_WORD 2


@@ -851,7 +911,20 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_BAT_IDENTIFIER 6
 #define wxSTC_BAT_OPERATOR 7
 
 #define wxSTC_BAT_IDENTIFIER 6
 #define wxSTC_BAT_OPERATOR 7
 

-// Lexical states for SCLEX_MAKEFILE
+/// Lexical states for SCLEX_TCMD
+#define wxSTC_TCMD_DEFAULT 0
+#define wxSTC_TCMD_COMMENT 1
+#define wxSTC_TCMD_WORD 2
+#define wxSTC_TCMD_LABEL 3
+#define wxSTC_TCMD_HIDE 4
+#define wxSTC_TCMD_COMMAND 5
+#define wxSTC_TCMD_IDENTIFIER 6
+#define wxSTC_TCMD_OPERATOR 7
+#define wxSTC_TCMD_ENVIRONMENT 8
+#define wxSTC_TCMD_EXPANSION 9
+#define wxSTC_TCMD_CLABEL 10
+
+/// Lexical states for SCLEX_MAKEFILE

 #define wxSTC_MAKE_DEFAULT 0
 #define wxSTC_MAKE_COMMENT 1
 #define wxSTC_MAKE_PREPROCESSOR 2
 #define wxSTC_MAKE_DEFAULT 0
 #define wxSTC_MAKE_COMMENT 1
 #define wxSTC_MAKE_PREPROCESSOR 2


@@ -860,7 +933,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MAKE_TARGET 5
 #define wxSTC_MAKE_IDEOL 9
 
 #define wxSTC_MAKE_TARGET 5
 #define wxSTC_MAKE_IDEOL 9
 

-// Lexical states for SCLEX_DIFF
+/// Lexical states for SCLEX_DIFF

 #define wxSTC_DIFF_DEFAULT 0
 #define wxSTC_DIFF_COMMENT 1
 #define wxSTC_DIFF_COMMAND 2
 #define wxSTC_DIFF_DEFAULT 0
 #define wxSTC_DIFF_COMMENT 1
 #define wxSTC_DIFF_COMMAND 2


@@ -870,7 +943,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_DIFF_ADDED 6
 #define wxSTC_DIFF_CHANGED 7
 
 #define wxSTC_DIFF_ADDED 6
 #define wxSTC_DIFF_CHANGED 7
 

-// Lexical states for SCLEX_CONF (Apache Configuration Files Lexer)
+/// Lexical states for SCLEX_CONF (Apache Configuration Files Lexer)

 #define wxSTC_CONF_DEFAULT 0
 #define wxSTC_CONF_COMMENT 1
 #define wxSTC_CONF_NUMBER 2
 #define wxSTC_CONF_DEFAULT 0
 #define wxSTC_CONF_COMMENT 1
 #define wxSTC_CONF_NUMBER 2


@@ -882,7 +955,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_CONF_IP 8
 #define wxSTC_CONF_DIRECTIVE 9
 
 #define wxSTC_CONF_IP 8
 #define wxSTC_CONF_DIRECTIVE 9
 

-// Lexical states for SCLEX_AVE, Avenue
+/// Lexical states for SCLEX_AVE, Avenue

 #define wxSTC_AVE_DEFAULT 0
 #define wxSTC_AVE_COMMENT 1
 #define wxSTC_AVE_NUMBER 2
 #define wxSTC_AVE_DEFAULT 0
 #define wxSTC_AVE_COMMENT 1
 #define wxSTC_AVE_NUMBER 2


@@ -899,7 +972,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_AVE_WORD5 15
 #define wxSTC_AVE_WORD6 16
 
 #define wxSTC_AVE_WORD5 15
 #define wxSTC_AVE_WORD6 16
 

-// Lexical states for SCLEX_ADA
+/// Lexical states for SCLEX_ADA

 #define wxSTC_ADA_DEFAULT 0
 #define wxSTC_ADA_WORD 1
 #define wxSTC_ADA_IDENTIFIER 2
 #define wxSTC_ADA_DEFAULT 0
 #define wxSTC_ADA_WORD 1
 #define wxSTC_ADA_IDENTIFIER 2


@@ -913,7 +986,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_ADA_COMMENTLINE 10
 #define wxSTC_ADA_ILLEGAL 11
 
 #define wxSTC_ADA_COMMENTLINE 10
 #define wxSTC_ADA_ILLEGAL 11
 

-// Lexical states for SCLEX_BAAN
+/// Lexical states for SCLEX_BAAN

 #define wxSTC_BAAN_DEFAULT 0
 #define wxSTC_BAAN_COMMENT 1
 #define wxSTC_BAAN_COMMENTDOC 2
 #define wxSTC_BAAN_DEFAULT 0
 #define wxSTC_BAAN_COMMENT 1
 #define wxSTC_BAAN_COMMENTDOC 2


@@ -926,7 +999,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_BAAN_STRINGEOL 9
 #define wxSTC_BAAN_WORD2 10
 
 #define wxSTC_BAAN_STRINGEOL 9
 #define wxSTC_BAAN_WORD2 10
 

-// Lexical states for SCLEX_LISP
+/// Lexical states for SCLEX_LISP

 #define wxSTC_LISP_DEFAULT 0
 #define wxSTC_LISP_COMMENT 1
 #define wxSTC_LISP_NUMBER 2
 #define wxSTC_LISP_DEFAULT 0
 #define wxSTC_LISP_COMMENT 1
 #define wxSTC_LISP_NUMBER 2


@@ -940,7 +1013,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_LISP_SPECIAL 11
 #define wxSTC_LISP_MULTI_COMMENT 12
 
 #define wxSTC_LISP_SPECIAL 11
 #define wxSTC_LISP_MULTI_COMMENT 12
 

-// Lexical states for SCLEX_EIFFEL and SCLEX_EIFFELKW
+/// Lexical states for SCLEX_EIFFEL and SCLEX_EIFFELKW

 #define wxSTC_EIFFEL_DEFAULT 0
 #define wxSTC_EIFFEL_COMMENTLINE 1
 #define wxSTC_EIFFEL_NUMBER 2
 #define wxSTC_EIFFEL_DEFAULT 0
 #define wxSTC_EIFFEL_COMMENTLINE 1
 #define wxSTC_EIFFEL_NUMBER 2


@@ -951,7 +1024,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_EIFFEL_IDENTIFIER 7
 #define wxSTC_EIFFEL_STRINGEOL 8
 
 #define wxSTC_EIFFEL_IDENTIFIER 7
 #define wxSTC_EIFFEL_STRINGEOL 8
 

-// Lexical states for SCLEX_NNCRONTAB (nnCron crontab Lexer)
+/// Lexical states for SCLEX_NNCRONTAB (nnCron crontab Lexer)

 #define wxSTC_NNCRONTAB_DEFAULT 0
 #define wxSTC_NNCRONTAB_COMMENT 1
 #define wxSTC_NNCRONTAB_TASK 2
 #define wxSTC_NNCRONTAB_DEFAULT 0
 #define wxSTC_NNCRONTAB_COMMENT 1
 #define wxSTC_NNCRONTAB_TASK 2


@@ -964,7 +1037,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_NNCRONTAB_ENVIRONMENT 9
 #define wxSTC_NNCRONTAB_IDENTIFIER 10
 
 #define wxSTC_NNCRONTAB_ENVIRONMENT 9
 #define wxSTC_NNCRONTAB_IDENTIFIER 10
 

-// Lexical states for SCLEX_FORTH (Forth Lexer)
+/// Lexical states for SCLEX_FORTH (Forth Lexer)

 #define wxSTC_FORTH_DEFAULT 0
 #define wxSTC_FORTH_COMMENT 1
 #define wxSTC_FORTH_COMMENT_ML 2
 #define wxSTC_FORTH_DEFAULT 0
 #define wxSTC_FORTH_COMMENT 1
 #define wxSTC_FORTH_COMMENT_ML 2


@@ -978,20 +1051,20 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_FORTH_STRING 10
 #define wxSTC_FORTH_LOCALE 11
 
 #define wxSTC_FORTH_STRING 10
 #define wxSTC_FORTH_LOCALE 11
 

-// Lexical states for SCLEX_MATLAB
+/// Lexical states for SCLEX_MATLAB

 #define wxSTC_MATLAB_DEFAULT 0
 #define wxSTC_MATLAB_COMMENT 1
 #define wxSTC_MATLAB_COMMAND 2
 #define wxSTC_MATLAB_NUMBER 3
 #define wxSTC_MATLAB_KEYWORD 4
 
 #define wxSTC_MATLAB_DEFAULT 0
 #define wxSTC_MATLAB_COMMENT 1
 #define wxSTC_MATLAB_COMMAND 2
 #define wxSTC_MATLAB_NUMBER 3
 #define wxSTC_MATLAB_KEYWORD 4
 

-// single quoted string
+/// single quoted string

 #define wxSTC_MATLAB_STRING 5
 #define wxSTC_MATLAB_OPERATOR 6
 #define wxSTC_MATLAB_IDENTIFIER 7
 #define wxSTC_MATLAB_DOUBLEQUOTESTRING 8
 
 #define wxSTC_MATLAB_STRING 5
 #define wxSTC_MATLAB_OPERATOR 6
 #define wxSTC_MATLAB_IDENTIFIER 7
 #define wxSTC_MATLAB_DOUBLEQUOTESTRING 8
 

-// Lexical states for SCLEX_SCRIPTOL
+/// Lexical states for SCLEX_SCRIPTOL

 #define wxSTC_SCRIPTOL_DEFAULT 0
 #define wxSTC_SCRIPTOL_WHITE 1
 #define wxSTC_SCRIPTOL_COMMENTLINE 2
 #define wxSTC_SCRIPTOL_DEFAULT 0
 #define wxSTC_SCRIPTOL_WHITE 1
 #define wxSTC_SCRIPTOL_COMMENTLINE 2


@@ -1009,7 +1082,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_SCRIPTOL_CLASSNAME 14
 #define wxSTC_SCRIPTOL_PREPROCESSOR 15
 
 #define wxSTC_SCRIPTOL_CLASSNAME 14
 #define wxSTC_SCRIPTOL_PREPROCESSOR 15
 

-// Lexical states for SCLEX_ASM
+/// Lexical states for SCLEX_ASM

 #define wxSTC_ASM_DEFAULT 0
 #define wxSTC_ASM_COMMENT 1
 #define wxSTC_ASM_NUMBER 2
 #define wxSTC_ASM_DEFAULT 0
 #define wxSTC_ASM_COMMENT 1
 #define wxSTC_ASM_NUMBER 2


@@ -1025,8 +1098,9 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_ASM_CHARACTER 12
 #define wxSTC_ASM_STRINGEOL 13
 #define wxSTC_ASM_EXTINSTRUCTION 14
 #define wxSTC_ASM_CHARACTER 12
 #define wxSTC_ASM_STRINGEOL 13
 #define wxSTC_ASM_EXTINSTRUCTION 14

+#define wxSTC_ASM_COMMENTDIRECTIVE 15

 
 

-// Lexical states for SCLEX_FORTRAN
+/// Lexical states for SCLEX_FORTRAN

 #define wxSTC_F_DEFAULT 0
 #define wxSTC_F_COMMENT 1
 #define wxSTC_F_NUMBER 2
 #define wxSTC_F_DEFAULT 0
 #define wxSTC_F_COMMENT 1
 #define wxSTC_F_NUMBER 2


@@ -1043,7 +1117,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_F_LABEL 13
 #define wxSTC_F_CONTINUATION 14
 
 #define wxSTC_F_LABEL 13
 #define wxSTC_F_CONTINUATION 14
 

-// Lexical states for SCLEX_CSS
+/// Lexical states for SCLEX_CSS

 #define wxSTC_CSS_DEFAULT 0
 #define wxSTC_CSS_TAG 1
 #define wxSTC_CSS_CLASS 2
 #define wxSTC_CSS_DEFAULT 0
 #define wxSTC_CSS_TAG 1
 #define wxSTC_CSS_CLASS 2


@@ -1066,8 +1140,10 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_CSS_EXTENDED_IDENTIFIER 19
 #define wxSTC_CSS_EXTENDED_PSEUDOCLASS 20
 #define wxSTC_CSS_EXTENDED_PSEUDOELEMENT 21
 #define wxSTC_CSS_EXTENDED_IDENTIFIER 19
 #define wxSTC_CSS_EXTENDED_PSEUDOCLASS 20
 #define wxSTC_CSS_EXTENDED_PSEUDOELEMENT 21

+#define wxSTC_CSS_MEDIA 22
+#define wxSTC_CSS_VARIABLE 23

 
 

-// Lexical states for SCLEX_POV
+/// Lexical states for SCLEX_POV

 #define wxSTC_POV_DEFAULT 0
 #define wxSTC_POV_COMMENT 1
 #define wxSTC_POV_COMMENTLINE 2
 #define wxSTC_POV_DEFAULT 0
 #define wxSTC_POV_COMMENT 1
 #define wxSTC_POV_COMMENTLINE 2


@@ -1086,7 +1162,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_POV_WORD7 15
 #define wxSTC_POV_WORD8 16
 
 #define wxSTC_POV_WORD7 15
 #define wxSTC_POV_WORD8 16
 

-// Lexical states for SCLEX_LOUT
+/// Lexical states for SCLEX_LOUT

 #define wxSTC_LOUT_DEFAULT 0
 #define wxSTC_LOUT_COMMENT 1
 #define wxSTC_LOUT_NUMBER 2
 #define wxSTC_LOUT_DEFAULT 0
 #define wxSTC_LOUT_COMMENT 1
 #define wxSTC_LOUT_NUMBER 2


@@ -1099,7 +1175,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_LOUT_IDENTIFIER 9
 #define wxSTC_LOUT_STRINGEOL 10
 
 #define wxSTC_LOUT_IDENTIFIER 9
 #define wxSTC_LOUT_STRINGEOL 10
 

-// Lexical states for SCLEX_ESCRIPT
+/// Lexical states for SCLEX_ESCRIPT

 #define wxSTC_ESCRIPT_DEFAULT 0
 #define wxSTC_ESCRIPT_COMMENT 1
 #define wxSTC_ESCRIPT_COMMENTLINE 2
 #define wxSTC_ESCRIPT_DEFAULT 0
 #define wxSTC_ESCRIPT_COMMENT 1
 #define wxSTC_ESCRIPT_COMMENTLINE 2


@@ -1113,7 +1189,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_ESCRIPT_WORD2 10
 #define wxSTC_ESCRIPT_WORD3 11
 
 #define wxSTC_ESCRIPT_WORD2 10
 #define wxSTC_ESCRIPT_WORD3 11
 

-// Lexical states for SCLEX_PS
+/// Lexical states for SCLEX_PS

 #define wxSTC_PS_DEFAULT 0
 #define wxSTC_PS_COMMENT 1
 #define wxSTC_PS_DSC_COMMENT 2
 #define wxSTC_PS_DEFAULT 0
 #define wxSTC_PS_COMMENT 1
 #define wxSTC_PS_DSC_COMMENT 2


@@ -1131,7 +1207,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_PS_BASE85STRING 14
 #define wxSTC_PS_BADSTRINGCHAR 15
 
 #define wxSTC_PS_BASE85STRING 14
 #define wxSTC_PS_BADSTRINGCHAR 15
 

-// Lexical states for SCLEX_NSIS
+/// Lexical states for SCLEX_NSIS

 #define wxSTC_NSIS_DEFAULT 0
 #define wxSTC_NSIS_COMMENT 1
 #define wxSTC_NSIS_STRINGDQ 2
 #define wxSTC_NSIS_DEFAULT 0
 #define wxSTC_NSIS_COMMENT 1
 #define wxSTC_NSIS_STRINGDQ 2


@@ -1152,7 +1228,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_NSIS_FUNCTIONDEF 17
 #define wxSTC_NSIS_COMMENTBOX 18
 
 #define wxSTC_NSIS_FUNCTIONDEF 17
 #define wxSTC_NSIS_COMMENTBOX 18
 

-// Lexical states for SCLEX_MMIXAL
+/// Lexical states for SCLEX_MMIXAL

 #define wxSTC_MMIXAL_LEADWS 0
 #define wxSTC_MMIXAL_COMMENT 1
 #define wxSTC_MMIXAL_LABEL 2
 #define wxSTC_MMIXAL_LEADWS 0
 #define wxSTC_MMIXAL_COMMENT 1
 #define wxSTC_MMIXAL_LABEL 2


@@ -1172,7 +1248,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MMIXAL_SYMBOL 16
 #define wxSTC_MMIXAL_INCLUDE 17
 
 #define wxSTC_MMIXAL_SYMBOL 16
 #define wxSTC_MMIXAL_INCLUDE 17
 

-// Lexical states for SCLEX_CLW
+/// Lexical states for SCLEX_CLW

 #define wxSTC_CLW_DEFAULT 0
 #define wxSTC_CLW_LABEL 1
 #define wxSTC_CLW_COMMENT 2
 #define wxSTC_CLW_DEFAULT 0
 #define wxSTC_CLW_LABEL 1
 #define wxSTC_CLW_COMMENT 2


@@ -1191,7 +1267,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_CLW_ERROR 15
 #define wxSTC_CLW_DEPRECATED 16
 
 #define wxSTC_CLW_ERROR 15
 #define wxSTC_CLW_DEPRECATED 16
 

-// Lexical states for SCLEX_LOT
+/// Lexical states for SCLEX_LOT

 #define wxSTC_LOT_DEFAULT 0
 #define wxSTC_LOT_HEADER 1
 #define wxSTC_LOT_BREAK 2
 #define wxSTC_LOT_DEFAULT 0
 #define wxSTC_LOT_HEADER 1
 #define wxSTC_LOT_BREAK 2


@@ -1200,7 +1276,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_LOT_FAIL 5
 #define wxSTC_LOT_ABORT 6
 
 #define wxSTC_LOT_FAIL 5
 #define wxSTC_LOT_ABORT 6
 

-// Lexical states for SCLEX_YAML
+/// Lexical states for SCLEX_YAML

 #define wxSTC_YAML_DEFAULT 0
 #define wxSTC_YAML_COMMENT 1
 #define wxSTC_YAML_IDENTIFIER 2
 #define wxSTC_YAML_DEFAULT 0
 #define wxSTC_YAML_COMMENT 1
 #define wxSTC_YAML_IDENTIFIER 2


@@ -1212,7 +1288,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_YAML_ERROR 8
 #define wxSTC_YAML_OPERATOR 9
 
 #define wxSTC_YAML_ERROR 8
 #define wxSTC_YAML_OPERATOR 9
 

-// Lexical states for SCLEX_TEX
+/// Lexical states for SCLEX_TEX

 #define wxSTC_TEX_DEFAULT 0
 #define wxSTC_TEX_SPECIAL 1
 #define wxSTC_TEX_GROUP 2
 #define wxSTC_TEX_DEFAULT 0
 #define wxSTC_TEX_SPECIAL 1
 #define wxSTC_TEX_GROUP 2


@@ -1227,7 +1303,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_METAPOST_TEXT 5
 #define wxSTC_METAPOST_EXTRA 6
 
 #define wxSTC_METAPOST_TEXT 5
 #define wxSTC_METAPOST_EXTRA 6
 

-// Lexical states for SCLEX_ERLANG
+/// Lexical states for SCLEX_ERLANG

 #define wxSTC_ERLANG_DEFAULT 0
 #define wxSTC_ERLANG_COMMENT 1
 #define wxSTC_ERLANG_VARIABLE 2
 #define wxSTC_ERLANG_DEFAULT 0
 #define wxSTC_ERLANG_COMMENT 1
 #define wxSTC_ERLANG_VARIABLE 2


@@ -1255,8 +1331,8 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_ERLANG_MODULES_ATT 24
 #define wxSTC_ERLANG_UNKNOWN 31
 
 #define wxSTC_ERLANG_MODULES_ATT 24
 #define wxSTC_ERLANG_UNKNOWN 31
 

-// Lexical states for SCLEX_OCTAVE are identical to MatLab
-// Lexical states for SCLEX_MSSQL
+/// Lexical states for SCLEX_OCTAVE are identical to MatLab
+/// Lexical states for SCLEX_MSSQL

 #define wxSTC_MSSQL_DEFAULT 0
 #define wxSTC_MSSQL_COMMENT 1
 #define wxSTC_MSSQL_LINE_COMMENT 2
 #define wxSTC_MSSQL_DEFAULT 0
 #define wxSTC_MSSQL_COMMENT 1
 #define wxSTC_MSSQL_LINE_COMMENT 2


@@ -1275,7 +1351,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MSSQL_DEFAULT_PREF_DATATYPE 15
 #define wxSTC_MSSQL_COLUMN_NAME_2 16
 
 #define wxSTC_MSSQL_DEFAULT_PREF_DATATYPE 15
 #define wxSTC_MSSQL_COLUMN_NAME_2 16
 

-// Lexical states for SCLEX_VERILOG
+/// Lexical states for SCLEX_VERILOG

 #define wxSTC_V_DEFAULT 0
 #define wxSTC_V_COMMENT 1
 #define wxSTC_V_COMMENTLINE 2
 #define wxSTC_V_DEFAULT 0
 #define wxSTC_V_COMMENT 1
 #define wxSTC_V_COMMENTLINE 2


@@ -1291,7 +1367,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_V_STRINGEOL 12
 #define wxSTC_V_USER 19
 
 #define wxSTC_V_STRINGEOL 12
 #define wxSTC_V_USER 19
 

-// Lexical states for SCLEX_KIX
+/// Lexical states for SCLEX_KIX

 #define wxSTC_KIX_DEFAULT 0
 #define wxSTC_KIX_COMMENT 1
 #define wxSTC_KIX_STRING1 2
 #define wxSTC_KIX_DEFAULT 0
 #define wxSTC_KIX_COMMENT 1
 #define wxSTC_KIX_STRING1 2


@@ -1304,7 +1380,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_KIX_OPERATOR 9
 #define wxSTC_KIX_IDENTIFIER 31
 
 #define wxSTC_KIX_OPERATOR 9
 #define wxSTC_KIX_IDENTIFIER 31
 

-// Lexical states for SCLEX_GUI4CLI
+/// Lexical states for SCLEX_GUI4CLI

 #define wxSTC_GC_DEFAULT 0
 #define wxSTC_GC_COMMENTLINE 1
 #define wxSTC_GC_COMMENTBLOCK 2
 #define wxSTC_GC_DEFAULT 0
 #define wxSTC_GC_COMMENTLINE 1
 #define wxSTC_GC_COMMENTBLOCK 2


@@ -1316,7 +1392,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_GC_STRING 8
 #define wxSTC_GC_OPERATOR 9
 
 #define wxSTC_GC_STRING 8
 #define wxSTC_GC_OPERATOR 9
 

-// Lexical states for SCLEX_SPECMAN
+/// Lexical states for SCLEX_SPECMAN

 #define wxSTC_SN_DEFAULT 0
 #define wxSTC_SN_CODE 1
 #define wxSTC_SN_COMMENTLINE 2
 #define wxSTC_SN_DEFAULT 0
 #define wxSTC_SN_CODE 1
 #define wxSTC_SN_COMMENTLINE 2


@@ -1334,7 +1410,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_SN_SIGNAL 14
 #define wxSTC_SN_USER 19
 
 #define wxSTC_SN_SIGNAL 14
 #define wxSTC_SN_USER 19
 

-// Lexical states for SCLEX_AU3
+/// Lexical states for SCLEX_AU3

 #define wxSTC_AU3_DEFAULT 0
 #define wxSTC_AU3_COMMENT 1
 #define wxSTC_AU3_COMMENTBLOCK 2
 #define wxSTC_AU3_DEFAULT 0
 #define wxSTC_AU3_COMMENT 1
 #define wxSTC_AU3_COMMENTBLOCK 2


@@ -1352,7 +1428,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_AU3_COMOBJ 14
 #define wxSTC_AU3_UDF 15
 
 #define wxSTC_AU3_COMOBJ 14
 #define wxSTC_AU3_UDF 15
 

-// Lexical states for SCLEX_APDL
+/// Lexical states for SCLEX_APDL

 #define wxSTC_APDL_DEFAULT 0
 #define wxSTC_APDL_COMMENT 1
 #define wxSTC_APDL_COMMENTBLOCK 2
 #define wxSTC_APDL_DEFAULT 0
 #define wxSTC_APDL_COMMENT 1
 #define wxSTC_APDL_COMMENTBLOCK 2


@@ -1367,7 +1443,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_APDL_ARGUMENT 11
 #define wxSTC_APDL_FUNCTION 12
 
 #define wxSTC_APDL_ARGUMENT 11
 #define wxSTC_APDL_FUNCTION 12
 

-// Lexical states for SCLEX_BASH
+/// Lexical states for SCLEX_BASH

 #define wxSTC_SH_DEFAULT 0
 #define wxSTC_SH_ERROR 1
 #define wxSTC_SH_COMMENTLINE 2
 #define wxSTC_SH_DEFAULT 0
 #define wxSTC_SH_ERROR 1
 #define wxSTC_SH_COMMENTLINE 2


@@ -1383,7 +1459,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_SH_HERE_DELIM 12
 #define wxSTC_SH_HERE_Q 13
 
 #define wxSTC_SH_HERE_DELIM 12
 #define wxSTC_SH_HERE_Q 13
 

-// Lexical states for SCLEX_ASN1
+/// Lexical states for SCLEX_ASN1

 #define wxSTC_ASN1_DEFAULT 0
 #define wxSTC_ASN1_COMMENT 1
 #define wxSTC_ASN1_IDENTIFIER 2
 #define wxSTC_ASN1_DEFAULT 0
 #define wxSTC_ASN1_COMMENT 1
 #define wxSTC_ASN1_IDENTIFIER 2


@@ -1396,7 +1472,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_ASN1_TYPE 9
 #define wxSTC_ASN1_OPERATOR 10
 
 #define wxSTC_ASN1_TYPE 9
 #define wxSTC_ASN1_OPERATOR 10
 

-// Lexical states for SCLEX_VHDL
+/// Lexical states for SCLEX_VHDL

 #define wxSTC_VHDL_DEFAULT 0
 #define wxSTC_VHDL_COMMENT 1
 #define wxSTC_VHDL_COMMENTLINEBANG 2
 #define wxSTC_VHDL_DEFAULT 0
 #define wxSTC_VHDL_COMMENT 1
 #define wxSTC_VHDL_COMMENTLINEBANG 2


@@ -1413,7 +1489,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_VHDL_STDTYPE 13
 #define wxSTC_VHDL_USERWORD 14
 
 #define wxSTC_VHDL_STDTYPE 13
 #define wxSTC_VHDL_USERWORD 14
 

-// Lexical states for SCLEX_CAML
+/// Lexical states for SCLEX_CAML

 #define wxSTC_CAML_DEFAULT 0
 #define wxSTC_CAML_IDENTIFIER 1
 #define wxSTC_CAML_TAGNAME 2
 #define wxSTC_CAML_DEFAULT 0
 #define wxSTC_CAML_IDENTIFIER 1
 #define wxSTC_CAML_TAGNAME 2


@@ -1431,7 +1507,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_CAML_COMMENT2 14
 #define wxSTC_CAML_COMMENT3 15
 
 #define wxSTC_CAML_COMMENT2 14
 #define wxSTC_CAML_COMMENT3 15
 

-// Lexical states for SCLEX_HASKELL
+/// Lexical states for SCLEX_HASKELL

 #define wxSTC_HA_DEFAULT 0
 #define wxSTC_HA_IDENTIFIER 1
 #define wxSTC_HA_KEYWORD 2
 #define wxSTC_HA_DEFAULT 0
 #define wxSTC_HA_IDENTIFIER 1
 #define wxSTC_HA_KEYWORD 2


@@ -1450,7 +1526,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_HA_COMMENTBLOCK2 15
 #define wxSTC_HA_COMMENTBLOCK3 16
 
 #define wxSTC_HA_COMMENTBLOCK2 15
 #define wxSTC_HA_COMMENTBLOCK3 16
 

-// Lexical states of SCLEX_TADS3
+/// Lexical states of SCLEX_TADS3

 #define wxSTC_T3_DEFAULT 0
 #define wxSTC_T3_X_DEFAULT 1
 #define wxSTC_T3_PREPROCESSOR 2
 #define wxSTC_T3_DEFAULT 0
 #define wxSTC_T3_X_DEFAULT 1
 #define wxSTC_T3_PREPROCESSOR 2


@@ -1473,7 +1549,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_T3_USER3 19
 #define wxSTC_T3_BRACE 20
 
 #define wxSTC_T3_USER3 19
 #define wxSTC_T3_BRACE 20
 

-// Lexical states for SCLEX_REBOL
+/// Lexical states for SCLEX_REBOL

 #define wxSTC_REBOL_DEFAULT 0
 #define wxSTC_REBOL_COMMENTLINE 1
 #define wxSTC_REBOL_COMMENTBLOCK 2
 #define wxSTC_REBOL_DEFAULT 0
 #define wxSTC_REBOL_COMMENTLINE 1
 #define wxSTC_REBOL_COMMENTBLOCK 2


@@ -1504,7 +1580,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_REBOL_WORD7 27
 #define wxSTC_REBOL_WORD8 28
 
 #define wxSTC_REBOL_WORD7 27
 #define wxSTC_REBOL_WORD8 28
 

-// Lexical states for SCLEX_SQL
+/// Lexical states for SCLEX_SQL

 #define wxSTC_SQL_DEFAULT 0
 #define wxSTC_SQL_COMMENT 1
 #define wxSTC_SQL_COMMENTLINE 2
 #define wxSTC_SQL_DEFAULT 0
 #define wxSTC_SQL_COMMENT 1
 #define wxSTC_SQL_COMMENTLINE 2


@@ -1528,7 +1604,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_SQL_USER4 22
 #define wxSTC_SQL_QUOTEDIDENTIFIER 23
 
 #define wxSTC_SQL_USER4 22
 #define wxSTC_SQL_QUOTEDIDENTIFIER 23
 

-// Lexical states for SCLEX_SMALLTALK
+/// Lexical states for SCLEX_SMALLTALK

 #define wxSTC_ST_DEFAULT 0
 #define wxSTC_ST_STRING 1
 #define wxSTC_ST_NUMBER 2
 #define wxSTC_ST_DEFAULT 0
 #define wxSTC_ST_STRING 1
 #define wxSTC_ST_NUMBER 2


@@ -1547,7 +1623,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_ST_CHARACTER 15
 #define wxSTC_ST_SPEC_SEL 16
 
 #define wxSTC_ST_CHARACTER 15
 #define wxSTC_ST_SPEC_SEL 16
 

-// Lexical states for SCLEX_FLAGSHIP (clipper)
+/// Lexical states for SCLEX_FLAGSHIP (clipper)

 #define wxSTC_FS_DEFAULT 0
 #define wxSTC_FS_COMMENT 1
 #define wxSTC_FS_COMMENTLINE 2
 #define wxSTC_FS_DEFAULT 0
 #define wxSTC_FS_COMMENT 1
 #define wxSTC_FS_COMMENTLINE 2


@@ -1567,13 +1643,21 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_FS_DATE 16
 #define wxSTC_FS_STRINGEOL 17
 #define wxSTC_FS_CONSTANT 18
 #define wxSTC_FS_DATE 16
 #define wxSTC_FS_STRINGEOL 17
 #define wxSTC_FS_CONSTANT 18

-#define wxSTC_FS_ASM 19
-#define wxSTC_FS_LABEL 20
-#define wxSTC_FS_ERROR 21
-#define wxSTC_FS_HEXNUMBER 22
-#define wxSTC_FS_BINNUMBER 23
-
-// Lexical states for SCLEX_CSOUND
+#define wxSTC_FS_WORDOPERATOR 19
+#define wxSTC_FS_DISABLEDCODE 20
+#define wxSTC_FS_DEFAULT_C 21
+#define wxSTC_FS_COMMENTDOC_C 22
+#define wxSTC_FS_COMMENTLINEDOC_C 23
+#define wxSTC_FS_KEYWORD_C 24
+#define wxSTC_FS_KEYWORD2_C 25
+#define wxSTC_FS_NUMBER_C 26
+#define wxSTC_FS_STRING_C 27
+#define wxSTC_FS_PREPROCESSOR_C 28
+#define wxSTC_FS_OPERATOR_C 29
+#define wxSTC_FS_IDENTIFIER_C 30
+#define wxSTC_FS_STRINGEOL_C 31
+
+/// Lexical states for SCLEX_CSOUND

 #define wxSTC_CSOUND_DEFAULT 0
 #define wxSTC_CSOUND_COMMENT 1
 #define wxSTC_CSOUND_NUMBER 2
 #define wxSTC_CSOUND_DEFAULT 0
 #define wxSTC_CSOUND_COMMENT 1
 #define wxSTC_CSOUND_NUMBER 2


@@ -1591,7 +1675,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_CSOUND_GLOBAL_VAR 14
 #define wxSTC_CSOUND_STRINGEOL 15
 
 #define wxSTC_CSOUND_GLOBAL_VAR 14
 #define wxSTC_CSOUND_STRINGEOL 15
 

-// Lexical states for SCLEX_INNOSETUP
+/// Lexical states for SCLEX_INNOSETUP

 #define wxSTC_INNO_DEFAULT 0
 #define wxSTC_INNO_COMMENT 1
 #define wxSTC_INNO_KEYWORD 2
 #define wxSTC_INNO_DEFAULT 0
 #define wxSTC_INNO_COMMENT 1
 #define wxSTC_INNO_KEYWORD 2


@@ -1606,7 +1690,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_INNO_STRING_SINGLE 11
 #define wxSTC_INNO_IDENTIFIER 12
 
 #define wxSTC_INNO_STRING_SINGLE 11
 #define wxSTC_INNO_IDENTIFIER 12
 

-// Lexical states for SCLEX_OPAL
+/// Lexical states for SCLEX_OPAL

 #define wxSTC_OPAL_SPACE 0
 #define wxSTC_OPAL_COMMENT_BLOCK 1
 #define wxSTC_OPAL_COMMENT_LINE 2
 #define wxSTC_OPAL_SPACE 0
 #define wxSTC_OPAL_COMMENT_BLOCK 1
 #define wxSTC_OPAL_COMMENT_LINE 2


@@ -1618,7 +1702,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_OPAL_BOOL_CONST 8
 #define wxSTC_OPAL_DEFAULT 32
 
 #define wxSTC_OPAL_BOOL_CONST 8
 #define wxSTC_OPAL_DEFAULT 32
 

-// Lexical states for SCLEX_SPICE
+/// Lexical states for SCLEX_SPICE

 #define wxSTC_SPICE_DEFAULT 0
 #define wxSTC_SPICE_IDENTIFIER 1
 #define wxSTC_SPICE_KEYWORD 2
 #define wxSTC_SPICE_DEFAULT 0
 #define wxSTC_SPICE_IDENTIFIER 1
 #define wxSTC_SPICE_KEYWORD 2


@@ -1629,7 +1713,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_SPICE_VALUE 7
 #define wxSTC_SPICE_COMMENTLINE 8
 
 #define wxSTC_SPICE_VALUE 7
 #define wxSTC_SPICE_COMMENTLINE 8
 

-// Lexical states for SCLEX_CMAKE
+/// Lexical states for SCLEX_CMAKE

 #define wxSTC_CMAKE_DEFAULT 0
 #define wxSTC_CMAKE_COMMENT 1
 #define wxSTC_CMAKE_STRINGDQ 2
 #define wxSTC_CMAKE_DEFAULT 0
 #define wxSTC_CMAKE_COMMENT 1
 #define wxSTC_CMAKE_STRINGDQ 2


@@ -1646,7 +1730,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_CMAKE_STRINGVAR 13
 #define wxSTC_CMAKE_NUMBER 14
 
 #define wxSTC_CMAKE_STRINGVAR 13
 #define wxSTC_CMAKE_NUMBER 14
 

-// Lexical states for SCLEX_GAP
+/// Lexical states for SCLEX_GAP

 #define wxSTC_GAP_DEFAULT 0
 #define wxSTC_GAP_IDENTIFIER 1
 #define wxSTC_GAP_KEYWORD 2
 #define wxSTC_GAP_DEFAULT 0
 #define wxSTC_GAP_IDENTIFIER 1
 #define wxSTC_GAP_KEYWORD 2


@@ -1660,7 +1744,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_GAP_NUMBER 10
 #define wxSTC_GAP_STRINGEOL 11
 
 #define wxSTC_GAP_NUMBER 10
 #define wxSTC_GAP_STRINGEOL 11
 

-// Lexical state for SCLEX_PLM
+/// Lexical state for SCLEX_PLM

 #define wxSTC_PLM_DEFAULT 0
 #define wxSTC_PLM_COMMENT 1
 #define wxSTC_PLM_STRING 2
 #define wxSTC_PLM_DEFAULT 0
 #define wxSTC_PLM_COMMENT 1
 #define wxSTC_PLM_STRING 2


@@ -1670,7 +1754,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_PLM_CONTROL 6
 #define wxSTC_PLM_KEYWORD 7
 
 #define wxSTC_PLM_CONTROL 6
 #define wxSTC_PLM_KEYWORD 7
 

-// Lexical state for SCLEX_PROGRESS
+/// Lexical state for SCLEX_PROGRESS

 #define wxSTC_4GL_DEFAULT 0
 #define wxSTC_4GL_NUMBER 1
 #define wxSTC_4GL_WORD 2
 #define wxSTC_4GL_DEFAULT 0
 #define wxSTC_4GL_NUMBER 1
 #define wxSTC_4GL_WORD 2


@@ -1704,7 +1788,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_4GL_COMMENT5_ 30
 #define wxSTC_4GL_COMMENT6_ 31
 
 #define wxSTC_4GL_COMMENT5_ 30
 #define wxSTC_4GL_COMMENT6_ 31
 

-// Lexical states for SCLEX_ABAQUS
+/// Lexical states for SCLEX_ABAQUS

 #define wxSTC_ABAQUS_DEFAULT 0
 #define wxSTC_ABAQUS_COMMENT 1
 #define wxSTC_ABAQUS_COMMENTBLOCK 2
 #define wxSTC_ABAQUS_DEFAULT 0
 #define wxSTC_ABAQUS_COMMENT 1
 #define wxSTC_ABAQUS_COMMENTBLOCK 2


@@ -1719,7 +1803,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_ABAQUS_ARGUMENT 11
 #define wxSTC_ABAQUS_FUNCTION 12
 
 #define wxSTC_ABAQUS_ARGUMENT 11
 #define wxSTC_ABAQUS_FUNCTION 12
 

-// Lexical states for SCLEX_ASYMPTOTE
+/// Lexical states for SCLEX_ASYMPTOTE

 #define wxSTC_ASY_DEFAULT 0
 #define wxSTC_ASY_COMMENT 1
 #define wxSTC_ASY_COMMENTLINE 2
 #define wxSTC_ASY_DEFAULT 0
 #define wxSTC_ASY_COMMENT 1
 #define wxSTC_ASY_COMMENTLINE 2


@@ -1733,7 +1817,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_ASY_COMMENTLINEDOC 10
 #define wxSTC_ASY_WORD2 11
 
 #define wxSTC_ASY_COMMENTLINEDOC 10
 #define wxSTC_ASY_WORD2 11
 

-// Lexical states for SCLEX_R
+/// Lexical states for SCLEX_R

 #define wxSTC_R_DEFAULT 0
 #define wxSTC_R_COMMENT 1
 #define wxSTC_R_KWORD 2
 #define wxSTC_R_DEFAULT 0
 #define wxSTC_R_COMMENT 1
 #define wxSTC_R_KWORD 2


@@ -1747,7 +1831,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_R_INFIX 10
 #define wxSTC_R_INFIXEOL 11
 
 #define wxSTC_R_INFIX 10
 #define wxSTC_R_INFIXEOL 11
 

-// Lexical state for SCLEX_MAGIKSF
+/// Lexical state for SCLEX_MAGIKSF

 #define wxSTC_MAGIK_DEFAULT 0
 #define wxSTC_MAGIK_COMMENT 1
 #define wxSTC_MAGIK_HYPER_COMMENT 16
 #define wxSTC_MAGIK_DEFAULT 0
 #define wxSTC_MAGIK_COMMENT 1
 #define wxSTC_MAGIK_HYPER_COMMENT 16


@@ -1766,7 +1850,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MAGIK_PRAGMA 14
 #define wxSTC_MAGIK_SYMBOL 15
 
 #define wxSTC_MAGIK_PRAGMA 14
 #define wxSTC_MAGIK_SYMBOL 15
 

-// Lexical state for SCLEX_POWERSHELL
+/// Lexical state for SCLEX_POWERSHELL

 #define wxSTC_POWERSHELL_DEFAULT 0
 #define wxSTC_POWERSHELL_COMMENT 1
 #define wxSTC_POWERSHELL_STRING 2
 #define wxSTC_POWERSHELL_DEFAULT 0
 #define wxSTC_POWERSHELL_COMMENT 1
 #define wxSTC_POWERSHELL_STRING 2


@@ -1778,8 +1862,11 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_POWERSHELL_KEYWORD 8
 #define wxSTC_POWERSHELL_CMDLET 9
 #define wxSTC_POWERSHELL_ALIAS 10
 #define wxSTC_POWERSHELL_KEYWORD 8
 #define wxSTC_POWERSHELL_CMDLET 9
 #define wxSTC_POWERSHELL_ALIAS 10

+#define wxSTC_POWERSHELL_FUNCTION 11
+#define wxSTC_POWERSHELL_USER1 12
+#define wxSTC_POWERSHELL_COMMENTSTREAM 13

 
 

-// Lexical state for SCLEX_MYSQL
+/// Lexical state for SCLEX_MYSQL

 #define wxSTC_MYSQL_DEFAULT 0
 #define wxSTC_MYSQL_COMMENT 1
 #define wxSTC_MYSQL_COMMENTLINE 2
 #define wxSTC_MYSQL_DEFAULT 0
 #define wxSTC_MYSQL_COMMENT 1
 #define wxSTC_MYSQL_COMMENTLINE 2


@@ -1803,7 +1890,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MYSQL_USER3 20
 #define wxSTC_MYSQL_HIDDENCOMMAND 21
 
 #define wxSTC_MYSQL_USER3 20
 #define wxSTC_MYSQL_HIDDENCOMMAND 21
 

-// Lexical state for SCLEX_PO
+/// Lexical state for SCLEX_PO

 #define wxSTC_PO_DEFAULT 0
 #define wxSTC_PO_COMMENT 1
 #define wxSTC_PO_MSGID 2
 #define wxSTC_PO_DEFAULT 0
 #define wxSTC_PO_COMMENT 1
 #define wxSTC_PO_MSGID 2


@@ -1814,7 +1901,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_PO_MSGCTXT_TEXT 7
 #define wxSTC_PO_FUZZY 8
 
 #define wxSTC_PO_MSGCTXT_TEXT 7
 #define wxSTC_PO_FUZZY 8
 

-// Lexical states for SCLEX_PASCAL
+/// Lexical states for SCLEX_PASCAL

 #define wxSTC_PAS_DEFAULT 0
 #define wxSTC_PAS_IDENTIFIER 1
 #define wxSTC_PAS_COMMENT 2
 #define wxSTC_PAS_DEFAULT 0
 #define wxSTC_PAS_IDENTIFIER 1
 #define wxSTC_PAS_COMMENT 2


@@ -1831,7 +1918,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_PAS_OPERATOR 13
 #define wxSTC_PAS_ASM 14
 
 #define wxSTC_PAS_OPERATOR 13
 #define wxSTC_PAS_ASM 14
 

-// Lexical state for SCLEX_SORCUS
+/// Lexical state for SCLEX_SORCUS

 #define wxSTC_SORCUS_DEFAULT 0
 #define wxSTC_SORCUS_COMMAND 1
 #define wxSTC_SORCUS_PARAMETER 2
 #define wxSTC_SORCUS_DEFAULT 0
 #define wxSTC_SORCUS_COMMAND 1
 #define wxSTC_SORCUS_PARAMETER 2


@@ -1843,7 +1930,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_SORCUS_NUMBER 8
 #define wxSTC_SORCUS_CONSTANT 9
 
 #define wxSTC_SORCUS_NUMBER 8
 #define wxSTC_SORCUS_CONSTANT 9
 

-// Lexical state for SCLEX_POWERPRO
+/// Lexical state for SCLEX_POWERPRO

 #define wxSTC_POWERPRO_DEFAULT 0
 #define wxSTC_POWERPRO_COMMENTBLOCK 1
 #define wxSTC_POWERPRO_COMMENTLINE 2
 #define wxSTC_POWERPRO_DEFAULT 0
 #define wxSTC_POWERPRO_COMMENTBLOCK 1
 #define wxSTC_POWERPRO_COMMENTLINE 2


@@ -1862,7 +1949,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_POWERPRO_ALTQUOTE 15
 #define wxSTC_POWERPRO_FUNCTION 16
 
 #define wxSTC_POWERPRO_ALTQUOTE 15
 #define wxSTC_POWERPRO_FUNCTION 16
 

-// Lexical states for SCLEX_SML
+/// Lexical states for SCLEX_SML

 #define wxSTC_SML_DEFAULT 0
 #define wxSTC_SML_IDENTIFIER 1
 #define wxSTC_SML_TAGNAME 2
 #define wxSTC_SML_DEFAULT 0
 #define wxSTC_SML_IDENTIFIER 1
 #define wxSTC_SML_TAGNAME 2


@@ -1879,7 +1966,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_SML_COMMENT2 14
 #define wxSTC_SML_COMMENT3 15
 
 #define wxSTC_SML_COMMENT2 14
 #define wxSTC_SML_COMMENT3 15
 

-// Lexical state for SCLEX_MARKDOWN
+/// Lexical state for SCLEX_MARKDOWN

 #define wxSTC_MARKDOWN_DEFAULT 0
 #define wxSTC_MARKDOWN_LINE_BEGIN 1
 #define wxSTC_MARKDOWN_STRONG1 2
 #define wxSTC_MARKDOWN_DEFAULT 0
 #define wxSTC_MARKDOWN_LINE_BEGIN 1
 #define wxSTC_MARKDOWN_STRONG1 2


@@ -1903,6 +1990,196 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MARKDOWN_CODE2 20
 #define wxSTC_MARKDOWN_CODEBK 21
 
 #define wxSTC_MARKDOWN_CODE2 20
 #define wxSTC_MARKDOWN_CODEBK 21
 

+/// Lexical state for SCLEX_TXT2TAGS
+#define wxSTC_TXT2TAGS_DEFAULT 0
+#define wxSTC_TXT2TAGS_LINE_BEGIN 1
+#define wxSTC_TXT2TAGS_STRONG1 2
+#define wxSTC_TXT2TAGS_STRONG2 3
+#define wxSTC_TXT2TAGS_EM1 4
+#define wxSTC_TXT2TAGS_EM2 5
+#define wxSTC_TXT2TAGS_HEADER1 6
+#define wxSTC_TXT2TAGS_HEADER2 7
+#define wxSTC_TXT2TAGS_HEADER3 8
+#define wxSTC_TXT2TAGS_HEADER4 9
+#define wxSTC_TXT2TAGS_HEADER5 10
+#define wxSTC_TXT2TAGS_HEADER6 11
+#define wxSTC_TXT2TAGS_PRECHAR 12
+#define wxSTC_TXT2TAGS_ULIST_ITEM 13
+#define wxSTC_TXT2TAGS_OLIST_ITEM 14
+#define wxSTC_TXT2TAGS_BLOCKQUOTE 15
+#define wxSTC_TXT2TAGS_STRIKEOUT 16
+#define wxSTC_TXT2TAGS_HRULE 17
+#define wxSTC_TXT2TAGS_LINK 18
+#define wxSTC_TXT2TAGS_CODE 19
+#define wxSTC_TXT2TAGS_CODE2 20
+#define wxSTC_TXT2TAGS_CODEBK 21
+#define wxSTC_TXT2TAGS_COMMENT 22
+#define wxSTC_TXT2TAGS_OPTION 23
+#define wxSTC_TXT2TAGS_PREPROC 24
+#define wxSTC_TXT2TAGS_POSTPROC 25
+
+/// Lexical states for SCLEX_A68K
+#define wxSTC_A68K_DEFAULT 0
+#define wxSTC_A68K_COMMENT 1
+#define wxSTC_A68K_NUMBER_DEC 2
+#define wxSTC_A68K_NUMBER_BIN 3
+#define wxSTC_A68K_NUMBER_HEX 4
+#define wxSTC_A68K_STRING1 5
+#define wxSTC_A68K_OPERATOR 6
+#define wxSTC_A68K_CPUINSTRUCTION 7
+#define wxSTC_A68K_EXTINSTRUCTION 8
+#define wxSTC_A68K_REGISTER 9
+#define wxSTC_A68K_DIRECTIVE 10
+#define wxSTC_A68K_MACRO_ARG 11
+#define wxSTC_A68K_LABEL 12
+#define wxSTC_A68K_STRING2 13
+#define wxSTC_A68K_IDENTIFIER 14
+#define wxSTC_A68K_MACRO_DECLARATION 15
+#define wxSTC_A68K_COMMENT_WORD 16
+#define wxSTC_A68K_COMMENT_SPECIAL 17
+#define wxSTC_A68K_COMMENT_DOXYGEN 18
+
+/// Lexical states for SCLEX_MODULA
+#define wxSTC_MODULA_DEFAULT 0
+#define wxSTC_MODULA_COMMENT 1
+#define wxSTC_MODULA_DOXYCOMM 2
+#define wxSTC_MODULA_DOXYKEY 3
+#define wxSTC_MODULA_KEYWORD 4
+#define wxSTC_MODULA_RESERVED 5
+#define wxSTC_MODULA_NUMBER 6
+#define wxSTC_MODULA_BASENUM 7
+#define wxSTC_MODULA_FLOAT 8
+#define wxSTC_MODULA_STRING 9
+#define wxSTC_MODULA_STRSPEC 10
+#define wxSTC_MODULA_CHAR 11
+#define wxSTC_MODULA_CHARSPEC 12
+#define wxSTC_MODULA_PROC 13
+#define wxSTC_MODULA_PRAGMA 14
+#define wxSTC_MODULA_PRGKEY 15
+#define wxSTC_MODULA_OPERATOR 16
+#define wxSTC_MODULA_BADSTR 17
+
+/// Lexical states for SCLEX_COFFEESCRIPT
+#define wxSTC_COFFEESCRIPT_DEFAULT 0
+#define wxSTC_COFFEESCRIPT_COMMENT 1
+#define wxSTC_COFFEESCRIPT_COMMENTLINE 2
+#define wxSTC_COFFEESCRIPT_COMMENTDOC 3
+#define wxSTC_COFFEESCRIPT_NUMBER 4
+#define wxSTC_COFFEESCRIPT_WORD 5
+#define wxSTC_COFFEESCRIPT_STRING 6
+#define wxSTC_COFFEESCRIPT_CHARACTER 7
+#define wxSTC_COFFEESCRIPT_UUID 8
+#define wxSTC_COFFEESCRIPT_PREPROCESSOR 9
+#define wxSTC_COFFEESCRIPT_OPERATOR 10
+#define wxSTC_COFFEESCRIPT_IDENTIFIER 11
+#define wxSTC_COFFEESCRIPT_STRINGEOL 12
+#define wxSTC_COFFEESCRIPT_VERBATIM 13
+#define wxSTC_COFFEESCRIPT_REGEX 14
+#define wxSTC_COFFEESCRIPT_COMMENTLINEDOC 15
+#define wxSTC_COFFEESCRIPT_WORD2 16
+#define wxSTC_COFFEESCRIPT_COMMENTDOCKEYWORD 17
+#define wxSTC_COFFEESCRIPT_COMMENTDOCKEYWORDERROR 18
+#define wxSTC_COFFEESCRIPT_GLOBALCLASS 19
+#define wxSTC_COFFEESCRIPT_STRINGRAW 20
+#define wxSTC_COFFEESCRIPT_TRIPLEVERBATIM 21
+#define wxSTC_COFFEESCRIPT_HASHQUOTEDSTRING 22
+#define wxSTC_COFFEESCRIPT_COMMENTBLOCK 22
+#define wxSTC_COFFEESCRIPT_VERBOSE_REGEX 23
+#define wxSTC_COFFEESCRIPT_VERBOSE_REGEX_COMMENT 24
+
+/// Lexical states for SCLEX_AVS
+#define wxSTC_AVS_DEFAULT 0
+#define wxSTC_AVS_COMMENTBLOCK 1
+#define wxSTC_AVS_COMMENTBLOCKN 2
+#define wxSTC_AVS_COMMENTLINE 3
+#define wxSTC_AVS_NUMBER 4
+#define wxSTC_AVS_OPERATOR 5
+#define wxSTC_AVS_IDENTIFIER 6
+#define wxSTC_AVS_STRING 7
+#define wxSTC_AVS_TRIPLESTRING 8
+#define wxSTC_AVS_KEYWORD 9
+#define wxSTC_AVS_FILTER 10
+#define wxSTC_AVS_PLUGIN 11
+#define wxSTC_AVS_FUNCTION 12
+#define wxSTC_AVS_CLIPPROP 13
+#define wxSTC_AVS_USERDFN 14
+
+/// Lexical states for SCLEX_ECL
+#define wxSTC_ECL_DEFAULT 0
+#define wxSTC_ECL_COMMENT 1
+#define wxSTC_ECL_COMMENTLINE 2
+#define wxSTC_ECL_NUMBER 3
+#define wxSTC_ECL_STRING 4
+#define wxSTC_ECL_WORD0 5
+#define wxSTC_ECL_OPERATOR 6
+#define wxSTC_ECL_CHARACTER 7
+#define wxSTC_ECL_UUID 8
+#define wxSTC_ECL_PREPROCESSOR 9
+#define wxSTC_ECL_UNKNOWN 10
+#define wxSTC_ECL_IDENTIFIER 11
+#define wxSTC_ECL_STRINGEOL 12
+#define wxSTC_ECL_VERBATIM 13
+#define wxSTC_ECL_REGEX 14
+#define wxSTC_ECL_COMMENTLINEDOC 15
+#define wxSTC_ECL_WORD1 16
+#define wxSTC_ECL_COMMENTDOCKEYWORD 17
+#define wxSTC_ECL_COMMENTDOCKEYWORDERROR 18
+#define wxSTC_ECL_WORD2 19
+#define wxSTC_ECL_WORD3 20
+#define wxSTC_ECL_WORD4 21
+#define wxSTC_ECL_WORD5 22
+#define wxSTC_ECL_COMMENTDOC 23
+#define wxSTC_ECL_ADDED 24
+#define wxSTC_ECL_DELETED 25
+#define wxSTC_ECL_CHANGED 26
+#define wxSTC_ECL_MOVED 27
+
+/// Lexical states for SCLEX_OSCRIPT
+#define wxSTC_OSCRIPT_DEFAULT 0
+#define wxSTC_OSCRIPT_LINE_COMMENT 1
+#define wxSTC_OSCRIPT_BLOCK_COMMENT 2
+#define wxSTC_OSCRIPT_DOC_COMMENT 3
+#define wxSTC_OSCRIPT_PREPROCESSOR 4
+#define wxSTC_OSCRIPT_NUMBER 5
+#define wxSTC_OSCRIPT_SINGLEQUOTE_STRING 6
+#define wxSTC_OSCRIPT_DOUBLEQUOTE_STRING 7
+#define wxSTC_OSCRIPT_CONSTANT 8
+#define wxSTC_OSCRIPT_IDENTIFIER 9
+#define wxSTC_OSCRIPT_GLOBAL 10
+#define wxSTC_OSCRIPT_KEYWORD 11
+#define wxSTC_OSCRIPT_OPERATOR 12
+#define wxSTC_OSCRIPT_LABEL 13
+#define wxSTC_OSCRIPT_TYPE 14
+#define wxSTC_OSCRIPT_FUNCTION 15
+#define wxSTC_OSCRIPT_OBJECT 16
+#define wxSTC_OSCRIPT_PROPERTY 17
+#define wxSTC_OSCRIPT_METHOD 18
+
+/// Lexical states for SCLEX_VISUALPROLOG
+#define wxSTC_VISUALPROLOG_DEFAULT 0
+#define wxSTC_VISUALPROLOG_KEY_MAJOR 1
+#define wxSTC_VISUALPROLOG_KEY_MINOR 2
+#define wxSTC_VISUALPROLOG_KEY_DIRECTIVE 3
+#define wxSTC_VISUALPROLOG_COMMENT_BLOCK 4
+#define wxSTC_VISUALPROLOG_COMMENT_LINE 5
+#define wxSTC_VISUALPROLOG_COMMENT_KEY 6
+#define wxSTC_VISUALPROLOG_COMMENT_KEY_ERROR 7
+#define wxSTC_VISUALPROLOG_IDENTIFIER 8
+#define wxSTC_VISUALPROLOG_VARIABLE 9
+#define wxSTC_VISUALPROLOG_ANONYMOUS 10
+#define wxSTC_VISUALPROLOG_NUMBER 11
+#define wxSTC_VISUALPROLOG_OPERATOR 12
+#define wxSTC_VISUALPROLOG_CHARACTER 13
+#define wxSTC_VISUALPROLOG_CHARACTER_TOO_MANY 14
+#define wxSTC_VISUALPROLOG_CHARACTER_ESCAPE_ERROR 15
+#define wxSTC_VISUALPROLOG_STRING 16
+#define wxSTC_VISUALPROLOG_STRING_ESCAPE 17
+#define wxSTC_VISUALPROLOG_STRING_ESCAPE_ERROR 18
+#define wxSTC_VISUALPROLOG_STRING_EOL_OPEN 19
+#define wxSTC_VISUALPROLOG_STRING_VERBATIM 20
+#define wxSTC_VISUALPROLOG_STRING_VERBATIM_SPECIAL 21
+#define wxSTC_VISUALPROLOG_STRING_VERBATIM_EOL 22
+

 //}}}
 //----------------------------------------------------------------------
 
 //}}}
 //----------------------------------------------------------------------
 


@@ -1910,190 +2187,190 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 // Commands that can be bound to keystrokes section {{{
 
 
 // Commands that can be bound to keystrokes section {{{
 
 

-// Redoes the next action on the undo history.
+/// Redoes the next action on the undo history.

 #define wxSTC_CMD_REDO 2011
 
 #define wxSTC_CMD_REDO 2011
 

-// Select all the text in the document.
+/// Select all the text in the document.

 #define wxSTC_CMD_SELECTALL 2013
 
 #define wxSTC_CMD_SELECTALL 2013
 

-// Undo one action in the undo history.
+/// Undo one action in the undo history.

 #define wxSTC_CMD_UNDO 2176
 
 #define wxSTC_CMD_UNDO 2176
 

-// Cut the selection to the clipboard.
+/// Cut the selection to the clipboard.

 #define wxSTC_CMD_CUT 2177
 
 #define wxSTC_CMD_CUT 2177
 

-// Copy the selection to the clipboard.
+/// Copy the selection to the clipboard.

 #define wxSTC_CMD_COPY 2178
 
 #define wxSTC_CMD_COPY 2178
 

-// Paste the contents of the clipboard into the document replacing the selection.
+/// Paste the contents of the clipboard into the document replacing the selection.

 #define wxSTC_CMD_PASTE 2179
 
 #define wxSTC_CMD_PASTE 2179
 

-// Clear the selection.
+/// Clear the selection.

 #define wxSTC_CMD_CLEAR 2180
 
 #define wxSTC_CMD_CLEAR 2180
 

-// Move caret down one line.
+/// Move caret down one line.

 #define wxSTC_CMD_LINEDOWN 2300
 
 #define wxSTC_CMD_LINEDOWN 2300
 

-// Move caret down one line extending selection to new caret position.
+/// Move caret down one line extending selection to new caret position.

 #define wxSTC_CMD_LINEDOWNEXTEND 2301
 
 #define wxSTC_CMD_LINEDOWNEXTEND 2301
 

-// Move caret up one line.
+/// Move caret up one line.

 #define wxSTC_CMD_LINEUP 2302
 
 #define wxSTC_CMD_LINEUP 2302
 

-// Move caret up one line extending selection to new caret position.
+/// Move caret up one line extending selection to new caret position.

 #define wxSTC_CMD_LINEUPEXTEND 2303
 
 #define wxSTC_CMD_LINEUPEXTEND 2303
 

-// Move caret left one character.
+/// Move caret left one character.

 #define wxSTC_CMD_CHARLEFT 2304
 
 #define wxSTC_CMD_CHARLEFT 2304
 

-// Move caret left one character extending selection to new caret position.
+/// Move caret left one character extending selection to new caret position.

 #define wxSTC_CMD_CHARLEFTEXTEND 2305
 
 #define wxSTC_CMD_CHARLEFTEXTEND 2305
 

-// Move caret right one character.
+/// Move caret right one character.

 #define wxSTC_CMD_CHARRIGHT 2306
 
 #define wxSTC_CMD_CHARRIGHT 2306
 

-// Move caret right one character extending selection to new caret position.
+/// Move caret right one character extending selection to new caret position.

 #define wxSTC_CMD_CHARRIGHTEXTEND 2307
 
 #define wxSTC_CMD_CHARRIGHTEXTEND 2307
 

-// Move caret left one word.
+/// Move caret left one word.

 #define wxSTC_CMD_WORDLEFT 2308
 
 #define wxSTC_CMD_WORDLEFT 2308
 

-// Move caret left one word extending selection to new caret position.
+/// Move caret left one word extending selection to new caret position.

 #define wxSTC_CMD_WORDLEFTEXTEND 2309
 
 #define wxSTC_CMD_WORDLEFTEXTEND 2309
 

-// Move caret right one word.
+/// Move caret right one word.

 #define wxSTC_CMD_WORDRIGHT 2310
 
 #define wxSTC_CMD_WORDRIGHT 2310
 

-// Move caret right one word extending selection to new caret position.
+/// Move caret right one word extending selection to new caret position.

 #define wxSTC_CMD_WORDRIGHTEXTEND 2311
 
 #define wxSTC_CMD_WORDRIGHTEXTEND 2311
 

-// Move caret to first position on line.
+/// Move caret to first position on line.

 #define wxSTC_CMD_HOME 2312
 
 #define wxSTC_CMD_HOME 2312
 

-// Move caret to first position on line extending selection to new caret position.
+/// Move caret to first position on line extending selection to new caret position.

 #define wxSTC_CMD_HOMEEXTEND 2313
 
 #define wxSTC_CMD_HOMEEXTEND 2313
 

-// Move caret to last position on line.
+/// Move caret to last position on line.

 #define wxSTC_CMD_LINEEND 2314
 
 #define wxSTC_CMD_LINEEND 2314
 

-// Move caret to last position on line extending selection to new caret position.
+/// Move caret to last position on line extending selection to new caret position.

 #define wxSTC_CMD_LINEENDEXTEND 2315
 
 #define wxSTC_CMD_LINEENDEXTEND 2315
 

-// Move caret to first position in document.
+/// Move caret to first position in document.

 #define wxSTC_CMD_DOCUMENTSTART 2316
 
 #define wxSTC_CMD_DOCUMENTSTART 2316
 

-// Move caret to first position in document extending selection to new caret position.
+/// Move caret to first position in document extending selection to new caret position.

 #define wxSTC_CMD_DOCUMENTSTARTEXTEND 2317
 
 #define wxSTC_CMD_DOCUMENTSTARTEXTEND 2317
 

-// Move caret to last position in document.
+/// Move caret to last position in document.

 #define wxSTC_CMD_DOCUMENTEND 2318
 
 #define wxSTC_CMD_DOCUMENTEND 2318
 

-// Move caret to last position in document extending selection to new caret position.
+/// Move caret to last position in document extending selection to new caret position.

 #define wxSTC_CMD_DOCUMENTENDEXTEND 2319
 
 #define wxSTC_CMD_DOCUMENTENDEXTEND 2319
 

-// Move caret one page up.
+/// Move caret one page up.

 #define wxSTC_CMD_PAGEUP 2320
 
 #define wxSTC_CMD_PAGEUP 2320
 

-// Move caret one page up extending selection to new caret position.
+/// Move caret one page up extending selection to new caret position.

 #define wxSTC_CMD_PAGEUPEXTEND 2321
 
 #define wxSTC_CMD_PAGEUPEXTEND 2321
 

-// Move caret one page down.
+/// Move caret one page down.

 #define wxSTC_CMD_PAGEDOWN 2322
 
 #define wxSTC_CMD_PAGEDOWN 2322
 

-// Move caret one page down extending selection to new caret position.
+/// Move caret one page down extending selection to new caret position.

 #define wxSTC_CMD_PAGEDOWNEXTEND 2323
 
 #define wxSTC_CMD_PAGEDOWNEXTEND 2323
 

-// Switch from insert to overtype mode or the reverse.
+/// Switch from insert to overtype mode or the reverse.

 #define wxSTC_CMD_EDITTOGGLEOVERTYPE 2324
 
 #define wxSTC_CMD_EDITTOGGLEOVERTYPE 2324
 

-// Cancel any modes such as call tip or auto-completion list display.
+/// Cancel any modes such as call tip or auto-completion list display.

 #define wxSTC_CMD_CANCEL 2325
 
 #define wxSTC_CMD_CANCEL 2325
 

-// Delete the selection or if no selection, the character before the caret.
+/// Delete the selection or if no selection, the character before the caret.

 #define wxSTC_CMD_DELETEBACK 2326
 
 #define wxSTC_CMD_DELETEBACK 2326
 

-// If selection is empty or all on one line replace the selection with a tab character.
-// If more than one line selected, indent the lines.
+/// If selection is empty or all on one line replace the selection with a tab character.
+/// If more than one line selected, indent the lines.

 #define wxSTC_CMD_TAB 2327
 
 #define wxSTC_CMD_TAB 2327
 

-// Dedent the selected lines.
+/// Dedent the selected lines.

 #define wxSTC_CMD_BACKTAB 2328
 
 #define wxSTC_CMD_BACKTAB 2328
 

-// Insert a new line, may use a CRLF, CR or LF depending on EOL mode.
+/// Insert a new line, may use a CRLF, CR or LF depending on EOL mode.

 #define wxSTC_CMD_NEWLINE 2329
 
 #define wxSTC_CMD_NEWLINE 2329
 

-// Insert a Form Feed character.
+/// Insert a Form Feed character.

 #define wxSTC_CMD_FORMFEED 2330
 
 #define wxSTC_CMD_FORMFEED 2330
 

-// Move caret to before first visible character on line.
-// If already there move to first character on line.
+/// Move caret to before first visible character on line.
+/// If already there move to first character on line.

 #define wxSTC_CMD_VCHOME 2331
 
 #define wxSTC_CMD_VCHOME 2331
 

-// Like VCHome but extending selection to new caret position.
+/// Like VCHome but extending selection to new caret position.

 #define wxSTC_CMD_VCHOMEEXTEND 2332
 
 #define wxSTC_CMD_VCHOMEEXTEND 2332
 

-// Magnify the displayed text by increasing the sizes by 1 point.
+/// Magnify the displayed text by increasing the sizes by 1 point.

 #define wxSTC_CMD_ZOOMIN 2333
 
 #define wxSTC_CMD_ZOOMIN 2333
 

-// Make the displayed text smaller by decreasing the sizes by 1 point.
+/// Make the displayed text smaller by decreasing the sizes by 1 point.

 #define wxSTC_CMD_ZOOMOUT 2334
 
 #define wxSTC_CMD_ZOOMOUT 2334
 

-// Delete the word to the left of the caret.
+/// Delete the word to the left of the caret.

 #define wxSTC_CMD_DELWORDLEFT 2335
 
 #define wxSTC_CMD_DELWORDLEFT 2335
 

-// Delete the word to the right of the caret.
+/// Delete the word to the right of the caret.

 #define wxSTC_CMD_DELWORDRIGHT 2336
 
 #define wxSTC_CMD_DELWORDRIGHT 2336
 

-// Delete the word to the right of the caret, but not the trailing non-word characters.
+/// Delete the word to the right of the caret, but not the trailing non-word characters.

 #define wxSTC_CMD_DELWORDRIGHTEND 2518
 
 #define wxSTC_CMD_DELWORDRIGHTEND 2518
 

-// Cut the line containing the caret.
+/// Cut the line containing the caret.

 #define wxSTC_CMD_LINECUT 2337
 
 #define wxSTC_CMD_LINECUT 2337
 

-// Delete the line containing the caret.
+/// Delete the line containing the caret.

 #define wxSTC_CMD_LINEDELETE 2338
 
 #define wxSTC_CMD_LINEDELETE 2338
 

-// Switch the current line with the previous.
+/// Switch the current line with the previous.

 #define wxSTC_CMD_LINETRANSPOSE 2339
 
 #define wxSTC_CMD_LINETRANSPOSE 2339
 

-// Duplicate the current line.
+/// Duplicate the current line.

 #define wxSTC_CMD_LINEDUPLICATE 2404
 
 #define wxSTC_CMD_LINEDUPLICATE 2404
 

-// Transform the selection to lower case.
+/// Transform the selection to lower case.

 #define wxSTC_CMD_LOWERCASE 2340
 
 #define wxSTC_CMD_LOWERCASE 2340
 

-// Transform the selection to upper case.
+/// Transform the selection to upper case.

 #define wxSTC_CMD_UPPERCASE 2341
 
 #define wxSTC_CMD_UPPERCASE 2341
 

-// Scroll the document down, keeping the caret visible.
+/// Scroll the document down, keeping the caret visible.

 #define wxSTC_CMD_LINESCROLLDOWN 2342
 
 #define wxSTC_CMD_LINESCROLLDOWN 2342
 

-// Scroll the document up, keeping the caret visible.
+/// Scroll the document up, keeping the caret visible.

 #define wxSTC_CMD_LINESCROLLUP 2343
 
 #define wxSTC_CMD_LINESCROLLUP 2343
 

-// Delete the selection or if no selection, the character before the caret.
-// Will not delete the character before at the start of a line.
+/// Delete the selection or if no selection, the character before the caret.
+/// Will not delete the character before at the start of a line.

 #define wxSTC_CMD_DELETEBACKNOTLINE 2344
 
 #define wxSTC_CMD_DELETEBACKNOTLINE 2344
 

-// Move caret to first position on display line.
+/// Move caret to first position on display line.

 #define wxSTC_CMD_HOMEDISPLAY 2345
 
 #define wxSTC_CMD_HOMEDISPLAY 2345
 

-// Move caret to first position on display line extending selection to
-// new caret position.
+/// Move caret to first position on display line extending selection to
+/// new caret position.

 #define wxSTC_CMD_HOMEDISPLAYEXTEND 2346
 
 #define wxSTC_CMD_HOMEDISPLAYEXTEND 2346
 

-// Move caret to last position on display line.
+/// Move caret to last position on display line.

 #define wxSTC_CMD_LINEENDDISPLAY 2347
 
 #define wxSTC_CMD_LINEENDDISPLAY 2347
 

-// Move caret to last position on display line extending selection to new
-// caret position.
+/// Move caret to last position on display line extending selection to new
+/// caret position.

 #define wxSTC_CMD_LINEENDDISPLAYEXTEND 2348
 
 #define wxSTC_CMD_LINEENDDISPLAYEXTEND 2348
 

-// These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-// except they behave differently when word-wrap is enabled:
-// They go first to the start / end of the display line, like (Home|LineEnd)Display
-// The difference is that, the cursor is already at the point, it goes on to the start
-// or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
+/// These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
+/// except they behave differently when word-wrap is enabled:
+/// They go first to the start / end of the display line, like (Home|LineEnd)Display
+/// The difference is that, the cursor is already at the point, it goes on to the start
+/// or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.

 #define wxSTC_CMD_HOMEWRAP 2349
 #define wxSTC_CMD_HOMEWRAPEXTEND 2450
 #define wxSTC_CMD_LINEENDWRAP 2451
 #define wxSTC_CMD_HOMEWRAP 2349
 #define wxSTC_CMD_HOMEWRAPEXTEND 2450
 #define wxSTC_CMD_LINEENDWRAP 2451


@@ -2101,88 +2378,103 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_CMD_VCHOMEWRAP 2453
 #define wxSTC_CMD_VCHOMEWRAPEXTEND 2454
 
 #define wxSTC_CMD_VCHOMEWRAP 2453
 #define wxSTC_CMD_VCHOMEWRAPEXTEND 2454
 

-// Copy the line containing the caret.
+/// Copy the line containing the caret.

 #define wxSTC_CMD_LINECOPY 2455
 
 #define wxSTC_CMD_LINECOPY 2455
 

-// Move to the previous change in capitalisation.
+/// Move to the previous change in capitalisation.

 #define wxSTC_CMD_WORDPARTLEFT 2390
 
 #define wxSTC_CMD_WORDPARTLEFT 2390
 

-// Move to the previous change in capitalisation extending selection
-// to new caret position.
+/// Move to the previous change in capitalisation extending selection
+/// to new caret position.

 #define wxSTC_CMD_WORDPARTLEFTEXTEND 2391
 
 #define wxSTC_CMD_WORDPARTLEFTEXTEND 2391
 

-// Move to the change next in capitalisation.
+/// Move to the change next in capitalisation.

 #define wxSTC_CMD_WORDPARTRIGHT 2392
 
 #define wxSTC_CMD_WORDPARTRIGHT 2392
 

-// Move to the next change in capitalisation extending selection
-// to new caret position.
+/// Move to the next change in capitalisation extending selection
+/// to new caret position.

 #define wxSTC_CMD_WORDPARTRIGHTEXTEND 2393
 
 #define wxSTC_CMD_WORDPARTRIGHTEXTEND 2393
 

-// Delete back from the current position to the start of the line.
+/// Delete back from the current position to the start of the line.

 #define wxSTC_CMD_DELLINELEFT 2395
 
 #define wxSTC_CMD_DELLINELEFT 2395
 

-// Delete forwards from the current position to the end of the line.
+/// Delete forwards from the current position to the end of the line.

 #define wxSTC_CMD_DELLINERIGHT 2396
 
 #define wxSTC_CMD_DELLINERIGHT 2396
 

-// Move caret between paragraphs (delimited by empty lines).
+/// Move caret between paragraphs (delimited by empty lines).

 #define wxSTC_CMD_PARADOWN 2413
 #define wxSTC_CMD_PARADOWNEXTEND 2414
 #define wxSTC_CMD_PARAUP 2415
 #define wxSTC_CMD_PARAUPEXTEND 2416
 
 #define wxSTC_CMD_PARADOWN 2413
 #define wxSTC_CMD_PARADOWNEXTEND 2414
 #define wxSTC_CMD_PARAUP 2415
 #define wxSTC_CMD_PARAUPEXTEND 2416
 

-// Move caret down one line, extending rectangular selection to new caret position.
+/// Move caret down one line, extending rectangular selection to new caret position.

 #define wxSTC_CMD_LINEDOWNRECTEXTEND 2426
 
 #define wxSTC_CMD_LINEDOWNRECTEXTEND 2426
 

-// Move caret up one line, extending rectangular selection to new caret position.
+/// Move caret up one line, extending rectangular selection to new caret position.

 #define wxSTC_CMD_LINEUPRECTEXTEND 2427
 
 #define wxSTC_CMD_LINEUPRECTEXTEND 2427
 

-// Move caret left one character, extending rectangular selection to new caret position.
+/// Move caret left one character, extending rectangular selection to new caret position.

 #define wxSTC_CMD_CHARLEFTRECTEXTEND 2428
 
 #define wxSTC_CMD_CHARLEFTRECTEXTEND 2428
 

-// Move caret right one character, extending rectangular selection to new caret position.
+/// Move caret right one character, extending rectangular selection to new caret position.

 #define wxSTC_CMD_CHARRIGHTRECTEXTEND 2429
 
 #define wxSTC_CMD_CHARRIGHTRECTEXTEND 2429
 

-// Move caret to first position on line, extending rectangular selection to new caret position.
+/// Move caret to first position on line, extending rectangular selection to new caret position.

 #define wxSTC_CMD_HOMERECTEXTEND 2430
 
 #define wxSTC_CMD_HOMERECTEXTEND 2430
 

-// Move caret to before first visible character on line.
-// If already there move to first character on line.
-// In either case, extend rectangular selection to new caret position.
+/// Move caret to before first visible character on line.
+/// If already there move to first character on line.
+/// In either case, extend rectangular selection to new caret position.

 #define wxSTC_CMD_VCHOMERECTEXTEND 2431
 
 #define wxSTC_CMD_VCHOMERECTEXTEND 2431
 

-// Move caret to last position on line, extending rectangular selection to new caret position.
+/// Move caret to last position on line, extending rectangular selection to new caret position.

 #define wxSTC_CMD_LINEENDRECTEXTEND 2432
 
 #define wxSTC_CMD_LINEENDRECTEXTEND 2432
 

-// Move caret one page up, extending rectangular selection to new caret position.
+/// Move caret one page up, extending rectangular selection to new caret position.

 #define wxSTC_CMD_PAGEUPRECTEXTEND 2433
 
 #define wxSTC_CMD_PAGEUPRECTEXTEND 2433
 

-// Move caret one page down, extending rectangular selection to new caret position.
+/// Move caret one page down, extending rectangular selection to new caret position.

 #define wxSTC_CMD_PAGEDOWNRECTEXTEND 2434
 
 #define wxSTC_CMD_PAGEDOWNRECTEXTEND 2434
 

-// Move caret to top of page, or one page up if already at top of page.
+/// Move caret to top of page, or one page up if already at top of page.

 #define wxSTC_CMD_STUTTEREDPAGEUP 2435
 
 #define wxSTC_CMD_STUTTEREDPAGEUP 2435
 

-// Move caret to top of page, or one page up if already at top of page, extending selection to new caret position.
+/// Move caret to top of page, or one page up if already at top of page, extending selection to new caret position.

 #define wxSTC_CMD_STUTTEREDPAGEUPEXTEND 2436
 
 #define wxSTC_CMD_STUTTEREDPAGEUPEXTEND 2436
 

-// Move caret to bottom of page, or one page down if already at bottom of page.
+/// Move caret to bottom of page, or one page down if already at bottom of page.

 #define wxSTC_CMD_STUTTEREDPAGEDOWN 2437
 
 #define wxSTC_CMD_STUTTEREDPAGEDOWN 2437
 

-// Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position.
+/// Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position.

 #define wxSTC_CMD_STUTTEREDPAGEDOWNEXTEND 2438
 
 #define wxSTC_CMD_STUTTEREDPAGEDOWNEXTEND 2438
 

-// Move caret left one word, position cursor at end of word.
+/// Move caret left one word, position cursor at end of word.

 #define wxSTC_CMD_WORDLEFTEND 2439
 
 #define wxSTC_CMD_WORDLEFTEND 2439
 

-// Move caret left one word, position cursor at end of word, extending selection to new caret position.
+/// Move caret left one word, position cursor at end of word, extending selection to new caret position.

 #define wxSTC_CMD_WORDLEFTENDEXTEND 2440
 
 #define wxSTC_CMD_WORDLEFTENDEXTEND 2440
 

-// Move caret right one word, position cursor at end of word.
+/// Move caret right one word, position cursor at end of word.

 #define wxSTC_CMD_WORDRIGHTEND 2441
 
 #define wxSTC_CMD_WORDRIGHTEND 2441
 

-// Move caret right one word, position cursor at end of word, extending selection to new caret position.
+/// Move caret right one word, position cursor at end of word, extending selection to new caret position.

 #define wxSTC_CMD_WORDRIGHTENDEXTEND 2442
 
 #define wxSTC_CMD_WORDRIGHTENDEXTEND 2442
 

+/// Centre current line in window.
+#define wxSTC_CMD_VERTICALCENTRECARET 2619
+
+/// Move the selected lines up one line, shifting the line above after the selection
+#define wxSTC_CMD_MOVESELECTEDLINESUP 2620
+
+/// Move the selected lines down one line, shifting the line below before the selection
+#define wxSTC_CMD_MOVESELECTEDLINESDOWN 2621
+
+/// Scroll to start of document.
+#define wxSTC_CMD_SCROLLTOSTART 2628
+
+/// Scroll to end of document.
+#define wxSTC_CMD_SCROLLTOEND 2629
+

 //}}}
 //----------------------------------------------------------------------
 
 //}}}
 //----------------------------------------------------------------------
 


@@ -2249,6 +2541,9 @@ public:
     // Delete all text in the document.
     void ClearAll();
 
     // Delete all text in the document.
     void ClearAll();
 

+    // Delete a range of text in the document.
+    void DeleteRange(int pos, int deleteLength);
+

     // Set all style bytes to 0, remove all folding information.
     void ClearDocumentStyle();
 
     // Set all style bytes to 0, remove all folding information.
     void ClearDocumentStyle();
 


@@ -2376,6 +2671,12 @@ public:
     // Set the background colour used for a particular marker number.
     void MarkerSetBackground(int markerNumber, const wxColour& back);
 
     // Set the background colour used for a particular marker number.
     void MarkerSetBackground(int markerNumber, const wxColour& back);
 

+    // Set the background colour used for a particular marker number when its folding block is selected.
+    void MarkerSetBackgroundSelected(int markerNumber, const wxColour& back);
+
+    // Enable/disable highlight for current folding bloc (smallest one that contains the caret)
+    void MarkerEnableHighlight(bool enabled);
+

     // Add a marker to a line, returning an ID which can be used to find or delete the marker.
     int MarkerAdd(int line, int markerNumber);
 
     // Add a marker to a line, returning an ID which can be used to find or delete the marker.
     int MarkerAdd(int line, int markerNumber);
 


@@ -2388,7 +2689,8 @@ public:
     // Get a bit mask of all the markers set on a line.
     int MarkerGet(int line);
 
     // Get a bit mask of all the markers set on a line.
     int MarkerGet(int line);
 

-    // Find the next line after lineStart that includes a marker in mask.
+    // Find the next line at or after lineStart that includes a marker in mask.
+    // Return -1 when no more lines.

     int MarkerNext(int lineStart, int markerMask);
 
     // Find the previous line before lineStart that includes a marker in mask.
     int MarkerNext(int lineStart, int markerMask);
 
     // Find the previous line before lineStart that includes a marker in mask.


@@ -2427,6 +2729,12 @@ public:
     // Retrieve the mouse click sensitivity of a margin.
     bool GetMarginSensitive(int margin) const;
 
     // Retrieve the mouse click sensitivity of a margin.
     bool GetMarginSensitive(int margin) const;
 

+    // Set the cursor shown when the mouse is inside a margin.
+    void SetMarginCursor(int margin, int cursor);
+
+    // Retrieve the cursor shown in a margin.
+    int GetMarginCursor(int margin) const;
+

     // Clear all the styles and make equivalent to the global default style.
     void StyleClearAll();
 
     // Clear all the styles and make equivalent to the global default style.
     void StyleClearAll();
 


@@ -2500,6 +2808,18 @@ public:
     // Set a style to be mixed case, or to force upper or lower case.
     void StyleSetCase(int style, int caseForce);
 
     // Set a style to be mixed case, or to force upper or lower case.
     void StyleSetCase(int style, int caseForce);
 

+    // Set the size of characters of a style. Size is in points multiplied by 100.
+    void StyleSetSizeFractional(int style, int caseForce);
+
+    // Get the size of characters of a style in points multiplied by 100
+    int StyleGetSizeFractional(int style) const;
+
+    // Set the weight of characters of a style.
+    void StyleSetWeight(int style, int weight);
+
+    // Get the weight of characters of a style.
+    int StyleGetWeight(int style) const;
+

     // Set a style to be a hotspot or not.
     void StyleSetHotSpot(int style, bool hotspot);
 
     // Set a style to be a hotspot or not.
     void StyleSetHotSpot(int style, bool hotspot);
 


@@ -2549,6 +2869,9 @@ public:
     // First sets defaults like SetCharsDefault.
     void SetWordChars(const wxString& characters);
 
     // First sets defaults like SetCharsDefault.
     void SetWordChars(const wxString& characters);
 

+    // Get the set of characters making up words for when moving or selecting by word.
+    wxString GetWordChars() const;
+

     // Start a sequence of actions that is undone and redone as a unit.
     // May be nested.
     void BeginUndoAction();
     // Start a sequence of actions that is undone and redone as a unit.
     // May be nested.
     void BeginUndoAction();


@@ -2741,6 +3064,9 @@ public:
     // Retrieve the column number of a position, taking tab width into account.
     int GetColumn(int pos) const;
 
     // Retrieve the column number of a position, taking tab width into account.
     int GetColumn(int pos) const;
 

+    // Count characters between two positions.
+    int CountCharacters(int startPos, int endPos);
+

     // Show or hide the horizontal scroll bar.
     void SetUseHorizontalScrollBar(bool show);
 
     // Show or hide the horizontal scroll bar.
     void SetUseHorizontalScrollBar(bool show);
 


@@ -2787,6 +3113,9 @@ public:
     // Returns the position at the end of the selection.
     int GetSelectionEnd() const;
 
     // Returns the position at the end of the selection.
     int GetSelectionEnd() const;
 

+    // Set caret to a position, while removing any existing selection.
+    void SetEmptySelection(int pos);
+

     // Sets the print magnification added to the point size of each style for printing.
     void SetPrintMagnification(int magnification);
 
     // Sets the print magnification added to the point size of each style for printing.
     void SetPrintMagnification(int magnification);
 


@@ -2972,6 +3301,9 @@ public:
     // Enable use of STYLE_CALLTIP and set call tip tab size in pixels.
     void CallTipUseStyle(int tabSize);
 
     // Enable use of STYLE_CALLTIP and set call tip tab size in pixels.
     void CallTipUseStyle(int tabSize);
 

+    // Set position of calltip, above or below text.
+    void CallTipSetPosition(bool above);
+

     // Find the display line of a document line taking hidden lines into account.
     int VisibleFromDocLine(int line);
 
     // Find the display line of a document line taking hidden lines into account.
     int VisibleFromDocLine(int line);
 


@@ -3004,6 +3336,9 @@ public:
     // Is a line visible?
     bool GetLineVisible(int line) const;
 
     // Is a line visible?
     bool GetLineVisible(int line) const;
 

+    // Are all lines visible?
+    bool GetAllLinesVisible() const;
+

     // Show the children of a header line.
     void SetFoldExpanded(int line, bool expanded);
 
     // Show the children of a header line.
     void SetFoldExpanded(int line, bool expanded);
 


@@ -3131,6 +3466,15 @@ public:
     // Scroll so that a display line is at the top of the display.
     void SetFirstVisibleLine(int lineDisplay);
 
     // Scroll so that a display line is at the top of the display.
     void SetFirstVisibleLine(int lineDisplay);
 

+    // Change the effect of pasting when there are multiple selections.
+    void SetMultiPaste(int multiPaste);
+
+    // Retrieve the effect of pasting when there are multiple selections..
+    int GetMultiPaste() const;
+
+    // Retrieve the value of a tag from a regular expression search.
+    wxString GetTag(int tagNumber) const;
+

     // Make the target range start and end be the same as the selection range start and end.
     void TargetFromSelection();
 
     // Make the target range start and end be the same as the selection range start and end.
     void TargetFromSelection();
 


@@ -3327,9 +3671,15 @@ public:
     // Highlight the characters at two positions.
     void BraceHighlight(int pos1, int pos2);
 
     // Highlight the characters at two positions.
     void BraceHighlight(int pos1, int pos2);
 

+    // Use specified indicator to highlight matching braces instead of changing their style.
+    void BraceHighlightIndicator(bool useBraceHighlightIndicator, int indicator);
+

     // Highlight the character at a position indicating there is no matching brace.
     void BraceBadLight(int pos);
 
     // Highlight the character at a position indicating there is no matching brace.
     void BraceBadLight(int pos);
 

+    // Use specified indicator to highlight non matching brace instead of changing its style.
+    void BraceBadLightIndicator(bool useBraceBadLightIndicator, int indicator);
+

     // Find the position of a matching brace or INVALID_POSITION if no match.
     int BraceMatch(int pos);
 
     // Find the position of a matching brace or INVALID_POSITION if no match.
     int BraceMatch(int pos);
 


@@ -3464,14 +3814,14 @@ public:
     // Delete forwards from the current position to the end of the line.
     void DelLineRight();
 
     // Delete forwards from the current position to the end of the line.
     void DelLineRight();
 

-    // Get and Set the xOffset (ie, horizonal scroll position).
+    // Get and Set the xOffset (ie, horizontal scroll position).

     void SetXOffset(int newOffset);
     int GetXOffset() const;
 
     // Set the last x chosen value to be the caret x position.
     void ChooseCaretX();
 
     void SetXOffset(int newOffset);
     int GetXOffset() const;
 
     // Set the last x chosen value to be the caret x position.
     void ChooseCaretX();
 

-    // Set the way the caret is kept visible when going sideway.
+    // Set the way the caret is kept visible when going sideways.

     // The exclusion zone is given in pixels.
     void SetXCaretPolicy(int caretPolicy, int caretSlop);
 
     // The exclusion zone is given in pixels.
     void SetXCaretPolicy(int caretPolicy, int caretSlop);
 


@@ -3599,11 +3949,27 @@ public:
     // Should be called after SetWordChars.
     void SetWhitespaceChars(const wxString& characters);
 
     // Should be called after SetWordChars.
     void SetWhitespaceChars(const wxString& characters);
 

+    // Get the set of characters making up whitespace for when moving or selecting by word.
+    wxString GetWhitespaceChars() const;
+
+    // Set the set of characters making up punctuation characters
+    // Should be called after SetWordChars.
+    void SetPunctuationChars(const wxString& characters);
+
+    // Get the set of characters making up punctuation characters
+    wxString GetPunctuationChars() const;
+

     // Reset the set of characters for whitespace and word characters to the defaults.
     void SetCharsDefault();
 
     // Get currently selected item position in the auto-completion list
     // Reset the set of characters for whitespace and word characters to the defaults.
     void SetCharsDefault();
 
     // Get currently selected item position in the auto-completion list

-    int AutoCompGetCurrent();
+    int AutoCompGetCurrent() const;
+
+    // Set auto-completion case insensitive behaviour to either prefer case-sensitive matches or have no preference.
+    void AutoCompSetCaseInsensitiveBehaviour(int behaviour);
+
+    // Get auto-completion case insensitive behaviour.
+    int AutoCompGetCaseInsensitiveBehaviour() const;

 
     // Enlarge the document to a particular size of text bytes.
     void Allocate(int bytes);
 
     // Enlarge the document to a particular size of text bytes.
     void Allocate(int bytes);


@@ -3613,10 +3979,10 @@ public:
     int FindColumn(int line, int column);
 
     // Can the caret preferred x position only be changed by explicit movement commands?
     int FindColumn(int line, int column);
 
     // Can the caret preferred x position only be changed by explicit movement commands?

-    bool GetCaretSticky() const;
+    int GetCaretSticky() const;

 
     // Stop the caret preferred x position changing when the user types.
 
     // Stop the caret preferred x position changing when the user types.

-    void SetCaretSticky(bool useCaretStickyBehaviour);
+    void SetCaretSticky(int useCaretStickyBehaviour);

 
     // Switch between sticky and non-sticky: meant to be bound to a key.
     void ToggleCaretSticky();
 
     // Switch between sticky and non-sticky: meant to be bound to a key.
     void ToggleCaretSticky();


@@ -3651,7 +4017,7 @@ public:
     // Set the value used for IndicatorFillRange
     void SetIndicatorValue(int value);
 
     // Set the value used for IndicatorFillRange
     void SetIndicatorValue(int value);
 

-    // Get the current indicator vaue
+    // Get the current indicator value

     int GetIndicatorValue() const;
 
     // Turn a indicator on over a range.
     int GetIndicatorValue() const;
 
     // Turn a indicator on over a range.


@@ -3683,7 +4049,16 @@ public:
 
     // Compact the document buffer and return a read-only pointer to the
     // characters in the document.
 
     // Compact the document buffer and return a read-only pointer to the
     // characters in the document.

-    const char* GetCharacterPointer();
+    const char* GetCharacterPointer() const;
+
+    // Return a read-only pointer to a range of characters in the document.
+    // May move the gap so that the range is contiguous, but will only move up
+    // to rangeLength bytes.
+    const char* GetRangePointer(int position, int rangeLength) const;
+
+    // Return a position which, to avoid performance costs, should not be within
+    // the range of a call to GetRangePointer.
+    int GetGapPosition() const;

 
     // Always interpret keyboard input as Unicode
     void SetKeysUnicode(bool keysUnicode);
 
     // Always interpret keyboard input as Unicode
     void SetKeysUnicode(bool keysUnicode);


@@ -3697,6 +4072,12 @@ public:
     // Get the alpha fill colour of the given indicator.
     int IndicatorGetAlpha(int indicator) const;
 
     // Get the alpha fill colour of the given indicator.
     int IndicatorGetAlpha(int indicator) const;
 

+    // Set the alpha outline colour of the given indicator.
+    void IndicatorSetOutlineAlpha(int indicator, int alpha);
+
+    // Get the alpha outline colour of the given indicator.
+    int IndicatorGetOutlineAlpha(int indicator) const;
+

     // Set extra ascent for each line
     void SetExtraAscent(int extraAscent);
 
     // Set extra ascent for each line
     void SetExtraAscent(int extraAscent);
 


@@ -3739,6 +4120,12 @@ public:
     // Get the start of the range of style numbers used for margin text
     int MarginGetStyleOffset() const;
 
     // Get the start of the range of style numbers used for margin text
     int MarginGetStyleOffset() const;
 

+    // Set the margin options.
+    void SetMarginOptions(int marginOptions);
+
+    // Get the margin options.
+    int GetMarginOptions() const;
+

     // Set the annotation text for a line
     void AnnotationSetText(int line, const wxString& text);
 
     // Set the annotation text for a line
     void AnnotationSetText(int line, const wxString& text);
 


@@ -3889,6 +4276,58 @@ public:
     // Swap that caret and anchor of the main selection.
     void SwapMainAnchorCaret();
 
     // Swap that caret and anchor of the main selection.
     void SwapMainAnchorCaret();
 

+    // Indicate that the internal state of a lexer has changed over a range and therefore
+    // there may be a need to redraw.
+    int ChangeLexerState(int start, int end);
+
+    // Find the next line at or after lineStart that is a contracted fold header line.
+    // Return -1 when no more lines.
+    int ContractedFoldNext(int lineStart);
+
+    // Centre current line in window.
+    void VerticalCentreCaret();
+
+    // Move the selected lines up one line, shifting the line above after the selection
+    void MoveSelectedLinesUp();
+
+    // Move the selected lines down one line, shifting the line below before the selection
+    void MoveSelectedLinesDown();
+
+    // Set the identifier reported as idFrom in notification messages.
+    void SetIdentifier(int identifier);
+
+    // Get the identifier.
+    int GetIdentifier() const;
+
+    // Set the width for future RGBA image data.
+    void RGBAImageSetWidth(int width);
+
+    // Set the height for future RGBA image data.
+    void RGBAImageSetHeight(int height);
+
+    // Define a marker from RGBA data.
+    // It has the width and height from RGBAImageSetWidth/Height
+    void MarkerDefineRGBAImage(int markerNumber, const unsigned char* pixels);
+
+    // Register an RGBA image for use in autocompletion lists.
+    // It has the width and height from RGBAImageSetWidth/Height
+    void RegisterRGBAImage(int type, const unsigned char* pixels);
+
+    // Scroll to start of document.
+    void ScrollToStart();
+
+    // Scroll to end of document.
+    void ScrollToEnd();
+
+    // Set the technology used.
+    void SetTechnology(int technology);
+
+    // Get the tech.
+    int GetTechnology() const;
+
+    // Create an ILoader*.
+    void* CreateLoader(int bytes) const;
+

     // Start notifying the container of all key presses and commands.
     void StartRecord();
 
     // Start notifying the container of all key presses and commands.
     void StartRecord();
 


@@ -3927,6 +4366,21 @@ public:
     // Retrieve the number of bits the current lexer needs for styling.
     int GetStyleBitsNeeded() const;
 
     // Retrieve the number of bits the current lexer needs for styling.
     int GetStyleBitsNeeded() const;
 

+    // For private communication between an application and a known lexer.
+    void* PrivateLexerCall(int operation, void* pointer);
+
+    // Retrieve a '\n' separated list of properties understood by the current lexer.
+    wxString PropertyNames() const;
+
+    // Retrieve the type of a property.
+    int PropertyType(const wxString& name);
+
+    // Describe a property.
+    wxString DescribeProperty(const wxString& name) const;
+
+    // Retrieve a '\n' separated list of descriptions of the keyword sets understood by the current lexer.
+    wxString DescribeKeyWordSets() const;
+

     //}}}
     //----------------------------------------------------------------------
 
     //}}}
     //----------------------------------------------------------------------
 


@@ -4040,16 +4494,19 @@ public:
     // Returns the current UseAntiAliasing setting.
     bool GetUseAntiAliasing();
 
     // Returns the current UseAntiAliasing setting.
     bool GetUseAntiAliasing();
 

+    // Clear annotations from the given line.
+    void AnnotationClearLine(int line);
+

 
 
 
 

-    // The following methods are nearly equivallent to their similarly named
+    // The following methods are nearly equivalent to their similarly named

     // cousins above.  The difference is that these methods bypass wxString
     // and always use a char* even if used in a unicode build of wxWidgets.
     // In that case the character data will be utf-8 encoded since that is
     // what is used internally by Scintilla in unicode builds.
 
     // Add text to the document at current position.
     // cousins above.  The difference is that these methods bypass wxString
     // and always use a char* even if used in a unicode build of wxWidgets.
     // In that case the character data will be utf-8 encoded since that is
     // what is used internally by Scintilla in unicode builds.
 
     // Add text to the document at current position.

-    void AddTextRaw(const char* text);
+    void AddTextRaw(const char* text, int length=-1);

 
     // Insert string at a position.
     void InsertTextRaw(int pos, const char* text);
 
     // Insert string at a position.
     void InsertTextRaw(int pos, const char* text);


@@ -4078,7 +4535,7 @@ public:
     wxCharBuffer GetTextRaw();
 
     // Append a string to the end of the document without changing the selection.
     wxCharBuffer GetTextRaw();
 
     // Append a string to the end of the document without changing the selection.

-    void AppendTextRaw(const char* text);
+    void AppendTextRaw(const char* text, int length=-1);

 
 #ifdef SWIG
     %pythoncode "_stc_utf8_methods.py"
 
 #ifdef SWIG
     %pythoncode "_stc_utf8_methods.py"


@@ -4088,15 +4545,19 @@ public:
     // implement wxTextEntryBase pure virtual methods
     // ----------------------------------------------
 
     // implement wxTextEntryBase pure virtual methods
     // ----------------------------------------------
 

-    virtual void WriteText(const wxString& text) { AddText(text); }
+    virtual void WriteText(const wxString& text)
+    {
+        ReplaceSelection(text);
+    }
+

     virtual void Remove(long from, long to)
     {
         Replace(from, to, "");
     }
     virtual void Replace(long from, long to, const wxString& text)
     {
     virtual void Remove(long from, long to)
     {
         Replace(from, to, "");
     }
     virtual void Replace(long from, long to, const wxString& text)
     {

-        SetTargetStart(from);
-        SetTargetEnd(to);
+        SetTargetStart((int)from);
+        SetTargetEnd((int)to);

         ReplaceTarget(text);
     }
 
         ReplaceTarget(text);
     }
 


@@ -4115,7 +4576,10 @@ public:
 
     */
 
 
     */
 

-    virtual void SetInsertionPoint(long pos) { SetCurrentPos(pos); }
+    virtual void SetInsertionPoint(long pos)
+    {
+        SetCurrentPos(int(pos == -1 ? GetLastPosition() : pos));
+    }

     virtual long GetInsertionPoint() const { return GetCurrentPos(); }
     virtual long GetLastPosition() const { return GetTextLength(); }
 
     virtual long GetInsertionPoint() const { return GetCurrentPos(); }
     virtual long GetLastPosition() const { return GetTextLength(); }
 


@@ -4127,11 +4591,16 @@ public:
         }
         else
         {
         }
         else
         {

-            SetSelectionStart(from);
-            SetSelectionEnd(to);
+            SetSelectionStart((int)from);
+            SetSelectionEnd((int)to);

         }
     }
 
         }
     }
 

+    virtual void SelectNone()
+    {
+        ClearSelections();
+    }
+

 #ifdef SWIG
     void GetSelection(long* OUTPUT, long* OUTPUT) const;
 #else
 #ifdef SWIG
     void GetSelection(long* OUTPUT, long* OUTPUT) const;
 #else


@@ -4149,9 +4618,9 @@ public:
         long f, t;
         GetSelection(&f, &t);
         if ( from )
         long f, t;
         GetSelection(&f, &t);
         if ( from )

-            *from = f;
+            *from = (int)f;

         if ( to )
         if ( to )

-            *to = t;
+            *to = (int)t;

     }
 #endif
 
     }
 #endif
 


@@ -4161,8 +4630,18 @@ public:
     // implement wxTextAreaBase pure virtual methods
     // ---------------------------------------------
 
     // implement wxTextAreaBase pure virtual methods
     // ---------------------------------------------
 

-    virtual int GetLineLength(long n) const { return GetLine(n).length(); }
-    virtual wxString GetLineText(long n) const { return GetLine(n); }
+    virtual int GetLineLength(long lineNo) const { return static_cast<int>(GetLineText(lineNo).length()); }
+    virtual wxString GetLineText(long lineNo) const
+    {
+        wxString text = GetLine(static_cast<int>(lineNo));
+        size_t lastNewLine = text.find_last_not_of(wxS("\r\n"));
+
+        if ( lastNewLine != wxString::npos )
+            text.erase(lastNewLine + 1); // remove trailing cr+lf
+        else
+            text.clear();
+        return text;
+    }

     virtual int GetNumberOfLines() const { return GetLineCount(); }
 
     virtual bool IsModified() const { return GetModify(); }
     virtual int GetNumberOfLines() const { return GetLineCount(); }
 
     virtual bool IsModified() const { return GetModify(); }


@@ -4193,28 +4672,27 @@ public:
 
     virtual long XYToPosition(long x, long y) const
     {
 
     virtual long XYToPosition(long x, long y) const
     {

-        long pos = PositionFromLine(y);
+        long pos = PositionFromLine((int)y);

         pos += x;
         return pos;
     }
 
     virtual bool PositionToXY(long pos, long *x, long *y) const
     {
         pos += x;
         return pos;
     }
 
     virtual bool PositionToXY(long pos, long *x, long *y) const
     {

+        int l = LineFromPosition((int)pos);
+        if ( l == -1 )
+            return false;
+

         if ( x )
         if ( x )

-            *x = -1; // TODO
+            *x = pos - PositionFromLine(l);

 
         if ( y )
 
         if ( y )

-        {
-            long l = LineFromPosition(pos);
-            if ( l == -1 )
-                return false;

             *y = l;
             *y = l;

-        }

 
         return true;
     }
 
 
         return true;
     }
 

-    virtual void ShowPosition(long pos) { GotoPos(pos); }
+    virtual void ShowPosition(long pos) { GotoPos((int)pos); }

 
     // FIXME-VC6: can't use wxWindow here because of "error C2603: illegal
     //            access declaration: 'wxWindow' is not a direct base of
 
     // FIXME-VC6: can't use wxWindow here because of "error C2603: illegal
     //            access declaration: 'wxWindow' is not a direct base of


@@ -4244,6 +4722,7 @@ public:
     static wxVersionInfo GetLibraryVersionInfo();
 
 protected:
     static wxVersionInfo GetLibraryVersionInfo();
 
 protected:

+    virtual void DoSetValue(const wxString& value, int flags);

     virtual wxString DoGetValue() const { return GetText(); }
     virtual wxWindow *GetEditableWindow() { return this; }
 
     virtual wxString DoGetValue() const { return GetText(); }
     virtual wxWindow *GetEditableWindow() { return this; }
 


@@ -4292,10 +4771,6 @@ protected:
 
     bool                m_lastKeyDownConsumed;
 
 
     bool                m_lastKeyDownConsumed;
 

-    // the timestamp that consists of the last wheel event
-    // added to the time taken to process that event.
-    long m_lastWheelTimestamp;
-

     friend class ScintillaWX;
     friend class Platform;
 #endif // !SWIG
     friend class ScintillaWX;
     friend class Platform;
 #endif // !SWIG


@@ -4328,6 +4803,9 @@ public:
     void SetListType(int val)             { m_listType = val; }
     void SetX(int val)                    { m_x = val; }
     void SetY(int val)                    { m_y = val; }
     void SetListType(int val)             { m_listType = val; }
     void SetX(int val)                    { m_x = val; }
     void SetY(int val)                    { m_y = val; }

+    void SetToken(int val)                { m_token = val; }
+    void SetAnnotationLinesAdded(int val) { m_annotationLinesAdded = val; }
+    void SetUpdated(int val)              { m_updated = val; }

 #ifdef  STC_USE_DND
     void SetDragText(const wxString& val) { m_dragText = val; }
     void SetDragFlags(int flags)          { m_dragFlags = flags; }
 #ifdef  STC_USE_DND
     void SetDragText(const wxString& val) { m_dragText = val; }
     void SetDragFlags(int flags)          { m_dragFlags = flags; }


@@ -4361,6 +4839,10 @@ public:
     int  GetListType() const         { return m_listType; }
     int  GetX() const                { return m_x; }
     int  GetY() const                { return m_y; }
     int  GetListType() const         { return m_listType; }
     int  GetX() const                { return m_x; }
     int  GetY() const                { return m_y; }

+    int  GetToken() const                 { return m_token; }
+    int  GetAnnotationsLinesAdded() const { return m_annotationLinesAdded; }
+    int  GetUpdated() const               { return m_updated; }
+    

 #ifdef STC_USE_DND
     wxString GetDragText()           { return m_dragText; }
     int GetDragFlags()               { return m_dragFlags; }
 #ifdef STC_USE_DND
     wxString GetDragText()           { return m_dragText; }
     int GetDragFlags()               { return m_dragFlags; }


@@ -4401,6 +4883,11 @@ private:
     int m_x;
     int m_y;
 
     int m_x;
     int m_y;
 

+    int m_token;                // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER 
+    int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION 
+    int m_updated;              // wxEVT_STC_UPDATEUI
+
+

 #if wxUSE_DRAG_AND_DROP
     wxString m_dragText;        // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
     int      m_dragFlags;       // wxEVT_STC_START_DRAG
 #if wxUSE_DRAG_AND_DROP
     wxString m_dragText;        // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
     int      m_dragFlags;       // wxEVT_STC_START_DRAG


@@ -4442,6 +4929,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_INDICATOR_CLICK, wxStyledTe
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_INDICATOR_RELEASE, wxStyledTextEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_CANCELLED, wxStyledTextEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_CHAR_DELETED, wxStyledTextEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_INDICATOR_RELEASE, wxStyledTextEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_CANCELLED, wxStyledTextEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_CHAR_DELETED, wxStyledTextEvent );

+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_RELEASE_CLICK, wxStyledTextEvent );

 #else
     enum {
         wxEVT_STC_CHANGE,
 #else
     enum {
         wxEVT_STC_CHANGE,


@@ -4473,7 +4961,8 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_CHAR_DELETED, wxSt
         wxEVT_STC_INDICATOR_CLICK,
         wxEVT_STC_INDICATOR_RELEASE,
         wxEVT_STC_AUTOCOMP_CANCELLED,
         wxEVT_STC_INDICATOR_CLICK,
         wxEVT_STC_INDICATOR_RELEASE,
         wxEVT_STC_AUTOCOMP_CANCELLED,

-        wxEVT_STC_AUTOCOMP_CHAR_DELETED
+        wxEVT_STC_AUTOCOMP_CHAR_DELETED,
+        wxEVT_STC_HOTSPOT_RELEASE_CLICK

     };
 #endif
 
     };
 #endif
 


@@ -4515,6 +5004,7 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 #define EVT_STC_INDICATOR_RELEASE(id, fn)  wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_INDICATOR_RELEASE,     id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
 #define EVT_STC_AUTOCOMP_CANCELLED(id, fn)    wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_CANCELLED,    id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
 #define EVT_STC_AUTOCOMP_CHAR_DELETED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_CHAR_DELETED, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
 #define EVT_STC_INDICATOR_RELEASE(id, fn)  wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_INDICATOR_RELEASE,     id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
 #define EVT_STC_AUTOCOMP_CANCELLED(id, fn)    wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_CANCELLED,    id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
 #define EVT_STC_AUTOCOMP_CHAR_DELETED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_CHAR_DELETED, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),

+#define EVT_STC_HOTSPOT_RELEASE_CLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_RELEASE_CLICK, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),

 
 #endif
 
 
 #endif