Implement GetPageText for the OSX WebKit implementation.

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

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 1217ebace4356f9c025ec19c0a8e834419d588a6..559f8823d445eae7a5b90c9c92c6d105a5b84637 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////

-// Name:        stc.h
+// Name:        wx/stc/stc.h

 // Purpose:     A wxWidgets implementation of Scintilla.  This class is the
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, and in fact there
 // Purpose:     A wxWidgets implementation of Scintilla.  This class is the
 //              one meant to be used directly by wx applications.  It does not
 //              derive directly from the Scintilla classes, and in fact there


@@ -14,9 +14,20 @@
 // Created:     13-Jan-2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 by Total Control Software
 // Created:     13-Jan-2000
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 by Total Control Software

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+/*
+    IMPORTANT: include/wx/stc/stc.h is generated by src/stc/gen_iface.py from
+               src/stc/stc.h.in, don't edit stc.h file as your changes will be
+               lost after the next regeneration, edit stc.h.in and rerun the
+               gen_iface.py script instead!
+
+               Parts of this file generated by the script are found in between
+               the special "{{{" and "}}}" markers, the rest of it is copied
+               verbatim from src.h.in.
+ */
+

 #ifndef _WX_STC_STC_H_
 #define _WX_STC_STC_H_
 
 #ifndef _WX_STC_STC_H_
 #define _WX_STC_STC_H_
 


@@ -27,6 +38,12 @@
 #include "wx/control.h"
 #include "wx/dnd.h"
 #include "wx/stopwatch.h"
 #include "wx/control.h"
 #include "wx/dnd.h"
 #include "wx/stopwatch.h"

+#include "wx/versioninfo.h"
+
+#include "wx/textentry.h"
+#if wxUSE_TEXTCTRL
+    #include "wx/textctrl.h"
+#endif // wxUSE_TEXTCTRL

 
 class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 
 
 class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 


@@ -39,17 +56,9 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #endif
 #endif
 
 #endif
 #endif
 

-//----------------------------------------------------------------------
-
-// Should a wxPopupWindow be used for the call tips and autocomplete windows?
-#ifndef wxSTC_USE_POPUP
-#define wxSTC_USE_POPUP 1
-#endif

 
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------

-// BEGIN generated section.  The following code is automatically generated
-//       by gen_iface.py.  Do not edit this file.  Edit stc.h.in instead
-//       and regenerate
+// STC constants generated section {{{

 
 #define wxSTC_INVALID_POSITION -1
 
 
 #define wxSTC_INVALID_POSITION -1
 


@@ -103,6 +112,9 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MARK_ARROWS 24
 #define wxSTC_MARK_PIXMAP 25
 #define wxSTC_MARK_FULLRECT 26
 #define wxSTC_MARK_ARROWS 24
 #define wxSTC_MARK_PIXMAP 25
 #define wxSTC_MARK_FULLRECT 26

+#define wxSTC_MARK_LEFTRECT 27
+#define wxSTC_MARK_AVAILABLE 28
+#define wxSTC_MARK_UNDERLINE 29

 #define wxSTC_MARK_CHARACTER 10000
 
 // Markers used for outlining column.
 #define wxSTC_MARK_CHARACTER 10000
 
 // Markers used for outlining column.


@@ -118,6 +130,8 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MARGIN_NUMBER 1
 #define wxSTC_MARGIN_BACK 2
 #define wxSTC_MARGIN_FORE 3
 #define wxSTC_MARGIN_NUMBER 1
 #define wxSTC_MARGIN_BACK 2
 #define wxSTC_MARGIN_FORE 3

+#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.


@@ -129,7 +143,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_STYLE_INDENTGUIDE 37
 #define wxSTC_STYLE_CALLTIP 38
 #define wxSTC_STYLE_LASTPREDEFINED 39
 #define wxSTC_STYLE_INDENTGUIDE 37
 #define wxSTC_STYLE_CALLTIP 38
 #define wxSTC_STYLE_LASTPREDEFINED 39

-#define wxSTC_STYLE_MAX 127
+#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.


@@ -157,7 +171,8 @@ 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_INDIC_MAX 7
+
+// 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


@@ -166,10 +181,16 @@ 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_MAX 31
+#define wxSTC_INDIC_CONTAINER 8

 #define wxSTC_INDIC0_MASK 0x20
 #define wxSTC_INDIC1_MASK 0x40
 #define wxSTC_INDIC2_MASK 0x80
 #define wxSTC_INDICS_MASK 0xE0
 #define wxSTC_INDIC0_MASK 0x20
 #define wxSTC_INDIC1_MASK 0x40
 #define wxSTC_INDIC2_MASK 0x80
 #define wxSTC_INDICS_MASK 0xE0

+#define wxSTC_IV_NONE 0
+#define wxSTC_IV_REAL 1
+#define wxSTC_IV_LOOKFORWARD 2
+#define wxSTC_IV_LOOKBOTH 3

 
 // PrintColourMode - use same colours as screen.
 #define wxSTC_PRINT_NORMAL 0
 
 // PrintColourMode - use same colours as screen.
 #define wxSTC_PRINT_NORMAL 0


@@ -193,17 +214,12 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_FOLDLEVELBASE 0x400
 #define wxSTC_FOLDLEVELWHITEFLAG 0x1000
 #define wxSTC_FOLDLEVELHEADERFLAG 0x2000
 #define wxSTC_FOLDLEVELBASE 0x400
 #define wxSTC_FOLDLEVELWHITEFLAG 0x1000
 #define wxSTC_FOLDLEVELHEADERFLAG 0x2000

-#define wxSTC_FOLDLEVELBOXHEADERFLAG 0x4000
-#define wxSTC_FOLDLEVELBOXFOOTERFLAG 0x8000
-#define wxSTC_FOLDLEVELCONTRACTED 0x10000
-#define wxSTC_FOLDLEVELUNINDENT 0x20000

 #define wxSTC_FOLDLEVELNUMBERMASK 0x0FFF
 #define wxSTC_FOLDFLAG_LINEBEFORE_EXPANDED 0x0002
 #define wxSTC_FOLDFLAG_LINEBEFORE_CONTRACTED 0x0004
 #define wxSTC_FOLDFLAG_LINEAFTER_EXPANDED 0x0008
 #define wxSTC_FOLDFLAG_LINEAFTER_CONTRACTED 0x0010
 #define wxSTC_FOLDFLAG_LEVELNUMBERS 0x0040
 #define wxSTC_FOLDLEVELNUMBERMASK 0x0FFF
 #define wxSTC_FOLDFLAG_LINEBEFORE_EXPANDED 0x0002
 #define wxSTC_FOLDFLAG_LINEBEFORE_CONTRACTED 0x0004
 #define wxSTC_FOLDFLAG_LINEAFTER_EXPANDED 0x0008
 #define wxSTC_FOLDFLAG_LINEAFTER_CONTRACTED 0x0010
 #define wxSTC_FOLDFLAG_LEVELNUMBERS 0x0040

-#define wxSTC_FOLDFLAG_BOX 0x0001

 #define wxSTC_TIME_FOREVER 10000000
 #define wxSTC_WRAP_NONE 0
 #define wxSTC_WRAP_WORD 1
 #define wxSTC_TIME_FOREVER 10000000
 #define wxSTC_WRAP_NONE 0
 #define wxSTC_WRAP_WORD 1


@@ -214,13 +230,26 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #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

+#define wxSTC_WRAPINDENT_FIXED 0
+#define wxSTC_WRAPINDENT_SAME 1
+#define wxSTC_WRAPINDENT_INDENT 2

 #define wxSTC_CACHE_NONE 0
 #define wxSTC_CACHE_CARET 1
 #define wxSTC_CACHE_PAGE 2
 #define wxSTC_CACHE_DOCUMENT 3
 #define wxSTC_CACHE_NONE 0
 #define wxSTC_CACHE_CARET 1
 #define wxSTC_CACHE_PAGE 2
 #define wxSTC_CACHE_DOCUMENT 3

+
+// 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_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

+#define wxSTC_STATUS_OK 0
+#define wxSTC_STATUS_FAILURE 1
+#define wxSTC_STATUS_BADALLOC 2

 #define wxSTC_CURSORNORMAL -1
 #define wxSTC_CURSORWAIT 4
 
 #define wxSTC_CURSORNORMAL -1
 #define wxSTC_CURSORWAIT 4
 


@@ -253,14 +282,23 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 // 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
 // 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

-
-// Selection modes

 #define wxSTC_SEL_STREAM 0
 #define wxSTC_SEL_RECTANGLE 1
 #define wxSTC_SEL_LINES 2
 #define wxSTC_SEL_STREAM 0
 #define wxSTC_SEL_RECTANGLE 1
 #define wxSTC_SEL_LINES 2

+#define wxSTC_SEL_THIN 3

 #define wxSTC_ALPHA_TRANSPARENT 0
 #define wxSTC_ALPHA_OPAQUE 255
 #define wxSTC_ALPHA_NOALPHA 256
 #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_ANNOTATION_HIDDEN 0
+#define wxSTC_ANNOTATION_STANDARD 1
+#define wxSTC_ANNOTATION_BOXED 2
+#define wxSTC_UNDO_MAY_COALESCE 1
+#define wxSTC_SCVS_NONE 0
+#define wxSTC_SCVS_RECTANGULARSELECTION 1
+#define wxSTC_SCVS_USERACCESSIBLE 2

 
 // Maximum value of keywordSet parameter of SetKeyWords.
 #define wxSTC_KEYWORDSET_MAX 8
 
 // Maximum value of keywordSet parameter of SetKeyWords.
 #define wxSTC_KEYWORDSET_MAX 8


@@ -282,7 +320,13 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_MOD_BEFOREINSERT 0x400
 #define wxSTC_MOD_BEFOREDELETE 0x800
 #define wxSTC_MULTILINEUNDOREDO 0x1000
 #define wxSTC_MOD_BEFOREINSERT 0x400
 #define wxSTC_MOD_BEFOREDELETE 0x800
 #define wxSTC_MULTILINEUNDOREDO 0x1000

-#define wxSTC_MODEVENTMASKALL 0x1FFF
+#define wxSTC_STARTACTION 0x2000
+#define wxSTC_MOD_CHANGEINDICATOR 0x4000
+#define wxSTC_MOD_CHANGELINESTATE 0x8000
+#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.
 
 // Symbolic key codes and modifier flags.
 // ASCII and other printable characters below 256.


@@ -304,10 +348,14 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_KEY_ADD 310
 #define wxSTC_KEY_SUBTRACT 311
 #define wxSTC_KEY_DIVIDE 312
 #define wxSTC_KEY_ADD 310
 #define wxSTC_KEY_SUBTRACT 311
 #define wxSTC_KEY_DIVIDE 312

+#define wxSTC_KEY_WIN 313
+#define wxSTC_KEY_RWIN 314
+#define wxSTC_KEY_MENU 315

 #define wxSTC_SCMOD_NORM 0
 #define wxSTC_SCMOD_SHIFT 1
 #define wxSTC_SCMOD_CTRL 2
 #define wxSTC_SCMOD_ALT 4
 #define wxSTC_SCMOD_NORM 0
 #define wxSTC_SCMOD_SHIFT 1
 #define wxSTC_SCMOD_CTRL 2
 #define wxSTC_SCMOD_ALT 4

+#define wxSTC_SCMOD_SUPER 8

 
 // For SciLexer.h
 #define wxSTC_LEX_CONTAINER 0
 
 // For SciLexer.h
 #define wxSTC_LEX_CONTAINER 0


@@ -387,6 +435,26 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_LEX_INNOSETUP 76
 #define wxSTC_LEX_OPAL 77
 #define wxSTC_LEX_SPICE 78
 #define wxSTC_LEX_INNOSETUP 76
 #define wxSTC_LEX_OPAL 77
 #define wxSTC_LEX_SPICE 78

+#define wxSTC_LEX_D 79
+#define wxSTC_LEX_CMAKE 80
+#define wxSTC_LEX_GAP 81
+#define wxSTC_LEX_PLM 82
+#define wxSTC_LEX_PROGRESS 83
+#define wxSTC_LEX_ABAQUS 84
+#define wxSTC_LEX_ASYMPTOTE 85
+#define wxSTC_LEX_R 86
+#define wxSTC_LEX_MAGIK 87
+#define wxSTC_LEX_POWERSHELL 88
+#define wxSTC_LEX_MYSQL 89
+#define wxSTC_LEX_PO 90
+#define wxSTC_LEX_TAL 91
+#define wxSTC_LEX_COBOL 92
+#define wxSTC_LEX_TACL 93
+#define wxSTC_LEX_SORCUS 94
+#define wxSTC_LEX_POWERPRO 95
+#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.
 
 // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 // value assigned in sequence from SCLEX_AUTOMATIC+1.


@@ -432,6 +500,31 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_C_COMMENTDOCKEYWORDERROR 18
 #define wxSTC_C_GLOBALCLASS 19
 
 #define wxSTC_C_COMMENTDOCKEYWORDERROR 18
 #define wxSTC_C_GLOBALCLASS 19
 

+// Lexical states for SCLEX_D
+#define wxSTC_D_DEFAULT 0
+#define wxSTC_D_COMMENT 1
+#define wxSTC_D_COMMENTLINE 2
+#define wxSTC_D_COMMENTDOC 3
+#define wxSTC_D_COMMENTNESTED 4
+#define wxSTC_D_NUMBER 5
+#define wxSTC_D_WORD 6
+#define wxSTC_D_WORD2 7
+#define wxSTC_D_WORD3 8
+#define wxSTC_D_TYPEDEF 9
+#define wxSTC_D_STRING 10
+#define wxSTC_D_STRINGEOL 11
+#define wxSTC_D_CHARACTER 12
+#define wxSTC_D_OPERATOR 13
+#define wxSTC_D_IDENTIFIER 14
+#define wxSTC_D_COMMENTLINEDOC 15
+#define wxSTC_D_COMMENTDOCKEYWORD 16
+#define wxSTC_D_COMMENTDOCKEYWORDERROR 17
+#define wxSTC_D_STRINGB 18
+#define wxSTC_D_STRINGR 19
+#define wxSTC_D_WORD5 20
+#define wxSTC_D_WORD6 21
+#define wxSTC_D_WORD7 22
+

 // Lexical states for SCLEX_TCL
 #define wxSTC_TCL_DEFAULT 0
 #define wxSTC_TCL_COMMENT 1
 // Lexical states for SCLEX_TCL
 #define wxSTC_TCL_DEFAULT 0
 #define wxSTC_TCL_COMMENT 1


@@ -626,6 +719,9 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_PL_STRING_QR 29
 #define wxSTC_PL_STRING_QW 30
 #define wxSTC_PL_POD_VERB 31
 #define wxSTC_PL_STRING_QR 29
 #define wxSTC_PL_STRING_QW 30
 #define wxSTC_PL_POD_VERB 31

+#define wxSTC_PL_SUB_PROTOTYPE 40
+#define wxSTC_PL_FORMAT_IDENT 41
+#define wxSTC_PL_FORMAT 42

 
 // Lexical states for SCLEX_RUBY
 #define wxSTC_RB_DEFAULT 0
 
 // Lexical states for SCLEX_RUBY
 #define wxSTC_RB_DEFAULT 0


@@ -743,6 +839,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_ERR_ABSF 18
 #define wxSTC_ERR_TIDY 19
 #define wxSTC_ERR_JAVA_STACK 20
 #define wxSTC_ERR_ABSF 18
 #define wxSTC_ERR_TIDY 19
 #define wxSTC_ERR_JAVA_STACK 20

+#define wxSTC_ERR_VALUE 21

 
 // Lexical states for SCLEX_BATCH
 #define wxSTC_BAT_DEFAULT 0
 
 // Lexical states for SCLEX_BATCH
 #define wxSTC_BAT_DEFAULT 0


@@ -771,6 +868,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_DIFF_POSITION 4
 #define wxSTC_DIFF_DELETED 5
 #define wxSTC_DIFF_ADDED 6
 #define wxSTC_DIFF_POSITION 4
 #define wxSTC_DIFF_DELETED 5
 #define wxSTC_DIFF_ADDED 6

+#define wxSTC_DIFF_CHANGED 7

 
 // Lexical states for SCLEX_CONF (Apache Configuration Files Lexer)
 #define wxSTC_CONF_DEFAULT 0
 
 // Lexical states for SCLEX_CONF (Apache Configuration Files Lexer)
 #define wxSTC_CONF_DEFAULT 0


@@ -963,6 +1061,11 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_CSS_SINGLESTRING 14
 #define wxSTC_CSS_IDENTIFIER2 15
 #define wxSTC_CSS_ATTRIBUTE 16
 #define wxSTC_CSS_SINGLESTRING 14
 #define wxSTC_CSS_IDENTIFIER2 15
 #define wxSTC_CSS_ATTRIBUTE 16

+#define wxSTC_CSS_IDENTIFIER3 17
+#define wxSTC_CSS_PSEUDOELEMENT 18
+#define wxSTC_CSS_EXTENDED_IDENTIFIER 19
+#define wxSTC_CSS_EXTENDED_PSEUDOCLASS 20
+#define wxSTC_CSS_EXTENDED_PSEUDOELEMENT 21

 
 // Lexical states for SCLEX_POV
 #define wxSTC_POV_DEFAULT 0
 
 // Lexical states for SCLEX_POV
 #define wxSTC_POV_DEFAULT 0


@@ -1107,6 +1210,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_YAML_DOCUMENT 6
 #define wxSTC_YAML_TEXT 7
 #define wxSTC_YAML_ERROR 8
 #define wxSTC_YAML_DOCUMENT 6
 #define wxSTC_YAML_TEXT 7
 #define wxSTC_YAML_ERROR 8

+#define wxSTC_YAML_OPERATOR 9

 
 // Lexical states for SCLEX_TEX
 #define wxSTC_TEX_DEFAULT 0
 
 // Lexical states for SCLEX_TEX
 #define wxSTC_TEX_DEFAULT 0


@@ -1136,8 +1240,19 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_ERLANG_CHARACTER 9
 #define wxSTC_ERLANG_MACRO 10
 #define wxSTC_ERLANG_RECORD 11
 #define wxSTC_ERLANG_CHARACTER 9
 #define wxSTC_ERLANG_MACRO 10
 #define wxSTC_ERLANG_RECORD 11

-#define wxSTC_ERLANG_SEPARATOR 12
+#define wxSTC_ERLANG_PREPROC 12

 #define wxSTC_ERLANG_NODE_NAME 13
 #define wxSTC_ERLANG_NODE_NAME 13

+#define wxSTC_ERLANG_COMMENT_FUNCTION 14
+#define wxSTC_ERLANG_COMMENT_MODULE 15
+#define wxSTC_ERLANG_COMMENT_DOC 16
+#define wxSTC_ERLANG_COMMENT_DOC_MACRO 17
+#define wxSTC_ERLANG_ATOM_QUOTED 18
+#define wxSTC_ERLANG_MACRO_QUOTED 19
+#define wxSTC_ERLANG_RECORD_QUOTED 20
+#define wxSTC_ERLANG_NODE_NAME_QUOTED 21
+#define wxSTC_ERLANG_BIFS 22
+#define wxSTC_ERLANG_MODULES 23
+#define wxSTC_ERLANG_MODULES_ATT 24

 #define wxSTC_ERLANG_UNKNOWN 31
 
 // Lexical states for SCLEX_OCTAVE are identical to MatLab
 #define wxSTC_ERLANG_UNKNOWN 31
 
 // Lexical states for SCLEX_OCTAVE are identical to MatLab


@@ -1309,6 +1424,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_CAML_OPERATOR 7
 #define wxSTC_CAML_NUMBER 8
 #define wxSTC_CAML_CHAR 9
 #define wxSTC_CAML_OPERATOR 7
 #define wxSTC_CAML_NUMBER 8
 #define wxSTC_CAML_CHAR 9

+#define wxSTC_CAML_WHITE 10

 #define wxSTC_CAML_STRING 11
 #define wxSTC_CAML_COMMENT 12
 #define wxSTC_CAML_COMMENT1 13
 #define wxSTC_CAML_STRING 11
 #define wxSTC_CAML_COMMENT 12
 #define wxSTC_CAML_COMMENT1 13


@@ -1355,6 +1471,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_T3_USER1 17
 #define wxSTC_T3_USER2 18
 #define wxSTC_T3_USER3 19
 #define wxSTC_T3_USER1 17
 #define wxSTC_T3_USER2 18
 #define wxSTC_T3_USER3 19

+#define wxSTC_T3_BRACE 20

 
 // Lexical states for SCLEX_REBOL
 #define wxSTC_REBOL_DEFAULT 0
 
 // Lexical states for SCLEX_REBOL
 #define wxSTC_REBOL_DEFAULT 0


@@ -1481,7 +1598,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #define wxSTC_INNO_PARAMETER 3
 #define wxSTC_INNO_SECTION 4
 #define wxSTC_INNO_PREPROC 5
 #define wxSTC_INNO_PARAMETER 3
 #define wxSTC_INNO_SECTION 4
 #define wxSTC_INNO_PREPROC 5

-#define wxSTC_INNO_PREPROC_INLINE 6
+#define wxSTC_INNO_INLINE_EXPANSION 6

 #define wxSTC_INNO_COMMENT_PASCAL 7
 #define wxSTC_INNO_KEYWORD_PASCAL 8
 #define wxSTC_INNO_KEYWORD_USER 9
 #define wxSTC_INNO_COMMENT_PASCAL 7
 #define wxSTC_INNO_KEYWORD_PASCAL 8
 #define wxSTC_INNO_KEYWORD_USER 9


@@ -1512,9 +1629,285 @@ 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
+#define wxSTC_CMAKE_DEFAULT 0
+#define wxSTC_CMAKE_COMMENT 1
+#define wxSTC_CMAKE_STRINGDQ 2
+#define wxSTC_CMAKE_STRINGLQ 3
+#define wxSTC_CMAKE_STRINGRQ 4
+#define wxSTC_CMAKE_COMMANDS 5
+#define wxSTC_CMAKE_PARAMETERS 6
+#define wxSTC_CMAKE_VARIABLE 7
+#define wxSTC_CMAKE_USERDEFINED 8
+#define wxSTC_CMAKE_WHILEDEF 9
+#define wxSTC_CMAKE_FOREACHDEF 10
+#define wxSTC_CMAKE_IFDEFINEDEF 11
+#define wxSTC_CMAKE_MACRODEF 12
+#define wxSTC_CMAKE_STRINGVAR 13
+#define wxSTC_CMAKE_NUMBER 14
+
+// Lexical states for SCLEX_GAP
+#define wxSTC_GAP_DEFAULT 0
+#define wxSTC_GAP_IDENTIFIER 1
+#define wxSTC_GAP_KEYWORD 2
+#define wxSTC_GAP_KEYWORD2 3
+#define wxSTC_GAP_KEYWORD3 4
+#define wxSTC_GAP_KEYWORD4 5
+#define wxSTC_GAP_STRING 6
+#define wxSTC_GAP_CHAR 7
+#define wxSTC_GAP_OPERATOR 8
+#define wxSTC_GAP_COMMENT 9
+#define wxSTC_GAP_NUMBER 10
+#define wxSTC_GAP_STRINGEOL 11
+
+// Lexical state for SCLEX_PLM
+#define wxSTC_PLM_DEFAULT 0
+#define wxSTC_PLM_COMMENT 1
+#define wxSTC_PLM_STRING 2
+#define wxSTC_PLM_NUMBER 3
+#define wxSTC_PLM_IDENTIFIER 4
+#define wxSTC_PLM_OPERATOR 5
+#define wxSTC_PLM_CONTROL 6
+#define wxSTC_PLM_KEYWORD 7
+
+// Lexical state for SCLEX_PROGRESS
+#define wxSTC_4GL_DEFAULT 0
+#define wxSTC_4GL_NUMBER 1
+#define wxSTC_4GL_WORD 2
+#define wxSTC_4GL_STRING 3
+#define wxSTC_4GL_CHARACTER 4
+#define wxSTC_4GL_PREPROCESSOR 5
+#define wxSTC_4GL_OPERATOR 6
+#define wxSTC_4GL_IDENTIFIER 7
+#define wxSTC_4GL_BLOCK 8
+#define wxSTC_4GL_END 9
+#define wxSTC_4GL_COMMENT1 10
+#define wxSTC_4GL_COMMENT2 11
+#define wxSTC_4GL_COMMENT3 12
+#define wxSTC_4GL_COMMENT4 13
+#define wxSTC_4GL_COMMENT5 14
+#define wxSTC_4GL_COMMENT6 15
+#define wxSTC_4GL_DEFAULT_ 16
+#define wxSTC_4GL_NUMBER_ 17
+#define wxSTC_4GL_WORD_ 18
+#define wxSTC_4GL_STRING_ 19
+#define wxSTC_4GL_CHARACTER_ 20
+#define wxSTC_4GL_PREPROCESSOR_ 21
+#define wxSTC_4GL_OPERATOR_ 22
+#define wxSTC_4GL_IDENTIFIER_ 23
+#define wxSTC_4GL_BLOCK_ 24
+#define wxSTC_4GL_END_ 25
+#define wxSTC_4GL_COMMENT1_ 26
+#define wxSTC_4GL_COMMENT2_ 27
+#define wxSTC_4GL_COMMENT3_ 28
+#define wxSTC_4GL_COMMENT4_ 29
+#define wxSTC_4GL_COMMENT5_ 30
+#define wxSTC_4GL_COMMENT6_ 31
+
+// Lexical states for SCLEX_ABAQUS
+#define wxSTC_ABAQUS_DEFAULT 0
+#define wxSTC_ABAQUS_COMMENT 1
+#define wxSTC_ABAQUS_COMMENTBLOCK 2
+#define wxSTC_ABAQUS_NUMBER 3
+#define wxSTC_ABAQUS_STRING 4
+#define wxSTC_ABAQUS_OPERATOR 5
+#define wxSTC_ABAQUS_WORD 6
+#define wxSTC_ABAQUS_PROCESSOR 7
+#define wxSTC_ABAQUS_COMMAND 8
+#define wxSTC_ABAQUS_SLASHCOMMAND 9
+#define wxSTC_ABAQUS_STARCOMMAND 10
+#define wxSTC_ABAQUS_ARGUMENT 11
+#define wxSTC_ABAQUS_FUNCTION 12
+
+// Lexical states for SCLEX_ASYMPTOTE
+#define wxSTC_ASY_DEFAULT 0
+#define wxSTC_ASY_COMMENT 1
+#define wxSTC_ASY_COMMENTLINE 2
+#define wxSTC_ASY_NUMBER 3
+#define wxSTC_ASY_WORD 4
+#define wxSTC_ASY_STRING 5
+#define wxSTC_ASY_CHARACTER 6
+#define wxSTC_ASY_OPERATOR 7
+#define wxSTC_ASY_IDENTIFIER 8
+#define wxSTC_ASY_STRINGEOL 9
+#define wxSTC_ASY_COMMENTLINEDOC 10
+#define wxSTC_ASY_WORD2 11
+
+// Lexical states for SCLEX_R
+#define wxSTC_R_DEFAULT 0
+#define wxSTC_R_COMMENT 1
+#define wxSTC_R_KWORD 2
+#define wxSTC_R_BASEKWORD 3
+#define wxSTC_R_OTHERKWORD 4
+#define wxSTC_R_NUMBER 5
+#define wxSTC_R_STRING 6
+#define wxSTC_R_STRING2 7
+#define wxSTC_R_OPERATOR 8
+#define wxSTC_R_IDENTIFIER 9
+#define wxSTC_R_INFIX 10
+#define wxSTC_R_INFIXEOL 11
+
+// Lexical state for SCLEX_MAGIKSF
+#define wxSTC_MAGIK_DEFAULT 0
+#define wxSTC_MAGIK_COMMENT 1
+#define wxSTC_MAGIK_HYPER_COMMENT 16
+#define wxSTC_MAGIK_STRING 2
+#define wxSTC_MAGIK_CHARACTER 3
+#define wxSTC_MAGIK_NUMBER 4
+#define wxSTC_MAGIK_IDENTIFIER 5
+#define wxSTC_MAGIK_OPERATOR 6
+#define wxSTC_MAGIK_FLOW 7
+#define wxSTC_MAGIK_CONTAINER 8
+#define wxSTC_MAGIK_BRACKET_BLOCK 9
+#define wxSTC_MAGIK_BRACE_BLOCK 10
+#define wxSTC_MAGIK_SQBRACKET_BLOCK 11
+#define wxSTC_MAGIK_UNKNOWN_KEYWORD 12
+#define wxSTC_MAGIK_KEYWORD 13
+#define wxSTC_MAGIK_PRAGMA 14
+#define wxSTC_MAGIK_SYMBOL 15
+
+// Lexical state for SCLEX_POWERSHELL
+#define wxSTC_POWERSHELL_DEFAULT 0
+#define wxSTC_POWERSHELL_COMMENT 1
+#define wxSTC_POWERSHELL_STRING 2
+#define wxSTC_POWERSHELL_CHARACTER 3
+#define wxSTC_POWERSHELL_NUMBER 4
+#define wxSTC_POWERSHELL_VARIABLE 5
+#define wxSTC_POWERSHELL_OPERATOR 6
+#define wxSTC_POWERSHELL_IDENTIFIER 7
+#define wxSTC_POWERSHELL_KEYWORD 8
+#define wxSTC_POWERSHELL_CMDLET 9
+#define wxSTC_POWERSHELL_ALIAS 10
+
+// Lexical state for SCLEX_MYSQL
+#define wxSTC_MYSQL_DEFAULT 0
+#define wxSTC_MYSQL_COMMENT 1
+#define wxSTC_MYSQL_COMMENTLINE 2
+#define wxSTC_MYSQL_VARIABLE 3
+#define wxSTC_MYSQL_SYSTEMVARIABLE 4
+#define wxSTC_MYSQL_KNOWNSYSTEMVARIABLE 5
+#define wxSTC_MYSQL_NUMBER 6
+#define wxSTC_MYSQL_MAJORKEYWORD 7
+#define wxSTC_MYSQL_KEYWORD 8
+#define wxSTC_MYSQL_DATABASEOBJECT 9
+#define wxSTC_MYSQL_PROCEDUREKEYWORD 10
+#define wxSTC_MYSQL_STRING 11
+#define wxSTC_MYSQL_SQSTRING 12
+#define wxSTC_MYSQL_DQSTRING 13
+#define wxSTC_MYSQL_OPERATOR 14
+#define wxSTC_MYSQL_FUNCTION 15
+#define wxSTC_MYSQL_IDENTIFIER 16
+#define wxSTC_MYSQL_QUOTEDIDENTIFIER 17
+#define wxSTC_MYSQL_USER1 18
+#define wxSTC_MYSQL_USER2 19
+#define wxSTC_MYSQL_USER3 20
+#define wxSTC_MYSQL_HIDDENCOMMAND 21
+
+// Lexical state for SCLEX_PO
+#define wxSTC_PO_DEFAULT 0
+#define wxSTC_PO_COMMENT 1
+#define wxSTC_PO_MSGID 2
+#define wxSTC_PO_MSGID_TEXT 3
+#define wxSTC_PO_MSGSTR 4
+#define wxSTC_PO_MSGSTR_TEXT 5
+#define wxSTC_PO_MSGCTXT 6
+#define wxSTC_PO_MSGCTXT_TEXT 7
+#define wxSTC_PO_FUZZY 8
+
+// Lexical states for SCLEX_PASCAL
+#define wxSTC_PAS_DEFAULT 0
+#define wxSTC_PAS_IDENTIFIER 1
+#define wxSTC_PAS_COMMENT 2
+#define wxSTC_PAS_COMMENT2 3
+#define wxSTC_PAS_COMMENTLINE 4
+#define wxSTC_PAS_PREPROCESSOR 5
+#define wxSTC_PAS_PREPROCESSOR2 6
+#define wxSTC_PAS_NUMBER 7
+#define wxSTC_PAS_HEXNUMBER 8
+#define wxSTC_PAS_WORD 9
+#define wxSTC_PAS_STRING 10
+#define wxSTC_PAS_STRINGEOL 11
+#define wxSTC_PAS_CHARACTER 12
+#define wxSTC_PAS_OPERATOR 13
+#define wxSTC_PAS_ASM 14
+
+// Lexical state for SCLEX_SORCUS
+#define wxSTC_SORCUS_DEFAULT 0
+#define wxSTC_SORCUS_COMMAND 1
+#define wxSTC_SORCUS_PARAMETER 2
+#define wxSTC_SORCUS_COMMENTLINE 3
+#define wxSTC_SORCUS_STRING 4
+#define wxSTC_SORCUS_STRINGEOL 5
+#define wxSTC_SORCUS_IDENTIFIER 6
+#define wxSTC_SORCUS_OPERATOR 7
+#define wxSTC_SORCUS_NUMBER 8
+#define wxSTC_SORCUS_CONSTANT 9
+
+// Lexical state for SCLEX_POWERPRO
+#define wxSTC_POWERPRO_DEFAULT 0
+#define wxSTC_POWERPRO_COMMENTBLOCK 1
+#define wxSTC_POWERPRO_COMMENTLINE 2
+#define wxSTC_POWERPRO_NUMBER 3
+#define wxSTC_POWERPRO_WORD 4
+#define wxSTC_POWERPRO_WORD2 5
+#define wxSTC_POWERPRO_WORD3 6
+#define wxSTC_POWERPRO_WORD4 7
+#define wxSTC_POWERPRO_DOUBLEQUOTEDSTRING 8
+#define wxSTC_POWERPRO_SINGLEQUOTEDSTRING 9
+#define wxSTC_POWERPRO_LINECONTINUE 10
+#define wxSTC_POWERPRO_OPERATOR 11
+#define wxSTC_POWERPRO_IDENTIFIER 12
+#define wxSTC_POWERPRO_STRINGEOL 13
+#define wxSTC_POWERPRO_VERBATIM 14
+#define wxSTC_POWERPRO_ALTQUOTE 15
+#define wxSTC_POWERPRO_FUNCTION 16
+
+// Lexical states for SCLEX_SML
+#define wxSTC_SML_DEFAULT 0
+#define wxSTC_SML_IDENTIFIER 1
+#define wxSTC_SML_TAGNAME 2
+#define wxSTC_SML_KEYWORD 3
+#define wxSTC_SML_KEYWORD2 4
+#define wxSTC_SML_KEYWORD3 5
+#define wxSTC_SML_LINENUM 6
+#define wxSTC_SML_OPERATOR 7
+#define wxSTC_SML_NUMBER 8
+#define wxSTC_SML_CHAR 9
+#define wxSTC_SML_STRING 11
+#define wxSTC_SML_COMMENT 12
+#define wxSTC_SML_COMMENT1 13
+#define wxSTC_SML_COMMENT2 14
+#define wxSTC_SML_COMMENT3 15
+
+// Lexical state for SCLEX_MARKDOWN
+#define wxSTC_MARKDOWN_DEFAULT 0
+#define wxSTC_MARKDOWN_LINE_BEGIN 1
+#define wxSTC_MARKDOWN_STRONG1 2
+#define wxSTC_MARKDOWN_STRONG2 3
+#define wxSTC_MARKDOWN_EM1 4
+#define wxSTC_MARKDOWN_EM2 5
+#define wxSTC_MARKDOWN_HEADER1 6
+#define wxSTC_MARKDOWN_HEADER2 7
+#define wxSTC_MARKDOWN_HEADER3 8
+#define wxSTC_MARKDOWN_HEADER4 9
+#define wxSTC_MARKDOWN_HEADER5 10
+#define wxSTC_MARKDOWN_HEADER6 11
+#define wxSTC_MARKDOWN_PRECHAR 12
+#define wxSTC_MARKDOWN_ULIST_ITEM 13
+#define wxSTC_MARKDOWN_OLIST_ITEM 14
+#define wxSTC_MARKDOWN_BLOCKQUOTE 15
+#define wxSTC_MARKDOWN_STRIKEOUT 16
+#define wxSTC_MARKDOWN_HRULE 17
+#define wxSTC_MARKDOWN_LINK 18
+#define wxSTC_MARKDOWN_CODE 19
+#define wxSTC_MARKDOWN_CODE2 20
+#define wxSTC_MARKDOWN_CODEBK 21
+
+//}}}
+//----------------------------------------------------------------------

 
 

-//-----------------------------------------
-// Commands that can be bound to keystrokes
+//----------------------------------------------------------------------
+// Commands that can be bound to keystrokes section {{{

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


@@ -1651,6 +2044,9 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 // Delete the word to the right of the caret.
 #define wxSTC_CMD_DELWORDRIGHT 2336
 
 // Delete the word to the right of the caret.
 #define wxSTC_CMD_DELWORDRIGHT 2336
 

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

 // Cut the line containing the caret.
 #define wxSTC_CMD_LINECUT 2337
 
 // Cut the line containing the caret.
 #define wxSTC_CMD_LINECUT 2337
 


@@ -1787,8 +2183,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 // Move caret right one word, position cursor at end of word, extending selection to new caret position.
 #define wxSTC_CMD_WORDRIGHTENDEXTEND 2442
 
 // Move caret right one word, position cursor at end of word, extending selection to new caret position.
 #define wxSTC_CMD_WORDRIGHTENDEXTEND 2442
 

-
-// END of generated section
+//}}}

 //----------------------------------------------------------------------
 
 class  ScintillaWX;                      // forward declare
 //----------------------------------------------------------------------
 
 class  ScintillaWX;                      // forward declare


@@ -1796,14 +2191,20 @@ class  WordList;
 struct SCNotification;
 
 #ifndef SWIG
 struct SCNotification;
 
 #ifndef SWIG

-extern WXDLLIMPEXP_STC const wxChar* wxSTCNameStr;
-class WXDLLIMPEXP_FWD_STC wxStyledTextCtrl;
-class WXDLLIMPEXP_FWD_STC wxStyledTextEvent;
+extern WXDLLIMPEXP_DATA_STC(const char) wxSTCNameStr[];
+class  WXDLLIMPEXP_FWD_STC wxStyledTextCtrl;
+class  WXDLLIMPEXP_FWD_STC wxStyledTextEvent;

 #endif
 
 //----------------------------------------------------------------------
 
 #endif
 
 //----------------------------------------------------------------------
 

-class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {
+class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl,
+#if wxUSE_TEXTCTRL
+                                         public wxTextCtrlIface
+#else // !wxUSE_TEXTCTRL
+                                         public wxTextEntryBase
+#endif // wxUSE_TEXTCTRL/!wxUSE_TEXTCTRL
+{

 public:
 
 #ifdef SWIG
 public:
 
 #ifdef SWIG


@@ -1832,10 +2233,8 @@ public:
                 const wxString& name = wxSTCNameStr);
 
 
                 const wxString& name = wxSTCNameStr);
 
 

-//----------------------------------------------------------------------
-// BEGIN generated section.  The following code is automatically generated
-//       by gen_iface.py.  Do not edit this file.  Edit stc.h.in instead
-//       and regenerate
+    //----------------------------------------------------------------------
+    // Generated method declaration section {{{

 
 
     // Add text to the document at current position.
 
 
     // Add text to the document at current position.


@@ -1853,20 +2252,20 @@ public:
     // Set all style bytes to 0, remove all folding information.
     void ClearDocumentStyle();
 
     // Set all style bytes to 0, remove all folding information.
     void ClearDocumentStyle();
 

-    // Returns the number of characters in the document.
-    int GetLength();
+    // Returns the number of bytes in the document.
+    int GetLength() const;

 
     // Returns the character byte at the position.
 
     // Returns the character byte at the position.

-    int GetCharAt(int pos);
+    int GetCharAt(int pos) const;

 
     // Returns the position of the caret.
 
     // Returns the position of the caret.

-    int GetCurrentPos();
+    int GetCurrentPos() const;

 
     // Returns the position of the opposite end of the selection to the caret.
 
     // Returns the position of the opposite end of the selection to the caret.

-    int GetAnchor();
+    int GetAnchor() const;

 
     // Returns the style byte at the position.
 
     // Returns the style byte at the position.

-    int GetStyleAt(int pos);
+    int GetStyleAt(int pos) const;

 
     // Redoes the next action on the undo history.
     void Redo();
 
     // Redoes the next action on the undo history.
     void Redo();


@@ -1886,7 +2285,7 @@ public:
     wxMemoryBuffer GetStyledText(int startPos, int endPos);
 
     // Are there any redoable actions in the undo history?
     wxMemoryBuffer GetStyledText(int startPos, int endPos);
 
     // Are there any redoable actions in the undo history?

-    bool CanRedo();
+    bool CanRedo() const;

 
     // Retrieve the line number at which a particular marker is located.
     int MarkerLineFromHandle(int handle);
 
     // Retrieve the line number at which a particular marker is located.
     int MarkerLineFromHandle(int handle);


@@ -1895,17 +2294,17 @@ public:
     void MarkerDeleteHandle(int handle);
 
     // Is undo history being collected?
     void MarkerDeleteHandle(int handle);
 
     // Is undo history being collected?

-    bool GetUndoCollection();
+    bool GetUndoCollection() const;

 
     // Are white space characters currently visible?
     // Returns one of SCWS_* constants.
 
     // Are white space characters currently visible?
     // Returns one of SCWS_* constants.

-    int GetViewWhiteSpace();
+    int GetViewWhiteSpace() const;

 
     // Make white space characters invisible, always visible or visible outside indentation.
     void SetViewWhiteSpace(int viewWS);
 
     // Find the position from a point within the window.
 
     // Make white space characters invisible, always visible or visible outside indentation.
     void SetViewWhiteSpace(int viewWS);
 
     // Find the position from a point within the window.

-    int PositionFromPoint(wxPoint pt);
+    int PositionFromPoint(wxPoint pt) const;

 
     // Find the position from a point within the window but return
     // INVALID_POSITION if not close to text.
 
     // Find the position from a point within the window but return
     // INVALID_POSITION if not close to text.


@@ -1930,13 +2329,13 @@ public:
 #endif
 
     // Retrieve the position of the last correctly styled character.
 #endif
 
     // Retrieve the position of the last correctly styled character.

-    int GetEndStyled();
+    int GetEndStyled() const;

 
     // Convert all line endings in the document to one mode.
     void ConvertEOLs(int eolMode);
 
     // Retrieve the current end of line mode - one of CRLF, CR, or LF.
 
     // Convert all line endings in the document to one mode.
     void ConvertEOLs(int eolMode);
 
     // Retrieve the current end of line mode - one of CRLF, CR, or LF.

-    int GetEOLMode();
+    int GetEOLMode() const;

 
     // Set the current end of line mode.
     void SetEOLMode(int eolMode);
 
     // Set the current end of line mode.
     void SetEOLMode(int eolMode);


@@ -1950,7 +2349,7 @@ public:
     void SetStyling(int length, int style);
 
     // Is drawing done first into a buffer or direct to the screen?
     void SetStyling(int length, int style);
 
     // Is drawing done first into a buffer or direct to the screen?

-    bool GetBufferedDraw();
+    bool GetBufferedDraw() const;

 
     // If drawing is buffered then each line of text is drawn into a bitmap buffer
     // before drawing it to the screen to avoid flicker.
 
     // If drawing is buffered then each line of text is drawn into a bitmap buffer
     // before drawing it to the screen to avoid flicker.


@@ -1960,7 +2359,7 @@ public:
     void SetTabWidth(int tabWidth);
 
     // Retrieve the visible size of a tab.
     void SetTabWidth(int tabWidth);
 
     // Retrieve the visible size of a tab.

-    int GetTabWidth();
+    int GetTabWidth() const;

 
     // Set the code page used to interpret the bytes of the document as characters.
     void SetCodePage(int codePage);
 
     // Set the code page used to interpret the bytes of the document as characters.
     void SetCodePage(int codePage);


@@ -2008,25 +2407,25 @@ public:
     void SetMarginType(int margin, int marginType);
 
     // Retrieve the type of a margin.
     void SetMarginType(int margin, int marginType);
 
     // Retrieve the type of a margin.

-    int GetMarginType(int margin);
+    int GetMarginType(int margin) const;

 
     // Set the width of a margin to a width expressed in pixels.
     void SetMarginWidth(int margin, int pixelWidth);
 
     // Retrieve the width of a margin in pixels.
 
     // Set the width of a margin to a width expressed in pixels.
     void SetMarginWidth(int margin, int pixelWidth);
 
     // Retrieve the width of a margin in pixels.

-    int GetMarginWidth(int margin);
+    int GetMarginWidth(int margin) const;

 
     // Set a mask that determines which markers are displayed in a margin.
     void SetMarginMask(int margin, int mask);
 
     // Retrieve the marker mask of a margin.
 
     // Set a mask that determines which markers are displayed in a margin.
     void SetMarginMask(int margin, int mask);
 
     // Retrieve the marker mask of a margin.

-    int GetMarginMask(int margin);
+    int GetMarginMask(int margin) const;

 
     // Make a margin sensitive or insensitive to mouse clicks.
     void SetMarginSensitive(int margin, bool sensitive);
 
     // Retrieve the mouse click sensitivity of a margin.
 
     // Make a margin sensitive or insensitive to mouse clicks.
     void SetMarginSensitive(int margin, bool sensitive);
 
     // Retrieve the mouse click sensitivity of a margin.

-    bool GetMarginSensitive(int margin);
+    bool GetMarginSensitive(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();


@@ -2058,24 +2457,70 @@ public:
     // Set a style to be underlined or not.
     void StyleSetUnderline(int style, bool underline);
 
     // Set a style to be underlined or not.
     void StyleSetUnderline(int style, bool underline);
 

+    // Get the foreground colour of a style.
+    wxColour StyleGetForeground(int style) const;
+
+    // Get the background colour of a style.
+    wxColour StyleGetBackground(int style) const;
+
+    // Get is a style bold or not.
+    bool StyleGetBold(int style) const;
+
+    // Get is a style italic or not.
+    bool StyleGetItalic(int style) const;
+
+    // Get the size of characters of a style.
+    int StyleGetSize(int style) const;
+
+    // Get the font facename of a style
+    wxString StyleGetFaceName(int style);
+
+    // Get is a style to have its end of line filled or not.
+    bool StyleGetEOLFilled(int style) const;
+
+    // Get is a style underlined or not.
+    bool StyleGetUnderline(int style) const;
+
+    // Get is a style mixed case, or to force upper or lower case.
+    int StyleGetCase(int style) const;
+
+    // Get the character set of the font in a style.
+    int StyleGetCharacterSet(int style) const;
+
+    // Get is a style visible or not.
+    bool StyleGetVisible(int style) const;
+
+    // Get is a style changeable or not (read only).
+    // Experimental feature, currently buggy.
+    bool StyleGetChangeable(int style) const;
+
+    // Get is a style a hotspot or not.
+    bool StyleGetHotSpot(int style) const;
+

     // 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 a hotspot or not.
     void StyleSetHotSpot(int style, bool hotspot);
 
     // 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 a hotspot or not.
     void StyleSetHotSpot(int style, bool hotspot);
 

-    // Set the foreground colour of the selection and whether to use this setting.
+    // Set the foreground colour of the main and additional selections and whether to use this setting.

     void SetSelForeground(bool useSetting, const wxColour& fore);
 
     void SetSelForeground(bool useSetting, const wxColour& fore);
 

-    // Set the background colour of the selection and whether to use this setting.
+    // Set the background colour of the main and additional selections and whether to use this setting.

     void SetSelBackground(bool useSetting, const wxColour& back);
 
     // Get the alpha of the selection.
     void SetSelBackground(bool useSetting, const wxColour& back);
 
     // Get the alpha of the selection.

-    int GetSelAlpha();
+    int GetSelAlpha() const;

 
     // Set the alpha of the selection.
     void SetSelAlpha(int alpha);
 
 
     // Set the alpha of the selection.
     void SetSelAlpha(int alpha);
 

+    // Is the selection end of line filled?
+    bool GetSelEOLFilled() const;
+
+    // Set the selection to have its end of line filled or not.
+    void SetSelEOLFilled(bool filled);
+

     // Set the foreground colour of the caret.
     void SetCaretForeground(const wxColour& fore);
 
     // Set the foreground colour of the caret.
     void SetCaretForeground(const wxColour& fore);
 


@@ -2095,13 +2540,13 @@ public:
     void StyleSetVisible(int style, bool visible);
 
     // Get the time in milliseconds that the caret is on and off.
     void StyleSetVisible(int style, bool visible);
 
     // Get the time in milliseconds that the caret is on and off.

-    int GetCaretPeriod();
+    int GetCaretPeriod() const;

 
     // Get the time in milliseconds that the caret is on and off. 0 = steady on.
     void SetCaretPeriod(int periodMilliseconds);
 
     // Set the set of characters making up words for when moving or selecting by word.
 
     // Get the time in milliseconds that the caret is on and off. 0 = steady on.
     void SetCaretPeriod(int periodMilliseconds);
 
     // Set the set of characters making up words for when moving or selecting by word.

-    // First sets deaults like SetCharsDefault.
+    // First sets defaults like SetCharsDefault.

     void SetWordChars(const wxString& characters);
 
     // Start a sequence of actions that is undone and redone as a unit.
     void SetWordChars(const wxString& characters);
 
     // Start a sequence of actions that is undone and redone as a unit.


@@ -2115,13 +2560,19 @@ public:
     void IndicatorSetStyle(int indic, int style);
 
     // Retrieve the style of an indicator.
     void IndicatorSetStyle(int indic, int style);
 
     // Retrieve the style of an indicator.

-    int IndicatorGetStyle(int indic);
+    int IndicatorGetStyle(int indic) const;

 
     // Set the foreground colour of an indicator.
     void IndicatorSetForeground(int indic, const wxColour& fore);
 
     // Retrieve the foreground colour of an indicator.
 
     // Set the foreground colour of an indicator.
     void IndicatorSetForeground(int indic, const wxColour& fore);
 
     // Retrieve the foreground colour of an indicator.

-    wxColour IndicatorGetForeground(int indic);
+    wxColour IndicatorGetForeground(int indic) const;
+
+    // Set an indicator to draw under text or over(default).
+    void IndicatorSetUnder(int indic, bool under);
+
+    // Retrieve whether indicator drawn under or over text.
+    bool IndicatorGetUnder(int indic) const;

 
     // Set the foreground colour of all whitespace and whether to use this setting.
     void SetWhitespaceForeground(bool useSetting, const wxColour& fore);
 
     // Set the foreground colour of all whitespace and whether to use this setting.
     void SetWhitespaceForeground(bool useSetting, const wxColour& fore);


@@ -2129,31 +2580,37 @@ public:
     // Set the background colour of all whitespace and whether to use this setting.
     void SetWhitespaceBackground(bool useSetting, const wxColour& back);
 
     // Set the background colour of all whitespace and whether to use this setting.
     void SetWhitespaceBackground(bool useSetting, const wxColour& back);
 

+    // Set the size of the dots used to mark space characters.
+    void SetWhitespaceSize(int size);
+
+    // Get the size of the dots used to mark space characters.
+    int GetWhitespaceSize() const;
+

     // Divide each styling byte into lexical class bits (default: 5) and indicator
     // bits (default: 3). If a lexer requires more than 32 lexical states, then this
     // is used to expand the possible states.
     void SetStyleBits(int bits);
 
     // Retrieve number of bits in style bytes used to hold the lexical state.
     // Divide each styling byte into lexical class bits (default: 5) and indicator
     // bits (default: 3). If a lexer requires more than 32 lexical states, then this
     // is used to expand the possible states.
     void SetStyleBits(int bits);
 
     // Retrieve number of bits in style bytes used to hold the lexical state.

-    int GetStyleBits();
+    int GetStyleBits() const;

 
     // Used to hold extra styling information for each line.
     void SetLineState(int line, int state);
 
     // Retrieve the extra styling information for a line.
 
     // Used to hold extra styling information for each line.
     void SetLineState(int line, int state);
 
     // Retrieve the extra styling information for a line.

-    int GetLineState(int line);
+    int GetLineState(int line) const;

 
     // Retrieve the last line number that has line state.
 
     // Retrieve the last line number that has line state.

-    int GetMaxLineState();
+    int GetMaxLineState() const;

 
     // Is the background of the line containing the caret in a different colour?
 
     // Is the background of the line containing the caret in a different colour?

-    bool GetCaretLineVisible();
+    bool GetCaretLineVisible() const;

 
     // Display the background of the line containing the caret in a different colour.
     void SetCaretLineVisible(bool show);
 
     // Get the colour of the background of the line containing the caret.
 
     // Display the background of the line containing the caret in a different colour.
     void SetCaretLineVisible(bool show);
 
     // Get the colour of the background of the line containing the caret.

-    wxColour GetCaretLineBackground();
+    wxColour GetCaretLineBackground() const;

 
     // Set the colour of the background of the line containing the caret.
     void SetCaretLineBackground(const wxColour& back);
 
     // Set the colour of the background of the line containing the caret.
     void SetCaretLineBackground(const wxColour& back);


@@ -2187,7 +2644,7 @@ public:
     void AutoCompSetSeparator(int separatorCharacter);
 
     // Retrieve the auto-completion list separator character.
     void AutoCompSetSeparator(int separatorCharacter);
 
     // Retrieve the auto-completion list separator character.

-    int AutoCompGetSeparator();
+    int AutoCompGetSeparator() const;

 
     // Select the item in the auto-completion list that starts with a string.
     void AutoCompSelect(const wxString& text);
 
     // Select the item in the auto-completion list that starts with a string.
     void AutoCompSelect(const wxString& text);


@@ -2197,7 +2654,7 @@ public:
     void AutoCompSetCancelAtStart(bool cancel);
 
     // Retrieve whether auto-completion cancelled by backspacing before start.
     void AutoCompSetCancelAtStart(bool cancel);
 
     // Retrieve whether auto-completion cancelled by backspacing before start.

-    bool AutoCompGetCancelAtStart();
+    bool AutoCompGetCancelAtStart() const;

 
     // Define a set of characters that when typed will cause the autocompletion to
     // choose the selected item.
 
     // Define a set of characters that when typed will cause the autocompletion to
     // choose the selected item.


@@ -2207,13 +2664,13 @@ public:
     void AutoCompSetChooseSingle(bool chooseSingle);
 
     // Retrieve whether a single item auto-completion list automatically choose the item.
     void AutoCompSetChooseSingle(bool chooseSingle);
 
     // Retrieve whether a single item auto-completion list automatically choose the item.

-    bool AutoCompGetChooseSingle();
+    bool AutoCompGetChooseSingle() const;

 
     // Set whether case is significant when performing auto-completion searches.
     void AutoCompSetIgnoreCase(bool ignoreCase);
 
     // Retrieve state of ignore case flag.
 
     // Set whether case is significant when performing auto-completion searches.
     void AutoCompSetIgnoreCase(bool ignoreCase);
 
     // Retrieve state of ignore case flag.

-    bool AutoCompGetIgnoreCase();
+    bool AutoCompGetIgnoreCase() const;

 
     // Display a list of strings and send notification when user chooses one.
     void UserListShow(int listType, const wxString& itemList);
 
     // Display a list of strings and send notification when user chooses one.
     void UserListShow(int listType, const wxString& itemList);


@@ -2222,7 +2679,7 @@ public:
     void AutoCompSetAutoHide(bool autoHide);
 
     // Retrieve whether or not autocompletion is hidden automatically when nothing matches.
     void AutoCompSetAutoHide(bool autoHide);
 
     // Retrieve whether or not autocompletion is hidden automatically when nothing matches.

-    bool AutoCompGetAutoHide();
+    bool AutoCompGetAutoHide() const;

 
     // Set whether or not autocompletion deletes any word characters
     // after the inserted text upon completion.
 
     // Set whether or not autocompletion deletes any word characters
     // after the inserted text upon completion.


@@ -2230,7 +2687,7 @@ public:
 
     // Retrieve whether or not autocompletion deletes any word characters
     // after the inserted text upon completion.
 
     // Retrieve whether or not autocompletion deletes any word characters
     // after the inserted text upon completion.

-    bool AutoCompGetDropRestOfWord();
+    bool AutoCompGetDropRestOfWord() const;

 
     // Register an image for use in autocompletion lists.
     void RegisterImage(int type, const wxBitmap& bmp);
 
     // Register an image for use in autocompletion lists.
     void RegisterImage(int type, const wxBitmap& bmp);


@@ -2239,7 +2696,7 @@ public:
     void ClearRegisteredImages();
 
     // Retrieve the auto-completion list type-separator character.
     void ClearRegisteredImages();
 
     // Retrieve the auto-completion list type-separator character.

-    int AutoCompGetTypeSeparator();
+    int AutoCompGetTypeSeparator() const;

 
     // Change the type-separator character in the string setting up an auto-completion list.
     // Default is '?' but can be changed if items contain '?'.
 
     // Change the type-separator character in the string setting up an auto-completion list.
     // Default is '?' but can be changed if items contain '?'.


@@ -2250,70 +2707,70 @@ public:
     void AutoCompSetMaxWidth(int characterCount);
 
     // Get the maximum width, in characters, of auto-completion and user lists.
     void AutoCompSetMaxWidth(int characterCount);
 
     // Get the maximum width, in characters, of auto-completion and user lists.

-    int AutoCompGetMaxWidth();
+    int AutoCompGetMaxWidth() const;

 
     // Set the maximum height, in rows, of auto-completion and user lists.
     // The default is 5 rows.
     void AutoCompSetMaxHeight(int rowCount);
 
     // Set the maximum height, in rows, of auto-completion and user lists.
 
     // Set the maximum height, in rows, of auto-completion and user lists.
     // The default is 5 rows.
     void AutoCompSetMaxHeight(int rowCount);
 
     // Set the maximum height, in rows, of auto-completion and user lists.

-    int AutoCompGetMaxHeight();
+    int AutoCompGetMaxHeight() const;

 
     // Set the number of spaces used for one level of indentation.
     void SetIndent(int indentSize);
 
     // Retrieve indentation size.
 
     // Set the number of spaces used for one level of indentation.
     void SetIndent(int indentSize);
 
     // Retrieve indentation size.

-    int GetIndent();
+    int GetIndent() const;

 
     // Indentation will only use space characters if useTabs is false, otherwise
     // it will use a combination of tabs and spaces.
     void SetUseTabs(bool useTabs);
 
     // Retrieve whether tabs will be used in indentation.
 
     // Indentation will only use space characters if useTabs is false, otherwise
     // it will use a combination of tabs and spaces.
     void SetUseTabs(bool useTabs);
 
     // Retrieve whether tabs will be used in indentation.

-    bool GetUseTabs();
+    bool GetUseTabs() const;

 
     // Change the indentation of a line to a number of columns.
     void SetLineIndentation(int line, int indentSize);
 
     // Retrieve the number of columns that a line is indented.
 
     // Change the indentation of a line to a number of columns.
     void SetLineIndentation(int line, int indentSize);
 
     // Retrieve the number of columns that a line is indented.

-    int GetLineIndentation(int line);
+    int GetLineIndentation(int line) const;

 
     // Retrieve the position before the first non indentation character on a line.
 
     // Retrieve the position before the first non indentation character on a line.

-    int GetLineIndentPosition(int line);
+    int GetLineIndentPosition(int line) const;

 
     // Retrieve the column number of a position, taking tab width into account.
 
     // Retrieve the column number of a position, taking tab width into account.

-    int GetColumn(int pos);
+    int GetColumn(int pos) const;

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

-    bool GetUseHorizontalScrollBar();
+    bool GetUseHorizontalScrollBar() const;

 
     // Show or hide indentation guides.
 
     // Show or hide indentation guides.

-    void SetIndentationGuides(bool show);
+    void SetIndentationGuides(int indentView);

 
     // Are the indentation guides visible?
 
     // Are the indentation guides visible?

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

 
     // Set the highlighted indentation guide column.
     // 0 = no highlighted guide.
     void SetHighlightGuide(int column);
 
     // Get the highlighted indentation guide column.
 
     // Set the highlighted indentation guide column.
     // 0 = no highlighted guide.
     void SetHighlightGuide(int column);
 
     // Get the highlighted indentation guide column.

-    int GetHighlightGuide();
+    int GetHighlightGuide() const;

 
     // Get the position after the last visible characters on a line.
 
     // Get the position after the last visible characters on a line.

-    int GetLineEndPosition(int line);
+    int GetLineEndPosition(int line) const;

 
     // Get the code page used to interpret the bytes of the document as characters.
 
     // Get the code page used to interpret the bytes of the document as characters.

-    int GetCodePage();
+    int GetCodePage() const;

 
     // Get the foreground colour of the caret.
 
     // Get the foreground colour of the caret.

-    wxColour GetCaretForeground();
+    wxColour GetCaretForeground() const;

 
     // In read-only mode?
 
     // In read-only mode?

-    bool GetReadOnly();
+    bool GetReadOnly() const;

 
     // Sets the position of the caret.
     void SetCurrentPos(int pos);
 
     // Sets the position of the caret.
     void SetCurrentPos(int pos);


@@ -2322,25 +2779,25 @@ public:
     void SetSelectionStart(int pos);
 
     // Returns the position at the start of the selection.
     void SetSelectionStart(int pos);
 
     // Returns the position at the start of the selection.

-    int GetSelectionStart();
+    int GetSelectionStart() const;

 
     // Sets the position that ends the selection - this becomes the currentPosition.
     void SetSelectionEnd(int pos);
 
     // Returns the position at the end of the selection.
 
     // Sets the position that ends the selection - this becomes the currentPosition.
     void SetSelectionEnd(int pos);
 
     // Returns the position at the end of the selection.

-    int GetSelectionEnd();
+    int GetSelectionEnd() const;

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

-    int GetPrintMagnification();
+    int GetPrintMagnification() const;

 
     // Modify colours when printing for clearer printed text.
     void SetPrintColourMode(int mode);
 
     // Returns the print colour mode.
 
     // Modify colours when printing for clearer printed text.
     void SetPrintColourMode(int mode);
 
     // Returns the print colour mode.

-    int GetPrintColourMode();
+    int GetPrintColourMode() const;

 
     // Find some text in the document.
     int FindText(int minPos, int maxPos, const wxString& text, int flags=0);
 
     // Find some text in the document.
     int FindText(int minPos, int maxPos, const wxString& text, int flags=0);


@@ -2350,36 +2807,33 @@ public:
                int    startPos,
                int    endPos,
                wxDC*  draw,
                int    startPos,
                int    endPos,
                wxDC*  draw,

-               wxDC*  target, 
+               wxDC*  target,

                wxRect renderRect,
                wxRect pageRect);
 
     // Retrieve the display line at the top of the display.
                wxRect renderRect,
                wxRect pageRect);
 
     // Retrieve the display line at the top of the display.

-    int GetFirstVisibleLine();
+    int GetFirstVisibleLine() const;

 
     // Retrieve the contents of a line.
 
     // Retrieve the contents of a line.

-    wxString GetLine(int line);
+    wxString GetLine(int line) const;

 
     // Returns the number of lines in the document. There is always at least one.
 
     // Returns the number of lines in the document. There is always at least one.

-    int GetLineCount();
+    int GetLineCount() const;

 
     // Sets the size in pixels of the left margin.
     void SetMarginLeft(int pixelWidth);
 
     // Returns the size in pixels of the left margin.
 
     // Sets the size in pixels of the left margin.
     void SetMarginLeft(int pixelWidth);
 
     // Returns the size in pixels of the left margin.

-    int GetMarginLeft();
+    int GetMarginLeft() const;

 
     // Sets the size in pixels of the right margin.
     void SetMarginRight(int pixelWidth);
 
     // Returns the size in pixels of the right margin.
 
     // Sets the size in pixels of the right margin.
     void SetMarginRight(int pixelWidth);
 
     // Returns the size in pixels of the right margin.

-    int GetMarginRight();
+    int GetMarginRight() const;

 
     // Is the document different from when it was last saved?
 
     // Is the document different from when it was last saved?

-    bool GetModify();
-
-    // Select a range of text.
-    void SetSelection(int start, int end);
+    bool GetModify() const;

 
     // Retrieve the selected text.
     wxString GetSelectedText();
 
     // Retrieve the selected text.
     wxString GetSelectedText();


@@ -2391,10 +2845,10 @@ public:
     void HideSelection(bool normal);
 
     // Retrieve the line containing a position.
     void HideSelection(bool normal);
 
     // Retrieve the line containing a position.

-    int LineFromPosition(int pos);
+    int LineFromPosition(int pos) const;

 
     // Retrieve the position at the start of a line.
 
     // Retrieve the position at the start of a line.

-    int PositionFromLine(int line);
+    int PositionFromLine(int line) const;

 
     // Scroll horizontally and vertically.
     void LineScroll(int columns, int lines);
 
     // Scroll horizontally and vertically.
     void LineScroll(int columns, int lines);


@@ -2409,10 +2863,10 @@ public:
     void SetReadOnly(bool readOnly);
 
     // Will a paste succeed?
     void SetReadOnly(bool readOnly);
 
     // Will a paste succeed?

-    bool CanPaste();
+    bool CanPaste() const;

 
     // Are there any undoable actions in the undo history?
 
     // Are there any undoable actions in the undo history?

-    bool CanUndo();
+    bool CanUndo() const;

 
     // Delete the undo history.
     void EmptyUndoBuffer();
 
     // Delete the undo history.
     void EmptyUndoBuffer();


@@ -2436,36 +2890,36 @@ public:
     void SetText(const wxString& text);
 
     // Retrieve all the text in the document.
     void SetText(const wxString& text);
 
     // Retrieve all the text in the document.

-    wxString GetText();
+    wxString GetText() const;

 
     // Retrieve the number of characters in the document.
 
     // Retrieve the number of characters in the document.

-    int GetTextLength();
+    int GetTextLength() const;

 
     // Set to overtype (true) or insert mode.
     void SetOvertype(bool overtype);
 
     // Returns true if overtype mode is active otherwise false is returned.
 
     // Set to overtype (true) or insert mode.
     void SetOvertype(bool overtype);
 
     // Returns true if overtype mode is active otherwise false is returned.

-    bool GetOvertype();
+    bool GetOvertype() const;

 
     // Set the width of the insert mode caret.
     void SetCaretWidth(int pixelWidth);
 
     // Returns the width of the insert mode caret.
 
     // Set the width of the insert mode caret.
     void SetCaretWidth(int pixelWidth);
 
     // Returns the width of the insert mode caret.

-    int GetCaretWidth();
+    int GetCaretWidth() const;

 
     // Sets the position that starts the target which is used for updating the
     // document without affecting the scroll position.
     void SetTargetStart(int pos);
 
     // Get the position that starts the target.
 
     // Sets the position that starts the target which is used for updating the
     // document without affecting the scroll position.
     void SetTargetStart(int pos);
 
     // Get the position that starts the target.

-    int GetTargetStart();
+    int GetTargetStart() const;

 
     // Sets the position that ends the target which is used for updating the
     // document without affecting the scroll position.
     void SetTargetEnd(int pos);
 
     // Get the position that ends the target.
 
     // Sets the position that ends the target which is used for updating the
     // document without affecting the scroll position.
     void SetTargetEnd(int pos);
 
     // Get the position that ends the target.

-    int GetTargetEnd();
+    int GetTargetEnd() const;

 
     // Replace the target text with the argument text.
     // Text is counted so it can contain NULs.
 
     // Replace the target text with the argument text.
     // Text is counted so it can contain NULs.


@@ -2489,7 +2943,7 @@ public:
     void SetSearchFlags(int flags);
 
     // Get the search flags used by SearchInTarget.
     void SetSearchFlags(int flags);
 
     // Get the search flags used by SearchInTarget.

-    int GetSearchFlags();
+    int GetSearchFlags() const;

 
     // Show a call tip containing a definition near position pos.
     void CallTipShow(int pos, const wxString& definition);
 
     // Show a call tip containing a definition near position pos.
     void CallTipShow(int pos, const wxString& definition);


@@ -2533,13 +2987,13 @@ public:
     void SetFoldLevel(int line, int level);
 
     // Retrieve the fold level of a line.
     void SetFoldLevel(int line, int level);
 
     // Retrieve the fold level of a line.

-    int GetFoldLevel(int line);
+    int GetFoldLevel(int line) const;

 
     // Find the last child line of a header line.
 
     // Find the last child line of a header line.

-    int GetLastChild(int line, int level);
+    int GetLastChild(int line, int level) const;

 
     // Find the parent line of a child line.
 
     // Find the parent line of a child line.

-    int GetFoldParent(int line);
+    int GetFoldParent(int line) const;

 
     // Make a range of lines visible.
     void ShowLines(int lineStart, int lineEnd);
 
     // Make a range of lines visible.
     void ShowLines(int lineStart, int lineEnd);


@@ -2548,13 +3002,13 @@ public:
     void HideLines(int lineStart, int lineEnd);
 
     // Is a line visible?
     void HideLines(int lineStart, int lineEnd);
 
     // Is a line visible?

-    bool GetLineVisible(int line);
+    bool GetLineVisible(int line) const;

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

-    bool GetFoldExpanded(int line);
+    bool GetFoldExpanded(int line) const;

 
     // Switch a header line between expanded and contracted.
     void ToggleFold(int line);
 
     // Switch a header line between expanded and contracted.
     void ToggleFold(int line);


@@ -2573,19 +3027,19 @@ public:
     void SetTabIndents(bool tabIndents);
 
     // Does a tab pressed when caret is within indentation indent?
     void SetTabIndents(bool tabIndents);
 
     // Does a tab pressed when caret is within indentation indent?

-    bool GetTabIndents();
+    bool GetTabIndents() const;

 
     // Sets whether a backspace pressed when caret is within indentation unindents.
     void SetBackSpaceUnIndents(bool bsUnIndents);
 
     // Does a backspace pressed when caret is within indentation unindent?
 
     // Sets whether a backspace pressed when caret is within indentation unindents.
     void SetBackSpaceUnIndents(bool bsUnIndents);
 
     // Does a backspace pressed when caret is within indentation unindent?

-    bool GetBackSpaceUnIndents();
+    bool GetBackSpaceUnIndents() const;

 
     // Sets the time the mouse must sit still to generate a mouse dwell event.
     void SetMouseDwellTime(int periodMilliseconds);
 
     // Retrieve the time the mouse must sit still to generate a mouse dwell event.
 
     // Sets the time the mouse must sit still to generate a mouse dwell event.
     void SetMouseDwellTime(int periodMilliseconds);
 
     // Retrieve the time the mouse must sit still to generate a mouse dwell event.

-    int GetMouseDwellTime();
+    int GetMouseDwellTime() const;

 
     // Get position of start of word.
     int WordStartPosition(int pos, bool onlyWordCharacters);
 
     // Get position of start of word.
     int WordStartPosition(int pos, bool onlyWordCharacters);


@@ -2597,37 +3051,49 @@ public:
     void SetWrapMode(int mode);
 
     // Retrieve whether text is word wrapped.
     void SetWrapMode(int mode);
 
     // Retrieve whether text is word wrapped.

-    int GetWrapMode();
+    int GetWrapMode() const;

 
     // Set the display mode of visual flags for wrapped lines.
     void SetWrapVisualFlags(int wrapVisualFlags);
 
     // Retrive the display mode of visual flags for wrapped lines.
 
     // Set the display mode of visual flags for wrapped lines.
     void SetWrapVisualFlags(int wrapVisualFlags);
 
     // Retrive the display mode of visual flags for wrapped lines.

-    int GetWrapVisualFlags();
+    int GetWrapVisualFlags() const;

 
     // Set the location of visual flags for wrapped lines.
     void SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation);
 
     // Retrive the location of visual flags for wrapped lines.
 
     // Set the location of visual flags for wrapped lines.
     void SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation);
 
     // Retrive the location of visual flags for wrapped lines.

-    int GetWrapVisualFlagsLocation();
+    int GetWrapVisualFlagsLocation() const;

 
     // Set the start indent for wrapped lines.
     void SetWrapStartIndent(int indent);
 
     // Retrive the start indent for wrapped lines.
 
     // Set the start indent for wrapped lines.
     void SetWrapStartIndent(int indent);
 
     // Retrive the start indent for wrapped lines.

-    int GetWrapStartIndent();
+    int GetWrapStartIndent() const;
+
+    // Sets how wrapped sublines are placed. Default is fixed.
+    void SetWrapIndentMode(int mode);
+
+    // Retrieve how wrapped sublines are placed. Default is fixed.
+    int GetWrapIndentMode() const;

 
     // Sets the degree of caching of layout information.
     void SetLayoutCache(int mode);
 
     // Retrieve the degree of caching of layout information.
 
     // Sets the degree of caching of layout information.
     void SetLayoutCache(int mode);
 
     // Retrieve the degree of caching of layout information.

-    int GetLayoutCache();
+    int GetLayoutCache() const;

 
     // Sets the document width assumed for scrolling.
     void SetScrollWidth(int pixelWidth);
 
     // Retrieve the document width assumed for scrolling.
 
     // Sets the document width assumed for scrolling.
     void SetScrollWidth(int pixelWidth);
 
     // Retrieve the document width assumed for scrolling.

-    int GetScrollWidth();
+    int GetScrollWidth() const;
+
+    // Sets whether the maximum width line displayed is used to set scroll width.
+    void SetScrollWidthTracking(bool tracking);
+
+    // Retrieve whether the scroll width tracks wide lines.
+    bool GetScrollWidthTracking() const;

 
     // Measure the pixel width of some text in a particular style.
     // NUL terminated text argument.
 
     // Measure the pixel width of some text in a particular style.
     // NUL terminated text argument.


@@ -2641,7 +3107,7 @@ public:
 
     // Retrieve whether the maximum scroll position has the last
     // line at the bottom of the view.
 
     // Retrieve whether the maximum scroll position has the last
     // line at the bottom of the view.

-    bool GetEndAtLastLine();
+    bool GetEndAtLastLine() const;

 
     // Retrieve the height of a particular line of text in pixels.
     int TextHeight(int line);
 
     // Retrieve the height of a particular line of text in pixels.
     int TextHeight(int line);


@@ -2650,18 +3116,21 @@ public:
     void SetUseVerticalScrollBar(bool show);
 
     // Is the vertical scroll bar visible?
     void SetUseVerticalScrollBar(bool show);
 
     // Is the vertical scroll bar visible?

-    bool GetUseVerticalScrollBar();
+    bool GetUseVerticalScrollBar() const;

 
     // Append a string to the end of the document without changing the selection.
     void AppendText(const wxString& text);
 
     // Is drawing done in two phases with backgrounds drawn before foregrounds?
 
     // Append a string to the end of the document without changing the selection.
     void AppendText(const wxString& text);
 
     // Is drawing done in two phases with backgrounds drawn before foregrounds?

-    bool GetTwoPhaseDraw();
+    bool GetTwoPhaseDraw() const;

 
     // In twoPhaseDraw mode, drawing is performed in two phases, first the background
     // and then the foreground. This avoids chopping off characters that overlap the next run.
     void SetTwoPhaseDraw(bool twoPhase);
 
 
     // In twoPhaseDraw mode, drawing is performed in two phases, first the background
     // and then the foreground. This avoids chopping off characters that overlap the next run.
     void SetTwoPhaseDraw(bool twoPhase);
 

+    // Scroll so that a display line is at the top of the display.
+    void SetFirstVisibleLine(int lineDisplay);
+

     // 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();
 


@@ -2789,6 +3258,9 @@ public:
     // Delete the word to the right of the caret.
     void DelWordRight();
 
     // Delete the word to the right of the caret.
     void DelWordRight();
 

+    // Delete the word to the right of the caret, but not the trailing non-word characters.
+    void DelWordRightEnd();
+

     // Cut the line containing the caret.
     void LineCut();
 
     // Cut the line containing the caret.
     void LineCut();
 


@@ -2849,8 +3321,8 @@ public:
     // Move the caret inside current view if it's not there already.
     void MoveCaretInsideView();
 
     // Move the caret inside current view if it's not there already.
     void MoveCaretInsideView();
 

-    // How many characters are on a line, not including end of line characters?
-    int LineLength(int line);
+    // How many characters are on a line, including end of line characters?
+    int LineLength(int line) const;

 
     // Highlight the characters at two positions.
     void BraceHighlight(int pos1, int pos2);
 
     // Highlight the characters at two positions.
     void BraceHighlight(int pos1, int pos2);


@@ -2862,7 +3334,7 @@ public:
     int BraceMatch(int pos);
 
     // Are the end of line characters visible?
     int BraceMatch(int pos);
 
     // Are the end of line characters visible?

-    bool GetViewEOL();
+    bool GetViewEOL() const;

 
     // Make the end of line characters visible or invisible.
     void SetViewEOL(bool visible);
 
     // Make the end of line characters visible or invisible.
     void SetViewEOL(bool visible);


@@ -2877,21 +3349,21 @@ public:
     void SetModEventMask(int mask);
 
     // Retrieve the column number which text should be kept within.
     void SetModEventMask(int mask);
 
     // Retrieve the column number which text should be kept within.

-    int GetEdgeColumn();
+    int GetEdgeColumn() const;

 
     // Set the column number of the edge.
     // If text goes past the edge then it is highlighted.
     void SetEdgeColumn(int column);
 
     // Retrieve the edge highlight mode.
 
     // Set the column number of the edge.
     // If text goes past the edge then it is highlighted.
     void SetEdgeColumn(int column);
 
     // Retrieve the edge highlight mode.

-    int GetEdgeMode();
+    int GetEdgeMode() const;

 
     // The edge may be displayed by a line (EDGE_LINE) or by highlighting text that
     // goes beyond it (EDGE_BACKGROUND) or not displayed at all (EDGE_NONE).
     void SetEdgeMode(int mode);
 
     // Retrieve the colour used in edge indication.
 
     // The edge may be displayed by a line (EDGE_LINE) or by highlighting text that
     // goes beyond it (EDGE_BACKGROUND) or not displayed at all (EDGE_NONE).
     void SetEdgeMode(int mode);
 
     // Retrieve the colour used in edge indication.

-    wxColour GetEdgeColour();
+    wxColour GetEdgeColour() const;

 
     // Change the colour used in edge indication.
     void SetEdgeColour(const wxColour& edgeColour);
 
     // Change the colour used in edge indication.
     void SetEdgeColour(const wxColour& edgeColour);


@@ -2908,21 +3380,21 @@ public:
     int SearchPrev(int flags, const wxString& text);
 
     // Retrieves the number of lines completely visible.
     int SearchPrev(int flags, const wxString& text);
 
     // Retrieves the number of lines completely visible.

-    int LinesOnScreen();
+    int LinesOnScreen() const;

 
     // Set whether a pop up menu is displayed automatically when the user presses
     // the wrong mouse button.
     void UsePopUp(bool allowPopUp);
 
     // Is the selection rectangular? The alternative is the more common stream selection.
 
     // Set whether a pop up menu is displayed automatically when the user presses
     // the wrong mouse button.
     void UsePopUp(bool allowPopUp);
 
     // Is the selection rectangular? The alternative is the more common stream selection.

-    bool SelectionIsRectangle();
+    bool SelectionIsRectangle() const;

 
     // Set the zoom level. This number of points is added to the size of all fonts.
     // It may be positive to magnify or negative to reduce.
     void SetZoom(int zoom);
 
     // Retrieve the zoom level.
 
     // Set the zoom level. This number of points is added to the size of all fonts.
     // It may be positive to magnify or negative to reduce.
     void SetZoom(int zoom);
 
     // Retrieve the zoom level.

-    int GetZoom();
+    int GetZoom() const;

 
     // Create a new document object.
     // Starts with reference count of 1 and not selected into editor.
 
     // Create a new document object.
     // Starts with reference count of 1 and not selected into editor.


@@ -2935,38 +3407,38 @@ public:
     void ReleaseDocument(void* docPointer);
 
     // Get which document modification events are sent to the container.
     void ReleaseDocument(void* docPointer);
 
     // Get which document modification events are sent to the container.

-    int GetModEventMask();
+    int GetModEventMask() const;

 
     // Change internal focus flag.
     void SetSTCFocus(bool focus);
 
     // Get internal focus flag.
 
     // Change internal focus flag.
     void SetSTCFocus(bool focus);
 
     // Get internal focus flag.

-    bool GetSTCFocus();
+    bool GetSTCFocus() const;

 
     // Change error status - 0 = OK.
     void SetStatus(int statusCode);
 
     // Get error status.
 
     // Change error status - 0 = OK.
     void SetStatus(int statusCode);
 
     // Get error status.

-    int GetStatus();
+    int GetStatus() const;

 
     // Set whether the mouse is captured when its button is pressed.
     void SetMouseDownCaptures(bool captures);
 
     // Get whether mouse gets captured.
 
     // Set whether the mouse is captured when its button is pressed.
     void SetMouseDownCaptures(bool captures);
 
     // Get whether mouse gets captured.

-    bool GetMouseDownCaptures();
+    bool GetMouseDownCaptures() const;

 
     // Sets the cursor to one of the SC_CURSOR* values.
     void SetSTCCursor(int cursorType);
 
     // Get cursor type.
 
     // Sets the cursor to one of the SC_CURSOR* values.
     void SetSTCCursor(int cursorType);
 
     // Get cursor type.

-    int GetSTCCursor();
+    int GetSTCCursor() const;

 
     // Change the way control characters are displayed:
     // If symbol is < 32, keep the drawn way, else, use the given character.
     void SetControlCharSymbol(int symbol);
 
     // Get the way control characters are displayed.
 
     // Change the way control characters are displayed:
     // If symbol is < 32, keep the drawn way, else, use the given character.
     void SetControlCharSymbol(int symbol);
 
     // Get the way control characters are displayed.

-    int GetControlCharSymbol();
+    int GetControlCharSymbol() const;

 
     // Move to the previous change in capitalisation.
     void WordPartLeft();
 
     // Move to the previous change in capitalisation.
     void WordPartLeft();


@@ -2994,7 +3466,7 @@ public:
 
     // Get and Set the xOffset (ie, horizonal scroll position).
     void SetXOffset(int newOffset);
 
     // Get and Set the xOffset (ie, horizonal scroll position).
     void SetXOffset(int newOffset);

-    int GetXOffset();
+    int GetXOffset() const;

 
     // Set the last x chosen value to be the caret x position.
     void ChooseCaretX();
 
     // Set the last x chosen value to be the caret x position.
     void ChooseCaretX();


@@ -3011,20 +3483,32 @@ public:
     void SetPrintWrapMode(int mode);
 
     // Is printing line wrapped?
     void SetPrintWrapMode(int mode);
 
     // Is printing line wrapped?

-    int GetPrintWrapMode();
+    int GetPrintWrapMode() const;

 
     // Set a fore colour for active hotspots.
     void SetHotspotActiveForeground(bool useSetting, const wxColour& fore);
 
 
     // Set a fore colour for active hotspots.
     void SetHotspotActiveForeground(bool useSetting, const wxColour& fore);
 

+    // Get the fore colour for active hotspots.
+    wxColour GetHotspotActiveForeground() const;
+

     // Set a back colour for active hotspots.
     void SetHotspotActiveBackground(bool useSetting, const wxColour& back);
 
     // Set a back colour for active hotspots.
     void SetHotspotActiveBackground(bool useSetting, const wxColour& back);
 

+    // Get the back colour for active hotspots.
+    wxColour GetHotspotActiveBackground() const;
+

     // Enable / Disable underlining active hotspots.
     void SetHotspotActiveUnderline(bool underline);
 
     // Enable / Disable underlining active hotspots.
     void SetHotspotActiveUnderline(bool underline);
 

+    // Get whether underlining for active hotspots.
+    bool GetHotspotActiveUnderline() const;
+

     // Limit hotspots to single line so hotspots on two lines don't merge.
     void SetHotspotSingleLine(bool singleLine);
 
     // Limit hotspots to single line so hotspots on two lines don't merge.
     void SetHotspotSingleLine(bool singleLine);
 

+    // Get the HotspotSingleLine property
+    bool GetHotspotSingleLine() const;
+

     // Move caret between paragraphs (delimited by empty lines).
     void ParaDown();
     void ParaDownExtend();
     // Move caret between paragraphs (delimited by empty lines).
     void ParaDown();
     void ParaDownExtend();


@@ -3045,12 +3529,12 @@ public:
     // Copy argument text to the clipboard.
     void CopyText(int length, const wxString& text);
 
     // Copy argument text to the clipboard.
     void CopyText(int length, const wxString& text);
 

-    // Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE) or
+    // Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE/SC_SEL_THIN) or

     // by lines (SC_SEL_LINES).
     void SetSelectionMode(int mode);
 
     // Get the mode of the current selection.
     // by lines (SC_SEL_LINES).
     void SetSelectionMode(int mode);
 
     // Get the mode of the current selection.

-    int GetSelectionMode();
+    int GetSelectionMode() const;

 
     // Retrieve the position of the start of the selection at the given line (INVALID_POSITION if no selection on this line).
     int GetLineSelStartPosition(int line);
 
     // Retrieve the position of the start of the selection at the given line (INVALID_POSITION if no selection on this line).
     int GetLineSelStartPosition(int line);


@@ -3129,7 +3613,7 @@ 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();
+    bool GetCaretSticky() const;

 
     // Stop the caret preferred x position changing when the user types.
     void SetCaretSticky(bool useCaretStickyBehaviour);
 
     // Stop the caret preferred x position changing when the user types.
     void SetCaretSticky(bool useCaretStickyBehaviour);


@@ -3141,7 +3625,7 @@ public:
     void SetPasteConvertEndings(bool convert);
 
     // Get convert-on-paste setting
     void SetPasteConvertEndings(bool convert);
 
     // Get convert-on-paste setting

-    bool GetPasteConvertEndings();
+    bool GetPasteConvertEndings() const;

 
     // Duplicate the selection. If selection empty duplicate the line containing the caret.
     void SelectionDuplicate();
 
     // Duplicate the selection. If selection empty duplicate the line containing the caret.
     void SelectionDuplicate();


@@ -3150,7 +3634,260 @@ public:
     void SetCaretLineBackAlpha(int alpha);
 
     // Get the background alpha of the caret line.
     void SetCaretLineBackAlpha(int alpha);
 
     // Get the background alpha of the caret line.

-    int GetCaretLineBackAlpha();
+    int GetCaretLineBackAlpha() const;
+
+    // Set the style of the caret to be drawn.
+    void SetCaretStyle(int caretStyle);
+
+    // Returns the current style of the caret.
+    int GetCaretStyle() const;
+
+    // Set the indicator used for IndicatorFillRange and IndicatorClearRange
+    void SetIndicatorCurrent(int indicator);
+
+    // Get the current indicator
+    int GetIndicatorCurrent() const;
+
+    // Set the value used for IndicatorFillRange
+    void SetIndicatorValue(int value);
+
+    // Get the current indicator vaue
+    int GetIndicatorValue() const;
+
+    // Turn a indicator on over a range.
+    void IndicatorFillRange(int position, int fillLength);
+
+    // Turn a indicator off over a range.
+    void IndicatorClearRange(int position, int clearLength);
+
+    // Are any indicators present at position?
+    int IndicatorAllOnFor(int position);
+
+    // What value does a particular indicator have at at a position?
+    int IndicatorValueAt(int indicator, int position);
+
+    // Where does a particular indicator start?
+    int IndicatorStart(int indicator, int position);
+
+    // Where does a particular indicator end?
+    int IndicatorEnd(int indicator, int position);
+
+    // Set number of entries in position cache
+    void SetPositionCacheSize(int size);
+
+    // How many entries are allocated to the position cache?
+    int GetPositionCacheSize() const;
+
+    // Copy the selection, if selection empty copy the line with the caret
+    void CopyAllowLine();
+
+    // Compact the document buffer and return a read-only pointer to the
+    // characters in the document.
+    const char* GetCharacterPointer();
+
+    // Always interpret keyboard input as Unicode
+    void SetKeysUnicode(bool keysUnicode);
+
+    // Are keys always interpreted as Unicode?
+    bool GetKeysUnicode() const;
+
+    // Set the alpha fill colour of the given indicator.
+    void IndicatorSetAlpha(int indicator, int alpha);
+
+    // Get the alpha fill colour of the given indicator.
+    int IndicatorGetAlpha(int indicator) const;
+
+    // Set extra ascent for each line
+    void SetExtraAscent(int extraAscent);
+
+    // Get extra ascent for each line
+    int GetExtraAscent() const;
+
+    // Set extra descent for each line
+    void SetExtraDescent(int extraDescent);
+
+    // Get extra descent for each line
+    int GetExtraDescent() const;
+
+    // Which symbol was defined for markerNumber with MarkerDefine
+    int GetMarkerSymbolDefined(int markerNumber);
+
+    // Set the text in the text margin for a line
+    void MarginSetText(int line, const wxString& text);
+
+    // Get the text in the text margin for a line
+    wxString MarginGetText(int line) const;
+
+    // Set the style number for the text margin for a line
+    void MarginSetStyle(int line, int style);
+
+    // Get the style number for the text margin for a line
+    int MarginGetStyle(int line) const;
+
+    // Set the style in the text margin for a line
+    void MarginSetStyles(int line, const wxString& styles);
+
+    // Get the styles in the text margin for a line
+    wxString MarginGetStyles(int line) const;
+
+    // Clear the margin text on all lines
+    void MarginTextClearAll();
+
+    // Get the start of the range of style numbers used for margin text
+    void MarginSetStyleOffset(int style);
+
+    // Get the start of the range of style numbers used for margin text
+    int MarginGetStyleOffset() const;
+
+    // Set the annotation text for a line
+    void AnnotationSetText(int line, const wxString& text);
+
+    // Get the annotation text for a line
+    wxString AnnotationGetText(int line) const;
+
+    // Set the style number for the annotations for a line
+    void AnnotationSetStyle(int line, int style);
+
+    // Get the style number for the annotations for a line
+    int AnnotationGetStyle(int line) const;
+
+    // Set the annotation styles for a line
+    void AnnotationSetStyles(int line, const wxString& styles);
+
+    // Get the annotation styles for a line
+    wxString AnnotationGetStyles(int line) const;
+
+    // Get the number of annotation lines for a line
+    int AnnotationGetLines(int line) const;
+
+    // Clear the annotations from all lines
+    void AnnotationClearAll();
+
+    // Set the visibility for the annotations for a view
+    void AnnotationSetVisible(int visible);
+
+    // Get the visibility for the annotations for a view
+    int AnnotationGetVisible() const;
+
+    // Get the start of the range of style numbers used for annotations
+    void AnnotationSetStyleOffset(int style);
+
+    // Get the start of the range of style numbers used for annotations
+    int AnnotationGetStyleOffset() const;
+
+    // Add a container action to the undo stack
+    void AddUndoAction(int token, int flags);
+
+    // Find the position of a character from a point within the window.
+    int CharPositionFromPoint(int x, int y);
+
+    // Find the position of a character from a point within the window.
+    // Return INVALID_POSITION if not close to text.
+    int CharPositionFromPointClose(int x, int y);
+
+    // Set whether multiple selections can be made
+    void SetMultipleSelection(bool multipleSelection);
+
+    // Whether multiple selections can be made
+    bool GetMultipleSelection() const;
+
+    // Set whether typing can be performed into multiple selections
+    void SetAdditionalSelectionTyping(bool additionalSelectionTyping);
+
+    // Whether typing can be performed into multiple selections
+    bool GetAdditionalSelectionTyping() const;
+
+    // Set whether additional carets will blink
+    void SetAdditionalCaretsBlink(bool additionalCaretsBlink);
+
+    // Whether additional carets will blink
+    bool GetAdditionalCaretsBlink() const;
+
+    // Set whether additional carets are visible
+    void SetAdditionalCaretsVisible(bool additionalCaretsBlink);
+
+    // Whether additional carets are visible
+    bool GetAdditionalCaretsVisible() const;
+
+    // How many selections are there?
+    int GetSelections() const;
+
+    // Clear selections to a single empty stream selection
+    void ClearSelections();
+
+    // Add a selection
+    int AddSelection(int caret, int anchor);
+
+    // Set the main selection
+    void SetMainSelection(int selection);
+
+    // Which selection is the main selection
+    int GetMainSelection() const;
+    void SetSelectionNCaret(int selection, int pos);
+    int GetSelectionNCaret(int selection) const;
+    void SetSelectionNAnchor(int selection, int posAnchor);
+    int GetSelectionNAnchor(int selection) const;
+    void SetSelectionNCaretVirtualSpace(int selection, int space);
+    int GetSelectionNCaretVirtualSpace(int selection) const;
+    void SetSelectionNAnchorVirtualSpace(int selection, int space);
+    int GetSelectionNAnchorVirtualSpace(int selection) const;
+
+    // Sets the position that starts the selection - this becomes the anchor.
+    void SetSelectionNStart(int selection, int pos);
+
+    // Returns the position at the start of the selection.
+    int GetSelectionNStart(int selection) const;
+
+    // Sets the position that ends the selection - this becomes the currentPosition.
+    void SetSelectionNEnd(int selection, int pos);
+
+    // Returns the position at the end of the selection.
+    int GetSelectionNEnd(int selection) const;
+    void SetRectangularSelectionCaret(int pos);
+    int GetRectangularSelectionCaret() const;
+    void SetRectangularSelectionAnchor(int posAnchor);
+    int GetRectangularSelectionAnchor() const;
+    void SetRectangularSelectionCaretVirtualSpace(int space);
+    int GetRectangularSelectionCaretVirtualSpace() const;
+    void SetRectangularSelectionAnchorVirtualSpace(int space);
+    int GetRectangularSelectionAnchorVirtualSpace() const;
+    void SetVirtualSpaceOptions(int virtualSpaceOptions);
+    int GetVirtualSpaceOptions() const;
+
+    // On GTK+, allow selecting the modifier key to use for mouse-based
+    // rectangular selection. Often the window manager requires Alt+Mouse Drag
+    // for moving windows.
+    // Valid values are SCMOD_CTRL(default), SCMOD_ALT, or SCMOD_SUPER.
+    void SetRectangularSelectionModifier(int modifier);
+
+    // Get the modifier key used for rectangular selection.
+    int GetRectangularSelectionModifier() const;
+
+    // Set the foreground colour of additional selections.
+    // Must have previously called SetSelFore with non-zero first argument for this to have an effect.
+    void SetAdditionalSelForeground(const wxColour& fore);
+
+    // Set the background colour of additional selections.
+    // Must have previously called SetSelBack with non-zero first argument for this to have an effect.
+    void SetAdditionalSelBackground(const wxColour& back);
+
+    // Set the alpha of the selection.
+    void SetAdditionalSelAlpha(int alpha);
+
+    // Get the alpha of the selection.
+    int GetAdditionalSelAlpha() const;
+
+    // Set the foreground colour of additional carets.
+    void SetAdditionalCaretForeground(const wxColour& fore);
+
+    // Get the foreground colour of additional carets.
+    wxColour GetAdditionalCaretForeground() const;
+
+    // Set the main selection to the next selection.
+    void RotateSelection();
+
+    // Swap that caret and anchor of the main selection.
+    void SwapMainAnchorCaret();

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


@@ -3162,7 +3899,7 @@ public:
     void SetLexer(int lexer);
 
     // Retrieve the lexing language of the document.
     void SetLexer(int lexer);
 
     // Retrieve the lexing language of the document.

-    int GetLexer();
+    int GetLexer() const;

 
     // Colourise a segment of the document using the current lexing language.
     void Colourise(int start, int end);
 
     // Colourise a segment of the document using the current lexing language.
     void Colourise(int start, int end);


@@ -3185,15 +3922,15 @@ public:
 
     // Retrieve a 'property' value previously set with SetProperty,
     // interpreted as an int AFTER any '$()' variable replacement.
 
     // Retrieve a 'property' value previously set with SetProperty,
     // interpreted as an int AFTER any '$()' variable replacement.

-    int GetPropertyInt(const wxString& key);
+    int GetPropertyInt(const wxString& key) const;

 
     // Retrieve the number of bits the current lexer needs for styling.
 
     // Retrieve the number of bits the current lexer needs for styling.

-    int GetStyleBitsNeeded();
+    int GetStyleBitsNeeded() const;

 
 

-// END of generated section
-//----------------------------------------------------------------------
-// Others...
+    //}}}
+    //----------------------------------------------------------------------

 
 

+    // Manually declared methods

 
     // Returns the line number of the line with the caret.
     int GetCurrentLine();
 
     // Returns the line number of the line with the caret.
     int GetCurrentLine();


@@ -3213,6 +3950,9 @@ public:
     void StyleSetSpec(int styleNum, const wxString& spec);
 
 
     void StyleSetSpec(int styleNum, const wxString& spec);
 
 

+    // Get the font of a style.
+    wxFont StyleGetFont(int style);
+

 
     // Set style size, face, bold, italic, and underline attributes from
     // a wxFont's attributes.
 
     // Set style size, face, bold, italic, and underline attributes from
     // a wxFont's attributes.


@@ -3234,7 +3974,7 @@ public:
 
     // Set the font encoding to be used by a style.
     void StyleSetFontEncoding(int style, wxFontEncoding encoding);
 
     // Set the font encoding to be used by a style.
     void StyleSetFontEncoding(int style, wxFontEncoding encoding);

-    
+

 
     // Perform one of the operations defined by the wxSTC_CMD_* constants.
     void CmdKeyExecute(int cmd);
 
     // Perform one of the operations defined by the wxSTC_CMD_* constants.
     void CmdKeyExecute(int cmd);


@@ -3244,13 +3984,6 @@ public:
     void SetMargins(int left, int right);
 
 
     void SetMargins(int left, int right);
 
 

-    // Retrieve the start and end positions of the current selection.
-#ifdef SWIG
-    void GetSelection(int* OUTPUT, int* OUTPUT);
-#else
-    void GetSelection(int* startPos, int* endPos);
-#endif
-

     // Retrieve the point in the window where a position is displayed.
     wxPoint PointFromPosition(int pos);
 
     // Retrieve the point in the window where a position is displayed.
     wxPoint PointFromPosition(int pos);
 


@@ -3264,7 +3997,11 @@ public:
 
 
     // Send a message to Scintilla
 
 
     // Send a message to Scintilla

-    long SendMsg(int msg, long wp=0, long lp=0);
+    //
+    // NB: this method is not really const as it can modify the control but it
+    //     has to be declared as such as it's called from both const and
+    //     non-const methods and we can't distinguish between the two
+    wxIntPtr SendMsg(int msg, wxUIntPtr wp=0, wxIntPtr lp=0) const;

 
 
     // Set the vertical scrollbar to use instead of the ont that's built-in.
 
 
     // Set the vertical scrollbar to use instead of the ont that's built-in.


@@ -3278,11 +4015,14 @@ public:
     bool GetLastKeydownProcessed() { return m_lastKeyDownConsumed; }
     void SetLastKeydownProcessed(bool val) { m_lastKeyDownConsumed = val; }
 
     bool GetLastKeydownProcessed() { return m_lastKeyDownConsumed; }
     void SetLastKeydownProcessed(bool val) { m_lastKeyDownConsumed = val; }
 

+    // if we derive from wxTextAreaBase it already provides these methods
+#if !wxUSE_TEXTCTRL

     // Write the contents of the editor to filename
     bool SaveFile(const wxString& filename);
 
     // Load the contents of filename into the editor
     bool LoadFile(const wxString& filename);
     // Write the contents of the editor to filename
     bool SaveFile(const wxString& filename);
 
     // Load the contents of filename into the editor
     bool LoadFile(const wxString& filename);

+#endif // !wxUSE_TEXTCTRL

 
 #ifdef STC_USE_DND
     // Allow for simulating a DnD DragOver
 
 #ifdef STC_USE_DND
     // Allow for simulating a DnD DragOver


@@ -3301,13 +4041,13 @@ public:
     bool GetUseAntiAliasing();
 
 
     bool GetUseAntiAliasing();
 
 

-    
-    // 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.
     // 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);
 
     // Add text to the document at current position.
     void AddTextRaw(const char* text);
 


@@ -3343,11 +4083,174 @@ public:
 #ifdef SWIG
     %pythoncode "_stc_utf8_methods.py"
 #endif
 #ifdef SWIG
     %pythoncode "_stc_utf8_methods.py"
 #endif

-//----------------------------------------------------------------------

 
 
 
 

-#ifndef SWIG
+    // implement wxTextEntryBase pure virtual methods
+    // ----------------------------------------------
+
+    virtual void WriteText(const wxString& text) { AddText(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);
+        ReplaceTarget(text);
+    }
+
+    /*
+        These functions are already declared in the generated section.
+
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();
+
+    virtual void Undo();
+    virtual void Redo();
+
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;
+
+    */
+
+    virtual void SetInsertionPoint(long pos) { SetCurrentPos(pos); }
+    virtual long GetInsertionPoint() const { return GetCurrentPos(); }
+    virtual long GetLastPosition() const { return GetTextLength(); }
+
+    virtual void SetSelection(long from, long to)
+    {
+        if ( from == -1 && to == -1 )
+        {
+            SelectAll();
+        }
+        else
+        {
+            SetSelectionStart(from);
+            SetSelectionEnd(to);
+        }
+    }
+
+#ifdef SWIG
+    void GetSelection(long* OUTPUT, long* OUTPUT) const;
+#else
+    virtual void GetSelection(long *from, long *to) const
+    {
+        if ( from )
+            *from = GetSelectionStart();
+        if ( to )
+            *to = GetSelectionEnd();
+    }
+
+    // kept for compatibility only
+    void GetSelection(int *from, int *to)
+    {
+        long f, t;
+        GetSelection(&f, &t);
+        if ( from )
+            *from = f;
+        if ( to )
+            *to = t;
+    }
+#endif
+
+    virtual bool IsEditable() const { return !GetReadOnly(); }
+    virtual void SetEditable(bool editable) { SetReadOnly(!editable); }
+
+    // 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 GetNumberOfLines() const { return GetLineCount(); }
+
+    virtual bool IsModified() const { return GetModify(); }
+    virtual void MarkDirty() { wxFAIL_MSG("not implemented"); }
+    virtual void DiscardEdits() { SetSavePoint(); }
+
+    virtual bool SetStyle(long WXUNUSED(start), long WXUNUSED(end),
+                          const wxTextAttr& WXUNUSED(style))
+    {
+        wxFAIL_MSG("not implemented");
+
+        return false;
+    }
+
+    virtual bool GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style))
+    {
+        wxFAIL_MSG("not implemented");
+
+        return false;
+    }
+
+    virtual bool SetDefaultStyle(const wxTextAttr& WXUNUSED(style))
+    {
+        wxFAIL_MSG("not implemented");
+
+        return false;
+    }
+
+    virtual long XYToPosition(long x, long y) const
+    {
+        long pos = PositionFromLine(y);
+        pos += x;
+        return pos;
+    }
+
+    virtual bool PositionToXY(long pos, long *x, long *y) const
+    {
+        if ( x )
+            *x = -1; // TODO
+
+        if ( y )
+        {
+            long l = LineFromPosition(pos);
+            if ( l == -1 )
+                return false;
+            *y = l;
+        }
+
+        return true;
+    }
+
+    virtual void ShowPosition(long pos) { GotoPos(pos); }
+
+    // FIXME-VC6: can't use wxWindow here because of "error C2603: illegal
+    //            access declaration: 'wxWindow' is not a direct base of
+    //            'wxStyledTextCtrl'" with VC6
+    using wxControl::HitTest;
+
+    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const
+    {
+        const long l = PositionFromPoint(pt);
+        if ( l == -1 )
+            return wxTE_HT_BELOW; // we don't really know where it was
+
+        if ( pos )
+            *pos = l;
+
+        return wxTE_HT_ON_TEXT;
+    }
+
+    // just unhide it
+    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
+                                            wxTextCoord *col,
+                                            wxTextCoord *row) const
+    {
+        return wxTextAreaBase::HitTest(pt, col, row);
+    }
+
+    static wxVersionInfo GetLibraryVersionInfo();
+

 protected:
 protected:

+    virtual wxString DoGetValue() const { return GetText(); }
+    virtual wxWindow *GetEditableWindow() { return this; }
+
+#ifndef SWIG
+    virtual bool DoLoadFile(const wxString& file, int fileType);
+    virtual bool DoSaveFile(const wxString& file, int fileType);
+

     // Event handlers
     void OnPaint(wxPaintEvent& evt);
     void OnScrollWin(wxScrollWinEvent& evt);
     // Event handlers
     void OnPaint(wxPaintEvent& evt);
     void OnScrollWin(wxScrollWinEvent& evt);


@@ -3389,9 +4292,13 @@ 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;
     friend class ScintillaWX;
     friend class Platform;

-#endif
+#endif // !SWIG

 };
 
 //----------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------


@@ -3421,10 +4328,20 @@ 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 SetDragText(const wxString& val) { m_dragText = val; }
-    void SetDragAllowMove(bool val)       { m_dragAllowMove = val; }

 #ifdef  STC_USE_DND
 #ifdef  STC_USE_DND

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

     void SetDragResult(wxDragResult val)  { m_dragResult = val; }
     void SetDragResult(wxDragResult val)  { m_dragResult = val; }

+
+    // This method is kept mainly for backwards compatibility, use
+    // SetDragFlags() in the new code.
+    void SetDragAllowMove(bool allow)
+    {
+        if ( allow )
+            m_dragFlags |= wxDrag_AllowMove;
+        else
+            m_dragFlags &= ~(wxDrag_AllowMove | wxDrag_DefaultMove);
+    }

 #endif
 
     int  GetPosition() const         { return m_position; }
 #endif
 
     int  GetPosition() const         { return m_position; }


@@ -3444,10 +4361,12 @@ 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; }

-    wxString GetDragText()           { return m_dragText; }
-    bool GetDragAllowMove()          { return m_dragAllowMove; }

 #ifdef STC_USE_DND
 #ifdef STC_USE_DND

+    wxString GetDragText()           { return m_dragText; }
+    int GetDragFlags()               { return m_dragFlags; }

     wxDragResult GetDragResult()     { return m_dragResult; }
     wxDragResult GetDragResult()     { return m_dragResult; }

+
+    bool GetDragAllowMove() { return (GetDragFlags() & wxDrag_AllowMove) != 0; }

 #endif
 
     bool GetShift() const;
 #endif
 
     bool GetShift() const;


@@ -3482,11 +4401,10 @@ private:
     int m_x;
     int m_y;
 
     int m_x;
     int m_y;
 

-    wxString m_dragText;        // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
-    bool     m_dragAllowMove;   // wxEVT_STC_START_DRAG
-

 #if wxUSE_DRAG_AND_DROP
 #if wxUSE_DRAG_AND_DROP

-    wxDragResult m_dragResult; // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP
+    wxString m_dragText;        // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
+    int      m_dragFlags;       // wxEVT_STC_START_DRAG
+    wxDragResult m_dragResult;  // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP

 #endif
 #endif
 };
 #endif
 #endif
 };


@@ -3494,34 +4412,36 @@ private:
 
 
 #ifndef SWIG
 
 
 #ifndef SWIG

-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_CHANGE,             1650)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_STYLENEEDED,        1651)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_CHARADDED,          1652)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_SAVEPOINTREACHED,   1653)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_SAVEPOINTLEFT,      1654)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_ROMODIFYATTEMPT,    1655)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_KEY,                1656)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DOUBLECLICK,        1657)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_UPDATEUI,           1658)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MODIFIED,           1659)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MACRORECORD,        1660)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_MARGINCLICK,        1661)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_NEEDSHOWN,          1662)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_PAINTED,            1664)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_USERLISTSELECTION,  1665)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_URIDROPPED,         1666)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DWELLSTART,         1667)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DWELLEND,           1668)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_START_DRAG,         1669)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DRAG_OVER,          1670)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_DO_DROP,            1671)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_ZOOM,               1672)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_CLICK,      1673)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_DCLICK,     1674)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_CALLTIP_CLICK,      1675)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_SELECTION, 1676)
-END_DECLARE_EVENT_TYPES()
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_CHANGE, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_STYLENEEDED, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_CHARADDED, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_SAVEPOINTREACHED, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_SAVEPOINTLEFT, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_ROMODIFYATTEMPT, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_KEY, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_DOUBLECLICK, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_UPDATEUI, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_MODIFIED, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_MACRORECORD, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_MARGINCLICK, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_NEEDSHOWN, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_PAINTED, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_USERLISTSELECTION, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_URIDROPPED, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_DWELLSTART, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_DWELLEND, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_START_DRAG, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_DRAG_OVER, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_DO_DROP, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_ZOOM, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_CLICK, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_DCLICK, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_CALLTIP_CLICK, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_SELECTION, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_INDICATOR_CLICK, 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 );

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


@@ -3549,7 +4469,11 @@ END_DECLARE_EVENT_TYPES()
         wxEVT_STC_HOTSPOT_CLICK,
         wxEVT_STC_HOTSPOT_DCLICK,
         wxEVT_STC_CALLTIP_CLICK,
         wxEVT_STC_HOTSPOT_CLICK,
         wxEVT_STC_HOTSPOT_DCLICK,
         wxEVT_STC_CALLTIP_CLICK,

-        wxEVT_STC_AUTOCOMP_SELECTION
+        wxEVT_STC_AUTOCOMP_SELECTION,
+        wxEVT_STC_INDICATOR_CLICK,
+        wxEVT_STC_INDICATOR_RELEASE,
+        wxEVT_STC_AUTOCOMP_CANCELLED,
+        wxEVT_STC_AUTOCOMP_CHAR_DELETED

     };
 #endif
 
     };
 #endif
 


@@ -3558,32 +4482,40 @@ END_DECLARE_EVENT_TYPES()
 #ifndef SWIG
 typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 
 #ifndef SWIG
 typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 

-#define EVT_STC_CHANGE(id, fn)             DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHANGE,                id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_STYLENEEDED(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_STYLENEEDED,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_CHARADDED(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHARADDED,             id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_SAVEPOINTREACHED(id, fn)   DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTREACHED,      id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_SAVEPOINTLEFT(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTLEFT,         id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_ROMODIFYATTEMPT(id, fn)    DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ROMODIFYATTEMPT,       id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_KEY(id, fn)                DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_KEY,                   id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DOUBLECLICK(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DOUBLECLICK,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_UPDATEUI(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_UPDATEUI,              id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_MODIFIED(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MODIFIED,              id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_MACRORECORD(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MACRORECORD,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_MARGINCLICK(id, fn)        DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MARGINCLICK,           id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_NEEDSHOWN(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_NEEDSHOWN,             id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_PAINTED(id, fn)            DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_PAINTED,               id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_USERLISTSELECTION(id, fn)  DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_USERLISTSELECTION,     id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_URIDROPPED(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED,            id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DWELLSTART(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART,            id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DWELLEND(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND,              id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_START_DRAG(id, fn)         DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG,            id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DRAG_OVER(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER,             id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_DO_DROP(id, fn)            DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP,               id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_ZOOM(id, fn)               DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ZOOM,                  id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_HOTSPOT_CLICK(id, fn)      DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_CLICK,         id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_HOTSPOT_DCLICK(id, fn)     DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_DCLICK,        id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_CALLTIP_CLICK(id, fn))     DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CALLTIP_CLICK          id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
-#define EVT_STC_AUTOCOMP_SELECTION(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_SELECTION     id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ),
+#define wxStyledTextEventHandler( func ) \
+    wxEVENT_HANDLER_CAST( wxStyledTextEventFunction, func )
+
+#define EVT_STC_CHANGE(id, fn)             wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHANGE,                id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_STYLENEEDED(id, fn)        wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_STYLENEEDED,           id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_CHARADDED(id, fn)          wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHARADDED,             id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_SAVEPOINTREACHED(id, fn)   wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTREACHED,      id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_SAVEPOINTLEFT(id, fn)      wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTLEFT,         id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_ROMODIFYATTEMPT(id, fn)    wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ROMODIFYATTEMPT,       id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_KEY(id, fn)                wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_KEY,                   id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_DOUBLECLICK(id, fn)        wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DOUBLECLICK,           id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_UPDATEUI(id, fn)           wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_UPDATEUI,              id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_MODIFIED(id, fn)           wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MODIFIED,              id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_MACRORECORD(id, fn)        wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MACRORECORD,           id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_MARGINCLICK(id, fn)        wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MARGINCLICK,           id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_NEEDSHOWN(id, fn)          wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_NEEDSHOWN,             id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_PAINTED(id, fn)            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_PAINTED,               id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_USERLISTSELECTION(id, fn)  wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_USERLISTSELECTION,     id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_URIDROPPED(id, fn)         wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED,            id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_DWELLSTART(id, fn)         wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART,            id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_DWELLEND(id, fn)           wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND,              id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_START_DRAG(id, fn)         wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG,            id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_DRAG_OVER(id, fn)          wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER,             id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_DO_DROP(id, fn)            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP,               id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_ZOOM(id, fn)               wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ZOOM,                  id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_HOTSPOT_CLICK(id, fn)      wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_CLICK,         id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_HOTSPOT_DCLICK(id, fn)     wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_DCLICK,        id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_CALLTIP_CLICK(id, fn)      wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CALLTIP_CLICK,         id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_AUTOCOMP_SELECTION(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_SELECTION,    id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_INDICATOR_CLICK(id, fn)    wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_INDICATOR_CLICK,       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 ),
+

 #endif
 
 #endif // wxUSE_STC
 #endif
 
 #endif // wxUSE_STC