X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a5c2ccf2e7a22fc7fd629d5db723faef301bfaff..bfa78c63b9045c2a594ca6f04dc26a70c21f5f42:/include/wx/stc/stc.h diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index e9cbffab90..f7600b9dd6 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -14,7 +14,7 @@ // Created: 13-Jan-2000 // RCS-ID: $Id$ // Copyright: (c) 2000 by Total Control Software -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /* @@ -38,6 +38,12 @@ #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; @@ -50,7 +56,6 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #endif #endif - //---------------------------------------------------------------------- // STC constants generated section {{{ @@ -71,9 +76,6 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; // The SC_CP_UTF8 value can be used to enter Unicode mode. // This is the same value as CP_UTF8 in Windows #define wxSTC_CP_UTF8 65001 - -// The SC_CP_DBCS value can be used to indicate a DBCS mode for GTK+. -#define wxSTC_CP_DBCS 1 #define wxSTC_MARKER_MAX 31 #define wxSTC_MARK_CIRCLE 0 #define wxSTC_MARK_ROUNDRECT 1 @@ -100,12 +102,16 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #define wxSTC_MARK_CIRCLEMINUS 20 #define wxSTC_MARK_CIRCLEMINUSCONNECTED 21 -// Invisible mark that only sets the line background color. +// Invisible mark that only sets the line background colour. #define wxSTC_MARK_BACKGROUND 22 #define wxSTC_MARK_DOTDOTDOT 23 #define wxSTC_MARK_ARROWS 24 #define wxSTC_MARK_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_RGBAIMAGE 30 #define wxSTC_MARK_CHARACTER 10000 // Markers used for outlining column. @@ -121,6 +127,8 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #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. @@ -160,6 +168,10 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #define wxSTC_CASE_MIXED 0 #define wxSTC_CASE_UPPER 1 #define wxSTC_CASE_LOWER 2 +#define wxSTC_FONT_SIZE_MULTIPLIER 100 +#define wxSTC_WEIGHT_NORMAL 400 +#define wxSTC_WEIGHT_SEMIBOLD 600 +#define wxSTC_WEIGHT_BOLD 700 // Indicator style enumeration and some constants #define wxSTC_INDIC_PLAIN 0 @@ -170,6 +182,11 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #define wxSTC_INDIC_HIDDEN 5 #define wxSTC_INDIC_BOX 6 #define wxSTC_INDIC_ROUNDBOX 7 +#define wxSTC_INDIC_STRAIGHTBOX 8 +#define wxSTC_INDIC_DASH 9 +#define wxSTC_INDIC_DOTS 10 +#define wxSTC_INDIC_SQUIGGLELOW 11 +#define wxSTC_INDIC_DOTBOX 12 #define wxSTC_INDIC_MAX 31 #define wxSTC_INDIC_CONTAINER 8 #define wxSTC_INDIC0_MASK 0x20 @@ -203,17 +220,12 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #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_FOLDFLAG_BOX 0x0001 #define wxSTC_TIME_FOREVER 10000000 #define wxSTC_WRAP_NONE 0 #define wxSTC_WRAP_WORD 1 @@ -221,18 +233,36 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #define wxSTC_WRAPVISUALFLAG_NONE 0x0000 #define wxSTC_WRAPVISUALFLAG_END 0x0001 #define wxSTC_WRAPVISUALFLAG_START 0x0002 +#define wxSTC_WRAPVISUALFLAG_MARGIN 0x0004 #define wxSTC_WRAPVISUALFLAGLOC_DEFAULT 0x0000 #define wxSTC_WRAPVISUALFLAGLOC_END_BY_TEXT 0x0001 #define wxSTC_WRAPVISUALFLAGLOC_START_BY_TEXT 0x0002 +#define wxSTC_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 + +// 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_MULTIPASTE_ONCE 0 +#define wxSTC_MULTIPASTE_EACH 1 #define wxSTC_EDGE_NONE 0 #define wxSTC_EDGE_LINE 1 #define wxSTC_EDGE_BACKGROUND 2 +#define wxSTC_STATUS_OK 0 +#define wxSTC_STATUS_FAILURE 1 +#define wxSTC_STATUS_BADALLOC 2 #define wxSTC_CURSORNORMAL -1 +#define wxSTC_CURSORARROW 2 #define wxSTC_CURSORWAIT 4 +#define wxSTC_CURSORREVERSEARROW 7 // Constants for use with SetVisiblePolicy, similar to SetCaretPolicy. #define wxSTC_VISIBLE_SLOP 0x01 @@ -263,22 +293,38 @@ 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 - -// Selection Modes #define wxSTC_SEL_STREAM 0 #define wxSTC_SEL_RECTANGLE 1 #define wxSTC_SEL_LINES 2 +#define wxSTC_SEL_THIN 3 +#define wxSTC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE 0 +#define wxSTC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE 1 +#define wxSTC_CARETSTICKY_OFF 0 +#define wxSTC_CARETSTICKY_ON 1 +#define wxSTC_CARETSTICKY_WHITESPACE 2 #define wxSTC_ALPHA_TRANSPARENT 0 #define wxSTC_ALPHA_OPAQUE 255 #define wxSTC_ALPHA_NOALPHA 256 - -// Caret Styles #define wxSTC_CARETSTYLE_INVISIBLE 0 #define wxSTC_CARETSTYLE_LINE 1 #define wxSTC_CARETSTYLE_BLOCK 2 +#define wxSTC_MARGINOPTION_NONE 0 +#define wxSTC_MARGINOPTION_SUBLINESELECT 1 +#define wxSTC_ANNOTATION_HIDDEN 0 +#define wxSTC_ANNOTATION_STANDARD 1 +#define wxSTC_ANNOTATION_BOXED 2 +#define wxSTC_UNDO_MAY_COALESCE 1 +#define wxSTC_SCVS_NONE 0 +#define wxSTC_SCVS_RECTANGULARSELECTION 1 +#define wxSTC_SCVS_USERACCESSIBLE 2 +#define wxSTC_TECHNOLOGY_DEFAULT 0 +#define wxSTC_TECHNOLOGY_DIRECTWRITE 1 // Maximum value of keywordSet parameter of SetKeyWords. #define wxSTC_KEYWORDSET_MAX 8 +#define wxSTC_TYPE_BOOLEAN 0 +#define wxSTC_TYPE_INTEGER 1 +#define wxSTC_TYPE_STRING 2 // Notifications // Type of modification and the action which caused the modification. @@ -300,7 +346,15 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #define wxSTC_STARTACTION 0x2000 #define wxSTC_MOD_CHANGEINDICATOR 0x4000 #define wxSTC_MOD_CHANGELINESTATE 0x8000 -#define wxSTC_MODEVENTMASKALL 0xFFFF +#define wxSTC_MOD_CHANGEMARGIN 0x10000 +#define wxSTC_MOD_CHANGEANNOTATION 0x20000 +#define wxSTC_MOD_CONTAINER 0x40000 +#define wxSTC_MOD_LEXERSTATE 0x80000 +#define wxSTC_MODEVENTMASKALL 0xFFFFF +#define wxSTC_UPDATE_CONTENT 0x1 +#define wxSTC_UPDATE_SELECTION 0x2 +#define wxSTC_UPDATE_V_SCROLL 0x4 +#define wxSTC_UPDATE_H_SCROLL 0x8 // Symbolic key codes and modifier flags. // ASCII and other printable characters below 256. @@ -329,6 +383,8 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #define wxSTC_SCMOD_SHIFT 1 #define wxSTC_SCMOD_CTRL 2 #define wxSTC_SCMOD_ALT 4 +#define wxSTC_SCMOD_SUPER 8 +#define wxSTC_SCMOD_META 16 // For SciLexer.h #define wxSTC_LEX_CONTAINER 0 @@ -416,6 +472,27 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #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 +#define wxSTC_LEX_TXT2TAGS 99 +#define wxSTC_LEX_A68K 100 +#define wxSTC_LEX_MODULA 101 +#define wxSTC_LEX_COFFEESCRIPT 102 +#define wxSTC_LEX_TCMD 103 +#define wxSTC_LEX_AVS 104 +#define wxSTC_LEX_ECL 105 +#define wxSTC_LEX_OSCRIPT 106 +#define wxSTC_LEX_VISUALPROLOG 107 // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a // value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -460,6 +537,10 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #define wxSTC_C_COMMENTDOCKEYWORD 17 #define wxSTC_C_COMMENTDOCKEYWORDERROR 18 #define wxSTC_C_GLOBALCLASS 19 +#define wxSTC_C_STRINGRAW 20 +#define wxSTC_C_TRIPLEVERBATIM 21 +#define wxSTC_C_HASHQUOTEDSTRING 22 +#define wxSTC_C_PREPROCESSORCOMMENT 23 // Lexical states for SCLEX_D #define wxSTC_D_DEFAULT 0 @@ -480,6 +561,11 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #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 @@ -678,6 +764,16 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #define wxSTC_PL_SUB_PROTOTYPE 40 #define wxSTC_PL_FORMAT_IDENT 41 #define wxSTC_PL_FORMAT 42 +#define wxSTC_PL_STRING_VAR 43 +#define wxSTC_PL_XLAT 44 +#define wxSTC_PL_REGEX_VAR 54 +#define wxSTC_PL_REGSUBST_VAR 55 +#define wxSTC_PL_BACKTICKS_VAR 57 +#define wxSTC_PL_HERE_QQ_VAR 61 +#define wxSTC_PL_HERE_QX_VAR 62 +#define wxSTC_PL_STRING_QQ_VAR 64 +#define wxSTC_PL_STRING_QX_VAR 65 +#define wxSTC_PL_STRING_QR_VAR 66 // Lexical states for SCLEX_RUBY #define wxSTC_RB_DEFAULT 0 @@ -750,6 +846,14 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #define wxSTC_L_TAG 2 #define wxSTC_L_MATH 3 #define wxSTC_L_COMMENT 4 +#define wxSTC_L_TAG2 5 +#define wxSTC_L_MATH2 6 +#define wxSTC_L_COMMENT2 7 +#define wxSTC_L_VERBATIM 8 +#define wxSTC_L_SHORTCMD 9 +#define wxSTC_L_SPECIAL 10 +#define wxSTC_L_CMDOPT 11 +#define wxSTC_L_ERROR 12 // Lexical states for SCLEX_LUA #define wxSTC_LUA_DEFAULT 0 @@ -772,6 +876,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #define wxSTC_LUA_WORD6 17 #define wxSTC_LUA_WORD7 18 #define wxSTC_LUA_WORD8 19 +#define wxSTC_LUA_LABEL 20 // Lexical states for SCLEX_ERRORLIST #define wxSTC_ERR_DEFAULT 0 @@ -807,6 +912,19 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #define wxSTC_BAT_IDENTIFIER 6 #define wxSTC_BAT_OPERATOR 7 +// Lexical states for SCLEX_TCMD +#define wxSTC_TCMD_DEFAULT 0 +#define wxSTC_TCMD_COMMENT 1 +#define wxSTC_TCMD_WORD 2 +#define wxSTC_TCMD_LABEL 3 +#define wxSTC_TCMD_HIDE 4 +#define wxSTC_TCMD_COMMAND 5 +#define wxSTC_TCMD_IDENTIFIER 6 +#define wxSTC_TCMD_OPERATOR 7 +#define wxSTC_TCMD_ENVIRONMENT 8 +#define wxSTC_TCMD_EXPANSION 9 +#define wxSTC_TCMD_CLABEL 10 + // Lexical states for SCLEX_MAKEFILE #define wxSTC_MAKE_DEFAULT 0 #define wxSTC_MAKE_COMMENT 1 @@ -824,6 +942,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #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 @@ -980,6 +1099,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #define wxSTC_ASM_CHARACTER 12 #define wxSTC_ASM_STRINGEOL 13 #define wxSTC_ASM_EXTINSTRUCTION 14 +#define wxSTC_ASM_COMMENTDIRECTIVE 15 // Lexical states for SCLEX_FORTRAN #define wxSTC_F_DEFAULT 0 @@ -1016,6 +1136,13 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #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 +#define wxSTC_CSS_MEDIA 22 +#define wxSTC_CSS_VARIABLE 23 // Lexical states for SCLEX_POV #define wxSTC_POV_DEFAULT 0 @@ -1190,8 +1317,19 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #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_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 @@ -1363,6 +1501,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #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 @@ -1505,11 +1644,19 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #define wxSTC_FS_DATE 16 #define wxSTC_FS_STRINGEOL 17 #define wxSTC_FS_CONSTANT 18 -#define wxSTC_FS_ASM 19 -#define wxSTC_FS_LABEL 20 -#define wxSTC_FS_ERROR 21 -#define wxSTC_FS_HEXNUMBER 22 -#define wxSTC_FS_BINNUMBER 23 +#define wxSTC_FS_WORDOPERATOR 19 +#define wxSTC_FS_DISABLEDCODE 20 +#define wxSTC_FS_DEFAULT_C 21 +#define wxSTC_FS_COMMENTDOC_C 22 +#define wxSTC_FS_COMMENTLINEDOC_C 23 +#define wxSTC_FS_KEYWORD_C 24 +#define wxSTC_FS_KEYWORD2_C 25 +#define wxSTC_FS_NUMBER_C 26 +#define wxSTC_FS_STRING_C 27 +#define wxSTC_FS_PREPROCESSOR_C 28 +#define wxSTC_FS_OPERATOR_C 29 +#define wxSTC_FS_IDENTIFIER_C 30 +#define wxSTC_FS_STRINGEOL_C 31 // Lexical states for SCLEX_CSOUND #define wxSTC_CSOUND_DEFAULT 0 @@ -1536,7 +1683,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #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 @@ -1685,6 +1832,355 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar; #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 +#define wxSTC_POWERSHELL_FUNCTION 11 +#define wxSTC_POWERSHELL_USER1 12 +#define wxSTC_POWERSHELL_COMMENTSTREAM 13 + +// 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 + +// Lexical state for SCLEX_TXT2TAGS +#define wxSTC_TXT2TAGS_DEFAULT 0 +#define wxSTC_TXT2TAGS_LINE_BEGIN 1 +#define wxSTC_TXT2TAGS_STRONG1 2 +#define wxSTC_TXT2TAGS_STRONG2 3 +#define wxSTC_TXT2TAGS_EM1 4 +#define wxSTC_TXT2TAGS_EM2 5 +#define wxSTC_TXT2TAGS_HEADER1 6 +#define wxSTC_TXT2TAGS_HEADER2 7 +#define wxSTC_TXT2TAGS_HEADER3 8 +#define wxSTC_TXT2TAGS_HEADER4 9 +#define wxSTC_TXT2TAGS_HEADER5 10 +#define wxSTC_TXT2TAGS_HEADER6 11 +#define wxSTC_TXT2TAGS_PRECHAR 12 +#define wxSTC_TXT2TAGS_ULIST_ITEM 13 +#define wxSTC_TXT2TAGS_OLIST_ITEM 14 +#define wxSTC_TXT2TAGS_BLOCKQUOTE 15 +#define wxSTC_TXT2TAGS_STRIKEOUT 16 +#define wxSTC_TXT2TAGS_HRULE 17 +#define wxSTC_TXT2TAGS_LINK 18 +#define wxSTC_TXT2TAGS_CODE 19 +#define wxSTC_TXT2TAGS_CODE2 20 +#define wxSTC_TXT2TAGS_CODEBK 21 +#define wxSTC_TXT2TAGS_COMMENT 22 +#define wxSTC_TXT2TAGS_OPTION 23 +#define wxSTC_TXT2TAGS_PREPROC 24 +#define wxSTC_TXT2TAGS_POSTPROC 25 + +// Lexical states for SCLEX_A68K +#define wxSTC_A68K_DEFAULT 0 +#define wxSTC_A68K_COMMENT 1 +#define wxSTC_A68K_NUMBER_DEC 2 +#define wxSTC_A68K_NUMBER_BIN 3 +#define wxSTC_A68K_NUMBER_HEX 4 +#define wxSTC_A68K_STRING1 5 +#define wxSTC_A68K_OPERATOR 6 +#define wxSTC_A68K_CPUINSTRUCTION 7 +#define wxSTC_A68K_EXTINSTRUCTION 8 +#define wxSTC_A68K_REGISTER 9 +#define wxSTC_A68K_DIRECTIVE 10 +#define wxSTC_A68K_MACRO_ARG 11 +#define wxSTC_A68K_LABEL 12 +#define wxSTC_A68K_STRING2 13 +#define wxSTC_A68K_IDENTIFIER 14 +#define wxSTC_A68K_MACRO_DECLARATION 15 +#define wxSTC_A68K_COMMENT_WORD 16 +#define wxSTC_A68K_COMMENT_SPECIAL 17 +#define wxSTC_A68K_COMMENT_DOXYGEN 18 + +// Lexical states for SCLEX_MODULA +#define wxSTC_MODULA_DEFAULT 0 +#define wxSTC_MODULA_COMMENT 1 +#define wxSTC_MODULA_DOXYCOMM 2 +#define wxSTC_MODULA_DOXYKEY 3 +#define wxSTC_MODULA_KEYWORD 4 +#define wxSTC_MODULA_RESERVED 5 +#define wxSTC_MODULA_NUMBER 6 +#define wxSTC_MODULA_BASENUM 7 +#define wxSTC_MODULA_FLOAT 8 +#define wxSTC_MODULA_STRING 9 +#define wxSTC_MODULA_STRSPEC 10 +#define wxSTC_MODULA_CHAR 11 +#define wxSTC_MODULA_CHARSPEC 12 +#define wxSTC_MODULA_PROC 13 +#define wxSTC_MODULA_PRAGMA 14 +#define wxSTC_MODULA_PRGKEY 15 +#define wxSTC_MODULA_OPERATOR 16 +#define wxSTC_MODULA_BADSTR 17 + +// Lexical states for SCLEX_COFFEESCRIPT +#define wxSTC_COFFEESCRIPT_DEFAULT 0 +#define wxSTC_COFFEESCRIPT_COMMENT 1 +#define wxSTC_COFFEESCRIPT_COMMENTLINE 2 +#define wxSTC_COFFEESCRIPT_COMMENTDOC 3 +#define wxSTC_COFFEESCRIPT_NUMBER 4 +#define wxSTC_COFFEESCRIPT_WORD 5 +#define wxSTC_COFFEESCRIPT_STRING 6 +#define wxSTC_COFFEESCRIPT_CHARACTER 7 +#define wxSTC_COFFEESCRIPT_UUID 8 +#define wxSTC_COFFEESCRIPT_PREPROCESSOR 9 +#define wxSTC_COFFEESCRIPT_OPERATOR 10 +#define wxSTC_COFFEESCRIPT_IDENTIFIER 11 +#define wxSTC_COFFEESCRIPT_STRINGEOL 12 +#define wxSTC_COFFEESCRIPT_VERBATIM 13 +#define wxSTC_COFFEESCRIPT_REGEX 14 +#define wxSTC_COFFEESCRIPT_COMMENTLINEDOC 15 +#define wxSTC_COFFEESCRIPT_WORD2 16 +#define wxSTC_COFFEESCRIPT_COMMENTDOCKEYWORD 17 +#define wxSTC_COFFEESCRIPT_COMMENTDOCKEYWORDERROR 18 +#define wxSTC_COFFEESCRIPT_GLOBALCLASS 19 +#define wxSTC_COFFEESCRIPT_STRINGRAW 20 +#define wxSTC_COFFEESCRIPT_TRIPLEVERBATIM 21 +#define wxSTC_COFFEESCRIPT_HASHQUOTEDSTRING 22 +#define wxSTC_COFFEESCRIPT_COMMENTBLOCK 22 +#define wxSTC_COFFEESCRIPT_VERBOSE_REGEX 23 +#define wxSTC_COFFEESCRIPT_VERBOSE_REGEX_COMMENT 24 + +// Lexical states for SCLEX_AVS +#define wxSTC_AVS_DEFAULT 0 +#define wxSTC_AVS_COMMENTBLOCK 1 +#define wxSTC_AVS_COMMENTBLOCKN 2 +#define wxSTC_AVS_COMMENTLINE 3 +#define wxSTC_AVS_NUMBER 4 +#define wxSTC_AVS_OPERATOR 5 +#define wxSTC_AVS_IDENTIFIER 6 +#define wxSTC_AVS_STRING 7 +#define wxSTC_AVS_TRIPLESTRING 8 +#define wxSTC_AVS_KEYWORD 9 +#define wxSTC_AVS_FILTER 10 +#define wxSTC_AVS_PLUGIN 11 +#define wxSTC_AVS_FUNCTION 12 +#define wxSTC_AVS_CLIPPROP 13 +#define wxSTC_AVS_USERDFN 14 + +// Lexical states for SCLEX_ECL +#define wxSTC_ECL_DEFAULT 0 +#define wxSTC_ECL_COMMENT 1 +#define wxSTC_ECL_COMMENTLINE 2 +#define wxSTC_ECL_NUMBER 3 +#define wxSTC_ECL_STRING 4 +#define wxSTC_ECL_WORD0 5 +#define wxSTC_ECL_OPERATOR 6 +#define wxSTC_ECL_CHARACTER 7 +#define wxSTC_ECL_UUID 8 +#define wxSTC_ECL_PREPROCESSOR 9 +#define wxSTC_ECL_UNKNOWN 10 +#define wxSTC_ECL_IDENTIFIER 11 +#define wxSTC_ECL_STRINGEOL 12 +#define wxSTC_ECL_VERBATIM 13 +#define wxSTC_ECL_REGEX 14 +#define wxSTC_ECL_COMMENTLINEDOC 15 +#define wxSTC_ECL_WORD1 16 +#define wxSTC_ECL_COMMENTDOCKEYWORD 17 +#define wxSTC_ECL_COMMENTDOCKEYWORDERROR 18 +#define wxSTC_ECL_WORD2 19 +#define wxSTC_ECL_WORD3 20 +#define wxSTC_ECL_WORD4 21 +#define wxSTC_ECL_WORD5 22 +#define wxSTC_ECL_COMMENTDOC 23 +#define wxSTC_ECL_ADDED 24 +#define wxSTC_ECL_DELETED 25 +#define wxSTC_ECL_CHANGED 26 +#define wxSTC_ECL_MOVED 27 + +// Lexical states for SCLEX_OSCRIPT +#define wxSTC_OSCRIPT_DEFAULT 0 +#define wxSTC_OSCRIPT_LINE_COMMENT 1 +#define wxSTC_OSCRIPT_BLOCK_COMMENT 2 +#define wxSTC_OSCRIPT_DOC_COMMENT 3 +#define wxSTC_OSCRIPT_PREPROCESSOR 4 +#define wxSTC_OSCRIPT_NUMBER 5 +#define wxSTC_OSCRIPT_SINGLEQUOTE_STRING 6 +#define wxSTC_OSCRIPT_DOUBLEQUOTE_STRING 7 +#define wxSTC_OSCRIPT_CONSTANT 8 +#define wxSTC_OSCRIPT_IDENTIFIER 9 +#define wxSTC_OSCRIPT_GLOBAL 10 +#define wxSTC_OSCRIPT_KEYWORD 11 +#define wxSTC_OSCRIPT_OPERATOR 12 +#define wxSTC_OSCRIPT_LABEL 13 +#define wxSTC_OSCRIPT_TYPE 14 +#define wxSTC_OSCRIPT_FUNCTION 15 +#define wxSTC_OSCRIPT_OBJECT 16 +#define wxSTC_OSCRIPT_PROPERTY 17 +#define wxSTC_OSCRIPT_METHOD 18 + +// Lexical states for SCLEX_VISUALPROLOG +#define wxSTC_VISUALPROLOG_DEFAULT 0 +#define wxSTC_VISUALPROLOG_KEY_MAJOR 1 +#define wxSTC_VISUALPROLOG_KEY_MINOR 2 +#define wxSTC_VISUALPROLOG_KEY_DIRECTIVE 3 +#define wxSTC_VISUALPROLOG_COMMENT_BLOCK 4 +#define wxSTC_VISUALPROLOG_COMMENT_LINE 5 +#define wxSTC_VISUALPROLOG_COMMENT_KEY 6 +#define wxSTC_VISUALPROLOG_COMMENT_KEY_ERROR 7 +#define wxSTC_VISUALPROLOG_IDENTIFIER 8 +#define wxSTC_VISUALPROLOG_VARIABLE 9 +#define wxSTC_VISUALPROLOG_ANONYMOUS 10 +#define wxSTC_VISUALPROLOG_NUMBER 11 +#define wxSTC_VISUALPROLOG_OPERATOR 12 +#define wxSTC_VISUALPROLOG_CHARACTER 13 +#define wxSTC_VISUALPROLOG_CHARACTER_TOO_MANY 14 +#define wxSTC_VISUALPROLOG_CHARACTER_ESCAPE_ERROR 15 +#define wxSTC_VISUALPROLOG_STRING 16 +#define wxSTC_VISUALPROLOG_STRING_ESCAPE 17 +#define wxSTC_VISUALPROLOG_STRING_ESCAPE_ERROR 18 +#define wxSTC_VISUALPROLOG_STRING_EOL_OPEN 19 +#define wxSTC_VISUALPROLOG_STRING_VERBATIM 20 +#define wxSTC_VISUALPROLOG_STRING_VERBATIM_SPECIAL 21 +#define wxSTC_VISUALPROLOG_STRING_VERBATIM_EOL 22 + //}}} //---------------------------------------------------------------------- @@ -1965,6 +2461,21 @@ 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 +// Centre current line in window. +#define wxSTC_CMD_VERTICALCENTRECARET 2619 + +// Move the selected lines up one line, shifting the line above after the selection +#define wxSTC_CMD_MOVESELECTEDLINESUP 2620 + +// Move the selected lines down one line, shifting the line below before the selection +#define wxSTC_CMD_MOVESELECTEDLINESDOWN 2621 + +// Scroll to start of document. +#define wxSTC_CMD_SCROLLTOSTART 2628 + +// Scroll to end of document. +#define wxSTC_CMD_SCROLLTOEND 2629 + //}}} //---------------------------------------------------------------------- @@ -1973,14 +2484,19 @@ class WordList; struct SCNotification; #ifndef SWIG -extern WXDLLIMPEXP_STC const wxChar* wxSTCNameStr; +extern WXDLLIMPEXP_DATA_STC(const char) wxSTCNameStr[]; class WXDLLIMPEXP_FWD_STC wxStyledTextCtrl; class WXDLLIMPEXP_FWD_STC wxStyledTextEvent; #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: @@ -2026,10 +2542,13 @@ public: // Delete all text in the document. void ClearAll(); + // Delete a range of text in the document. + void DeleteRange(int pos, int deleteLength); + // Set all style bytes to 0, remove all folding information. void ClearDocumentStyle(); - // Returns the number of characters in the document. + // Returns the number of bytes in the document. int GetLength() const; // Returns the character byte at the position. @@ -2062,7 +2581,7 @@ public: 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); @@ -2081,7 +2600,7 @@ public: 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. @@ -2153,6 +2672,12 @@ public: // Set the background colour used for a particular marker number. void MarkerSetBackground(int markerNumber, const wxColour& back); + // Set the background colour used for a particular marker number when its folding block is selected. + void MarkerSetBackgroundSelected(int markerNumber, const wxColour& back); + + // Enable/disable highlight for current folding bloc (smallest one that contains the caret) + void MarkerEnableHighlight(bool enabled); + // Add a marker to a line, returning an ID which can be used to find or delete the marker. int MarkerAdd(int line, int markerNumber); @@ -2165,7 +2690,8 @@ public: // Get a bit mask of all the markers set on a line. int MarkerGet(int line); - // Find the next line after lineStart that includes a marker in mask. + // Find the next line at or after lineStart that includes a marker in mask. + // Return -1 when no more lines. int MarkerNext(int lineStart, int markerMask); // Find the previous line before lineStart that includes a marker in mask. @@ -2204,6 +2730,12 @@ public: // Retrieve the mouse click sensitivity of a margin. bool GetMarginSensitive(int margin) const; + // Set the cursor shown when the mouse is inside a margin. + void SetMarginCursor(int margin, int cursor); + + // Retrieve the cursor shown in a margin. + int GetMarginCursor(int margin) const; + // Clear all the styles and make equivalent to the global default style. void StyleClearAll(); @@ -2277,13 +2809,25 @@ public: // Set a style to be mixed case, or to force upper or lower case. void StyleSetCase(int style, int caseForce); + // Set the size of characters of a style. Size is in points multiplied by 100. + void StyleSetSizeFractional(int style, int caseForce); + + // Get the size of characters of a style in points multiplied by 100 + int StyleGetSizeFractional(int style) const; + + // Set the weight of characters of a style. + void StyleSetWeight(int style, int weight); + + // Get the weight of characters of a style. + int StyleGetWeight(int style) const; + // Set a style to be a hotspot or not. void StyleSetHotSpot(int style, bool hotspot); - // Set 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); - // 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. @@ -2323,9 +2867,12 @@ public: 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); + // Get the set of characters making up words for when moving or selecting by word. + wxString GetWordChars() const; + // Start a sequence of actions that is undone and redone as a unit. // May be nested. void BeginUndoAction(); @@ -2357,6 +2904,12 @@ public: // 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. @@ -2512,6 +3065,9 @@ public: // Retrieve the column number of a position, taking tab width into account. int GetColumn(int pos) const; + // Count characters between two positions. + int CountCharacters(int startPos, int endPos); + // Show or hide the horizontal scroll bar. void SetUseHorizontalScrollBar(bool show); @@ -2558,6 +3114,9 @@ public: // Returns the position at the end of the selection. int GetSelectionEnd() const; + // Set caret to a position, while removing any existing selection. + void SetEmptySelection(int pos); + // Sets the print magnification added to the point size of each style for printing. void SetPrintMagnification(int magnification); @@ -2586,7 +3145,7 @@ public: int GetFirstVisibleLine() const; // 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. int GetLineCount() const; @@ -2606,9 +3165,6 @@ public: // Is the document different from when it was last saved? bool GetModify() const; - // Select a range of text. - void SetSelection(int start, int end); - // Retrieve the selected text. wxString GetSelectedText(); @@ -2619,10 +3175,10 @@ public: 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. - int PositionFromLine(int line); + int PositionFromLine(int line) const; // Scroll horizontally and vertically. void LineScroll(int columns, int lines); @@ -2637,10 +3193,10 @@ public: void SetReadOnly(bool readOnly); // Will a paste succeed? - bool CanPaste(); + bool CanPaste() const; // Are there any undoable actions in the undo history? - bool CanUndo(); + bool CanUndo() const; // Delete the undo history. void EmptyUndoBuffer(); @@ -2664,7 +3220,7 @@ public: 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. int GetTextLength() const; @@ -2746,6 +3302,9 @@ public: // Enable use of STYLE_CALLTIP and set call tip tab size in pixels. void CallTipUseStyle(int tabSize); + // Set position of calltip, above or below text. + void CallTipSetPosition(bool above); + // Find the display line of a document line taking hidden lines into account. int VisibleFromDocLine(int line); @@ -2778,6 +3337,9 @@ public: // Is a line visible? bool GetLineVisible(int line) const; + // Are all lines visible? + bool GetAllLinesVisible() const; + // Show the children of a header line. void SetFoldExpanded(int line, bool expanded); @@ -2845,6 +3407,12 @@ public: // Retrive the start indent for wrapped lines. 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); @@ -2896,6 +3464,18 @@ public: // 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); + + // Change the effect of pasting when there are multiple selections. + void SetMultiPaste(int multiPaste); + + // Retrieve the effect of pasting when there are multiple selections.. + int GetMultiPaste() const; + + // Retrieve the value of a tag from a regular expression search. + wxString GetTag(int tagNumber) const; + // Make the target range start and end be the same as the selection range start and end. void TargetFromSelection(); @@ -3086,15 +3666,21 @@ public: // 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); + // Use specified indicator to highlight matching braces instead of changing their style. + void BraceHighlightIndicator(bool useBraceHighlightIndicator, int indicator); + // Highlight the character at a position indicating there is no matching brace. void BraceBadLight(int pos); + // Use specified indicator to highlight non matching brace instead of changing its style. + void BraceBadLightIndicator(bool useBraceBadLightIndicator, int indicator); + // Find the position of a matching brace or INVALID_POSITION if no match. int BraceMatch(int pos); @@ -3229,14 +3815,14 @@ public: // Delete forwards from the current position to the end of the line. void DelLineRight(); - // Get and Set the xOffset (ie, horizonal scroll position). + // Get and Set the xOffset (ie, horizontal scroll position). void SetXOffset(int newOffset); int GetXOffset() const; // Set the last x chosen value to be the caret x position. void ChooseCaretX(); - // Set the way the caret is kept visible when going sideway. + // Set the way the caret is kept visible when going sideways. // The exclusion zone is given in pixels. void SetXCaretPolicy(int caretPolicy, int caretSlop); @@ -3294,7 +3880,7 @@ public: // 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); @@ -3364,11 +3950,27 @@ public: // Should be called after SetWordChars. void SetWhitespaceChars(const wxString& characters); + // Get the set of characters making up whitespace for when moving or selecting by word. + wxString GetWhitespaceChars() const; + + // Set the set of characters making up punctuation characters + // Should be called after SetWordChars. + void SetPunctuationChars(const wxString& characters); + + // Get the set of characters making up punctuation characters + wxString GetPunctuationChars() const; + // Reset the set of characters for whitespace and word characters to the defaults. void SetCharsDefault(); // Get currently selected item position in the auto-completion list - int AutoCompGetCurrent(); + int AutoCompGetCurrent() const; + + // Set auto-completion case insensitive behaviour to either prefer case-sensitive matches or have no preference. + void AutoCompSetCaseInsensitiveBehaviour(int behaviour); + + // Get auto-completion case insensitive behaviour. + int AutoCompGetCaseInsensitiveBehaviour() const; // Enlarge the document to a particular size of text bytes. void Allocate(int bytes); @@ -3378,10 +3980,10 @@ public: int FindColumn(int line, int column); // Can the caret preferred x position only be changed by explicit movement commands? - bool GetCaretSticky() const; + int GetCaretSticky() const; // Stop the caret preferred x position changing when the user types. - void SetCaretSticky(bool useCaretStickyBehaviour); + void SetCaretSticky(int useCaretStickyBehaviour); // Switch between sticky and non-sticky: meant to be bound to a key. void ToggleCaretSticky(); @@ -3416,7 +4018,7 @@ public: // Set the value used for IndicatorFillRange void SetIndicatorValue(int value); - // Get the current indicator vaue + // Get the current indicator value int GetIndicatorValue() const; // Turn a indicator on over a range. @@ -3443,6 +4045,290 @@ public: // 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() const; + + // Return a read-only pointer to a range of characters in the document. + // May move the gap so that the range is contiguous, but will only move up + // to rangeLength bytes. + const char* GetRangePointer(int position, int rangeLength) const; + + // Return a position which, to avoid performance costs, should not be within + // the range of a call to GetRangePointer. + int GetGapPosition() const; + + // Always interpret keyboard input as Unicode + void SetKeysUnicode(bool keysUnicode); + + // 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 the alpha outline colour of the given indicator. + void IndicatorSetOutlineAlpha(int indicator, int alpha); + + // Get the alpha outline colour of the given indicator. + int IndicatorGetOutlineAlpha(int indicator) const; + + // Set extra ascent for each line + void SetExtraAscent(int extraAscent); + + // 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 margin options. + void SetMarginOptions(int marginOptions); + + // Get the margin options. + int GetMarginOptions() const; + + // Set the annotation text for a line + void AnnotationSetText(int line, const wxString& text); + + // 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(); + + // Indicate that the internal state of a lexer has changed over a range and therefore + // there may be a need to redraw. + int ChangeLexerState(int start, int end); + + // Find the next line at or after lineStart that is a contracted fold header line. + // Return -1 when no more lines. + int ContractedFoldNext(int lineStart); + + // Centre current line in window. + void VerticalCentreCaret(); + + // Move the selected lines up one line, shifting the line above after the selection + void MoveSelectedLinesUp(); + + // Move the selected lines down one line, shifting the line below before the selection + void MoveSelectedLinesDown(); + + // Set the identifier reported as idFrom in notification messages. + void SetIdentifier(int identifier); + + // Get the identifier. + int GetIdentifier() const; + + // Set the width for future RGBA image data. + void RGBAImageSetWidth(int width); + + // Set the height for future RGBA image data. + void RGBAImageSetHeight(int height); + + // Define a marker from RGBA data. + // It has the width and height from RGBAImageSetWidth/Height + void MarkerDefineRGBAImage(int markerNumber, const unsigned char* pixels); + + // Register an RGBA image for use in autocompletion lists. + // It has the width and height from RGBAImageSetWidth/Height + void RegisterRGBAImage(int type, const unsigned char* pixels); + + // Scroll to start of document. + void ScrollToStart(); + + // Scroll to end of document. + void ScrollToEnd(); + + // Set the technology used. + void SetTechnology(int technology); + + // Get the tech. + int GetTechnology() const; + + // Create an ILoader*. + void* CreateLoader(int bytes) const; + // Start notifying the container of all key presses and commands. void StartRecord(); @@ -3481,6 +4367,21 @@ public: // Retrieve the number of bits the current lexer needs for styling. int GetStyleBitsNeeded() const; + // For private communication between an application and a known lexer. + void* PrivateLexerCall(int operation, void* pointer); + + // Retrieve a '\n' separated list of properties understood by the current lexer. + wxString PropertyNames() const; + + // Retrieve the type of a property. + int PropertyType(const wxString& name); + + // Describe a property. + wxString DescribeProperty(const wxString& name) const; + + // Retrieve a '\n' separated list of descriptions of the keyword sets understood by the current lexer. + wxString DescribeKeyWordSets() const; + //}}} //---------------------------------------------------------------------- @@ -3538,13 +4439,6 @@ public: 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); @@ -3562,7 +4456,7 @@ public: // 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 - long SendMsg(int msg, long wp=0, long lp=0) const; + 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. @@ -3576,11 +4470,14 @@ public: 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); +#endif // !wxUSE_TEXTCTRL #ifdef STC_USE_DND // Allow for simulating a DnD DragOver @@ -3600,14 +4497,14 @@ public: - // The following methods are nearly equivallent to their similarly named + // The following methods are nearly equivalent to their similarly named // cousins above. The difference is that these methods bypass wxString // and always use a char* even if used in a unicode build of wxWidgets. // In that case the character data will be utf-8 encoded since that is // what is used internally by Scintilla in unicode builds. // Add text to the document at current position. - void AddTextRaw(const char* text); + void AddTextRaw(const char* text, int length=-1); // Insert string at a position. void InsertTextRaw(int pos, const char* text); @@ -3636,16 +4533,178 @@ public: wxCharBuffer GetTextRaw(); // Append a string to the end of the document without changing the selection. - void AppendTextRaw(const char* text); + void AppendTextRaw(const char* text, int length=-1); #ifdef SWIG %pythoncode "_stc_utf8_methods.py" #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 + { + long l = LineFromPosition(pos); + if ( l == -1 ) + return false; + + if ( x ) + *x = pos - PositionFromLine(l); + + if ( y ) + *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: + 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); @@ -3689,7 +4748,7 @@ protected: friend class ScintillaWX; friend class Platform; -#endif +#endif // !SWIG }; //---------------------------------------------------------------------- @@ -3719,10 +4778,23 @@ public: 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; } + void SetToken(int val) { m_token = val; } + void SetAnnotationLinesAdded(int val) { m_annotationLinesAdded = val; } + void SetUpdated(int val) { m_updated = val; } #ifdef STC_USE_DND + void SetDragText(const wxString& val) { m_dragText = val; } + void SetDragFlags(int flags) { m_dragFlags = flags; } 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; } @@ -3742,10 +4814,16 @@ public: 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; } + int GetToken() const { return m_token; } + int GetAnnotationsLinesAdded() const { return m_annotationLinesAdded; } + int GetUpdated() const { return m_updated; } + #ifdef STC_USE_DND + wxString GetDragText() { return m_dragText; } + int GetDragFlags() { return m_dragFlags; } wxDragResult GetDragResult() { return m_dragResult; } + + bool GetDragAllowMove() { return (GetDragFlags() & wxDrag_AllowMove) != 0; } #endif bool GetShift() const; @@ -3780,11 +4858,15 @@ private: int m_x; int m_y; - wxString m_dragText; // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP - bool m_dragAllowMove; // wxEVT_STC_START_DRAG + int m_token; // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER + int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION + int m_updated; // wxEVT_STC_UPDATEUI + #if wxUSE_DRAG_AND_DROP - 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 }; @@ -3792,34 +4874,37 @@ private: #ifndef SWIG -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_CHANGE; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_STYLENEEDED; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_CHARADDED; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_SAVEPOINTREACHED; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_SAVEPOINTLEFT; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_ROMODIFYATTEMPT; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_KEY; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_DOUBLECLICK; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_UPDATEUI; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_MODIFIED; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_MACRORECORD; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_MARGINCLICK; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_NEEDSHOWN; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_PAINTED; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_USERLISTSELECTION; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_URIDROPPED; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_DWELLSTART; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_DWELLEND; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_START_DRAG; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_DRAG_OVER; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_DO_DROP; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_ZOOM; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_HOTSPOT_CLICK; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_HOTSPOT_DCLICK; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_CALLTIP_CLICK; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_AUTOCOMP_SELECTION; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_INDICATOR_CLICK; -extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_INDICATOR_RELEASE; +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 ); +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_RELEASE_CLICK, wxStyledTextEvent ); #else enum { wxEVT_STC_CHANGE, @@ -3849,7 +4934,10 @@ extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_INDICATOR_RELEASE; wxEVT_STC_CALLTIP_CLICK, wxEVT_STC_AUTOCOMP_SELECTION, wxEVT_STC_INDICATOR_CLICK, - wxEVT_STC_INDICATOR_RELEASE + wxEVT_STC_INDICATOR_RELEASE, + wxEVT_STC_AUTOCOMP_CANCELLED, + wxEVT_STC_AUTOCOMP_CHAR_DELETED, + wxEVT_STC_HOTSPOT_RELEASE_CLICK }; #endif @@ -3858,34 +4946,40 @@ extern WXDLLIMPEXP_STC const wxEventType wxEVT_STC_INDICATOR_RELEASE; #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 EVT_STC_INDICATOR_CLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_INDICATOR_CLICK id, wxID_ANY, (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxStyledTextEventFunction, & fn ), (wxObject *) NULL ), -#define EVT_STC_INDICATOR_RELEASE(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_INDICATOR_RELEASE 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 ), +#define EVT_STC_HOTSPOT_RELEASE_CLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_RELEASE_CLICK, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ), #endif