diff --git a/Makefile.in b/Makefile.in
index aca8240492..4dd41482c5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -255,6 +255,7 @@ WXSCINTILLA_OBJECTS = \
wxscintilla_LexDMAP.o \
wxscintilla_LexDMIS.o \
wxscintilla_LexECL.o \
+ wxscintilla_LexEDIFACT.o \
wxscintilla_LexEiffel.o \
wxscintilla_LexErlang.o \
wxscintilla_LexErrorList.o \
@@ -15287,6 +15288,9 @@ wxscintilla_LexDMIS.o: $(srcdir)/src/stc/scintilla/lexers/LexDMIS.cxx
wxscintilla_LexECL.o: $(srcdir)/src/stc/scintilla/lexers/LexECL.cxx
$(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexECL.cxx
+wxscintilla_LexEDIFACT.o: $(srcdir)/src/stc/scintilla/lexers/LexEDIFACT.cxx
+ $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexEDIFACT.cxx
+
wxscintilla_LexEiffel.o: $(srcdir)/src/stc/scintilla/lexers/LexEiffel.cxx
$(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/lexers/LexEiffel.cxx
diff --git a/build/bakefiles/scintilla.bkl b/build/bakefiles/scintilla.bkl
index 7cc28d5904..76f7d269cd 100644
--- a/build/bakefiles/scintilla.bkl
+++ b/build/bakefiles/scintilla.bkl
@@ -88,6 +88,7 @@
src/stc/scintilla/lexers/LexDMAP.cxx
src/stc/scintilla/lexers/LexDMIS.cxx
src/stc/scintilla/lexers/LexECL.cxx
+ src/stc/scintilla/lexers/LexEDIFACT.cxx
src/stc/scintilla/lexers/LexEiffel.cxx
src/stc/scintilla/lexers/LexErlang.cxx
src/stc/scintilla/lexers/LexErrorList.cxx
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index fe3d0a2a44..450b5da195 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -235,6 +235,7 @@ WXSCINTILLA_OBJECTS = \
$(OBJS)\wxscintilla_LexDMAP.obj \
$(OBJS)\wxscintilla_LexDMIS.obj \
$(OBJS)\wxscintilla_LexECL.obj \
+ $(OBJS)\wxscintilla_LexEDIFACT.obj \
$(OBJS)\wxscintilla_LexEiffel.obj \
$(OBJS)\wxscintilla_LexErlang.obj \
$(OBJS)\wxscintilla_LexErrorList.obj \
@@ -6074,6 +6075,9 @@ $(OBJS)\wxscintilla_LexDMIS.obj: ..\..\src\stc\scintilla\lexers\LexDMIS.cxx
$(OBJS)\wxscintilla_LexECL.obj: ..\..\src\stc\scintilla\lexers\LexECL.cxx
$(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexECL.cxx
+$(OBJS)\wxscintilla_LexEDIFACT.obj: ..\..\src\stc\scintilla\lexers\LexEDIFACT.cxx
+ $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexEDIFACT.cxx
+
$(OBJS)\wxscintilla_LexEiffel.obj: ..\..\src\stc\scintilla\lexers\LexEiffel.cxx
$(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexEiffel.cxx
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 69f6d3a69b..8ab514c0bc 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -223,6 +223,7 @@ WXSCINTILLA_OBJECTS = \
$(OBJS)\wxscintilla_LexDMAP.o \
$(OBJS)\wxscintilla_LexDMIS.o \
$(OBJS)\wxscintilla_LexECL.o \
+ $(OBJS)\wxscintilla_LexEDIFACT.o \
$(OBJS)\wxscintilla_LexEiffel.o \
$(OBJS)\wxscintilla_LexErlang.o \
$(OBJS)\wxscintilla_LexErrorList.o \
@@ -6250,6 +6251,9 @@ $(OBJS)\wxscintilla_LexDMIS.o: ../../src/stc/scintilla/lexers/LexDMIS.cxx
$(OBJS)\wxscintilla_LexECL.o: ../../src/stc/scintilla/lexers/LexECL.cxx
$(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $<
+$(OBJS)\wxscintilla_LexEDIFACT.o: ../../src/stc/scintilla/lexers/LexEDIFACT.cxx
+ $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $<
+
$(OBJS)\wxscintilla_LexEiffel.o: ../../src/stc/scintilla/lexers/LexEiffel.cxx
$(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $<
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 6e47a6e313..9629977d8b 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -246,6 +246,7 @@ WXSCINTILLA_OBJECTS = \
$(OBJS)\wxscintilla_LexDMAP.obj \
$(OBJS)\wxscintilla_LexDMIS.obj \
$(OBJS)\wxscintilla_LexECL.obj \
+ $(OBJS)\wxscintilla_LexEDIFACT.obj \
$(OBJS)\wxscintilla_LexEiffel.obj \
$(OBJS)\wxscintilla_LexErlang.obj \
$(OBJS)\wxscintilla_LexErrorList.obj \
@@ -6767,6 +6768,9 @@ $(OBJS)\wxscintilla_LexDMIS.obj: ..\..\src\stc\scintilla\lexers\LexDMIS.cxx
$(OBJS)\wxscintilla_LexECL.obj: ..\..\src\stc\scintilla\lexers\LexECL.cxx
$(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexECL.cxx
+$(OBJS)\wxscintilla_LexEDIFACT.obj: ..\..\src\stc\scintilla\lexers\LexEDIFACT.cxx
+ $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexEDIFACT.cxx
+
$(OBJS)\wxscintilla_LexEiffel.obj: ..\..\src\stc\scintilla\lexers\LexEiffel.cxx
$(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexEiffel.cxx
diff --git a/build/msw/wx_vc7_wxscintilla.vcproj b/build/msw/wx_vc7_wxscintilla.vcproj
index 709608e902..529990a502 100644
--- a/build/msw/wx_vc7_wxscintilla.vcproj
+++ b/build/msw/wx_vc7_wxscintilla.vcproj
@@ -397,6 +397,9 @@
+
+
diff --git a/build/msw/wx_vc8_wxscintilla.vcproj b/build/msw/wx_vc8_wxscintilla.vcproj
index ec8bb8447d..eed2e3d69a 100644
--- a/build/msw/wx_vc8_wxscintilla.vcproj
+++ b/build/msw/wx_vc8_wxscintilla.vcproj
@@ -878,6 +878,10 @@
RelativePath="..\..\src\stc\scintilla\lexers\LexECL.cxx"
>
+
+
diff --git a/build/msw/wx_vc9_wxscintilla.vcproj b/build/msw/wx_vc9_wxscintilla.vcproj
index 94d099ee11..401075582e 100644
--- a/build/msw/wx_vc9_wxscintilla.vcproj
+++ b/build/msw/wx_vc9_wxscintilla.vcproj
@@ -874,6 +874,10 @@
RelativePath="..\..\src\stc\scintilla\lexers\LexECL.cxx"
>
+
+
diff --git a/build/msw/wx_wxscintilla.vcxproj b/build/msw/wx_wxscintilla.vcxproj
index 3b4568928b..583ce4c4bb 100644
--- a/build/msw/wx_wxscintilla.vcxproj
+++ b/build/msw/wx_wxscintilla.vcxproj
@@ -452,6 +452,7 @@
+
diff --git a/build/msw/wx_wxscintilla.vcxproj.filters b/build/msw/wx_wxscintilla.vcxproj.filters
index 37f440cad7..4cdff93676 100644
--- a/build/msw/wx_wxscintilla.vcxproj.filters
+++ b/build/msw/wx_wxscintilla.vcxproj.filters
@@ -161,6 +161,9 @@
Source Files
+
+ Source Files
+
Source Files
diff --git a/docs/changes.txt b/docs/changes.txt
index 92fc0eee23..98640eef7d 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -89,7 +89,7 @@ All (GUI):
- Improve wxSVGFileDC to support more of wxDC API (Maarten Bent).
- Add support for wxAuiManager and wxAuiPaneInfo to XRC (Andrea Zanellato).
- Add support for wxSL_MIN_MAX_LABELS and wxSL_VALUE_LABEL to XRC (ousnius).
-- Update Scintilla to v3.6.6 (Paul Kulchenko).
+- Update Scintilla to v3.7.2 (NewPagodi, Paul Kulchenko).
- Update bundled libpng to 1.6.28 (Catalin Raceanu).
- Fix vertical scrollbar visibility in wxStyledTextCtrl (yenwu, NewPagodi).
- Fix bug with not being able to select AUI tab after dragging.
diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 49c16d0d38..e9154eb10d 100644
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -69,6 +69,8 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
#define wxSTC_WS_VISIBLEALWAYS 1
#define wxSTC_WS_VISIBLEAFTERINDENT 2
#define wxSTC_WS_VISIBLEONLYININDENT 3
+#define wxSTC_SCTD_LONGARROW 0
+#define wxSTC_SCTD_STRIKEOUT 1
#define wxSTC_EOL_CRLF 0
#define wxSTC_EOL_CR 1
#define wxSTC_EOL_LF 2
@@ -133,6 +135,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
#define wxSTC_MARGIN_FORE 3
#define wxSTC_MARGIN_TEXT 4
#define wxSTC_MARGIN_RTEXT 5
+#define wxSTC_MARGIN_COLOUR 6
/// 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.
@@ -143,6 +146,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
#define wxSTC_STYLE_CONTROLCHAR 36
#define wxSTC_STYLE_INDENTGUIDE 37
#define wxSTC_STYLE_CALLTIP 38
+#define wxSTC_STYLE_FOLDDISPLAYTEXT 39
#define wxSTC_STYLE_LASTPREDEFINED 39
#define wxSTC_STYLE_MAX 255
@@ -198,6 +202,8 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
#define wxSTC_INDIC_COMPOSITIONTHIN 15
#define wxSTC_INDIC_FULLBOX 16
#define wxSTC_INDIC_TEXTFORE 17
+#define wxSTC_INDIC_POINT 18
+#define wxSTC_INDIC_POINTCHARACTER 19
#define wxSTC_INDIC_IME 32
#define wxSTC_INDIC_IME_MAX 35
#define wxSTC_INDIC_MAX 35
@@ -238,6 +244,9 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
#define wxSTC_FOLDLEVELWHITEFLAG 0x1000
#define wxSTC_FOLDLEVELHEADERFLAG 0x2000
#define wxSTC_FOLDLEVELNUMBERMASK 0x0FFF
+#define wxSTC_FOLDDISPLAYTEXT_HIDDEN 0
+#define wxSTC_FOLDDISPLAYTEXT_STANDARD 1
+#define wxSTC_FOLDDISPLAYTEXT_BOXED 2
#define wxSTC_FOLDACTION_CONTRACT 0
#define wxSTC_FOLDACTION_EXPAND 1
#define wxSTC_FOLDACTION_TOGGLE 2
@@ -288,6 +297,10 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
#define wxSTC_EDGE_NONE 0
#define wxSTC_EDGE_LINE 1
#define wxSTC_EDGE_BACKGROUND 2
+#define wxSTC_EDGE_MULTILINE 3
+#define wxSTC_POPUP_NEVER 0
+#define wxSTC_POPUP_ALL 1
+#define wxSTC_POPUP_TEXT 2
#define wxSTC_STATUS_OK 0
#define wxSTC_STATUS_FAILURE 1
#define wxSTC_STATUS_BADALLOC 2
@@ -357,6 +370,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
#define wxSTC_SCVS_NONE 0
#define wxSTC_SCVS_RECTANGULARSELECTION 1
#define wxSTC_SCVS_USERACCESSIBLE 2
+#define wxSTC_SCVS_NOWRAPLINESTART 4
#define wxSTC_TECHNOLOGY_DEFAULT 0
#define wxSTC_TECHNOLOGY_DIRECTWRITE 1
#define wxSTC_TECHNOLOGY_DIRECTWRITERETAIN 2
@@ -561,6 +575,7 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
#define wxSTC_LEX_IHEX 118
#define wxSTC_LEX_TEHEX 119
#define wxSTC_LEX_JSON 120
+#define wxSTC_LEX_EDIFACT 121
/// When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
/// value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -1094,6 +1109,20 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
#define wxSTC_BAAN_IDENTIFIER 8
#define wxSTC_BAAN_STRINGEOL 9
#define wxSTC_BAAN_WORD2 10
+#define wxSTC_BAAN_WORD3 11
+#define wxSTC_BAAN_WORD4 12
+#define wxSTC_BAAN_WORD5 13
+#define wxSTC_BAAN_WORD6 14
+#define wxSTC_BAAN_WORD7 15
+#define wxSTC_BAAN_WORD8 16
+#define wxSTC_BAAN_WORD9 17
+#define wxSTC_BAAN_TABLEDEF 18
+#define wxSTC_BAAN_TABLESQL 19
+#define wxSTC_BAAN_FUNCTION 20
+#define wxSTC_BAAN_DOMDEF 21
+#define wxSTC_BAAN_FUNCDEF 22
+#define wxSTC_BAAN_OBJECTDEF 23
+#define wxSTC_BAAN_DEFINEDEF 24
/// Lexical states for SCLEX_LISP
#define wxSTC_LISP_DEFAULT 0
@@ -1865,38 +1894,19 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
#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
+#define wxSTC_ABL_DEFAULT 0
+#define wxSTC_ABL_NUMBER 1
+#define wxSTC_ABL_WORD 2
+#define wxSTC_ABL_STRING 3
+#define wxSTC_ABL_CHARACTER 4
+#define wxSTC_ABL_PREPROCESSOR 5
+#define wxSTC_ABL_OPERATOR 6
+#define wxSTC_ABL_IDENTIFIER 7
+#define wxSTC_ABL_BLOCK 8
+#define wxSTC_ABL_END 9
+#define wxSTC_ABL_COMMENT 10
+#define wxSTC_ABL_TASKMARKER 11
+#define wxSTC_ABL_LINECOMMENT 12
/// Lexical states for SCLEX_ABAQUS
#define wxSTC_ABAQUS_DEFAULT 0
@@ -2450,6 +2460,15 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
#define wxSTC_JSON_KEYWORD 11
#define wxSTC_JSON_LDKEYWORD 12
#define wxSTC_JSON_ERROR 13
+#define wxSTC_EDI_DEFAULT 0
+#define wxSTC_EDI_SEGMENTSTART 1
+#define wxSTC_EDI_SEGMENTEND 2
+#define wxSTC_EDI_SEP_ELEMENT 3
+#define wxSTC_EDI_SEP_COMPOSITE 4
+#define wxSTC_EDI_SEP_RELEASE 5
+#define wxSTC_EDI_UNA 6
+#define wxSTC_EDI_UNH 7
+#define wxSTC_EDI_BADSEGMENT 8
//}}}
//----------------------------------------------------------------------
@@ -2637,16 +2656,28 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
/// caret position.
#define wxSTC_CMD_LINEENDDISPLAYEXTEND 2348
-/// These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-/// except they behave differently when word-wrap is enabled:
-/// They go first to the start / end of the display line, like (Home|LineEnd)Display
-/// The difference is that, the cursor is already at the point, it goes on to the start
-/// or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
+/// Like Home but when word-wrap is enabled goes first to start of display line
+/// HomeDisplay, then to start of document line Home.
#define wxSTC_CMD_HOMEWRAP 2349
+
+/// Like HomeExtend but when word-wrap is enabled extends first to start of display line
+/// HomeDisplayExtend, then to start of document line HomeExtend.
#define wxSTC_CMD_HOMEWRAPEXTEND 2450
+
+/// Like LineEnd but when word-wrap is enabled goes first to end of display line
+/// LineEndDisplay, then to start of document line LineEnd.
#define wxSTC_CMD_LINEENDWRAP 2451
+
+/// Like LineEndExtend but when word-wrap is enabled extends first to end of display line
+/// LineEndDisplayExtend, then to start of document line LineEndExtend.
#define wxSTC_CMD_LINEENDWRAPEXTEND 2452
+
+/// Like VCHome but when word-wrap is enabled goes first to start of display line
+/// VCHomeDisplay, then behaves like VCHome.
#define wxSTC_CMD_VCHOMEWRAP 2453
+
+/// Like VCHomeExtend but when word-wrap is enabled extends first to start of display line
+/// VCHomeDisplayExtend, then behaves like VCHomeExtend.
#define wxSTC_CMD_VCHOMEWRAPEXTEND 2454
/// Copy the line containing the caret.
@@ -2672,10 +2703,16 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
/// Delete forwards from the current position to the end of the line.
#define wxSTC_CMD_DELLINERIGHT 2396
-/// Move caret between paragraphs (delimited by empty lines).
+/// Move caret down one paragraph (delimited by empty lines).
#define wxSTC_CMD_PARADOWN 2413
+
+/// Extend selection down one paragraph (delimited by empty lines).
#define wxSTC_CMD_PARADOWNEXTEND 2414
+
+/// Move caret up one paragraph (delimited by empty lines).
#define wxSTC_CMD_PARAUP 2415
+
+/// Extend selection up one paragraph (delimited by empty lines).
#define wxSTC_CMD_PARAUPEXTEND 2416
/// Move caret down one line, extending rectangular selection to new caret position.
@@ -2823,7 +2860,7 @@ public:
void ClearAll();
// Delete a range of text in the document.
- void DeleteRange(int pos, int deleteLength);
+ void DeleteRange(int start, int lengthDelete);
// Set all style bytes to 0, remove all folding information.
void ClearDocumentStyle();
@@ -2864,10 +2901,10 @@ public:
bool CanRedo() const wxOVERRIDE;
// Retrieve the line number at which a particular marker is located.
- int MarkerLineFromHandle(int handle);
+ int MarkerLineFromHandle(int markerHandle);
// Delete a marker.
- void MarkerDeleteHandle(int handle);
+ void MarkerDeleteHandle(int markerHandle);
// Is undo history being collected?
bool GetUndoCollection() const;
@@ -2879,6 +2916,13 @@ public:
// Make white space characters invisible, always visible or visible outside indentation.
void SetViewWhiteSpace(int viewWS);
+ // Retrieve the current tab draw mode.
+ // Returns one of SCTD_* constants.
+ int GetTabDrawMode() const;
+
+ // Set how tabs are drawn when visible.
+ void SetTabDrawMode(int tabDrawMode);
+
// Find the position from a point within the window.
int PositionFromPoint(wxPoint pt) const;
@@ -2890,11 +2934,11 @@ public:
void GotoLine(int line);
// Set caret to a position and ensure it is visible.
- void GotoPos(int pos);
+ void GotoPos(int caret);
// Set the selection anchor to a position. The anchor is the opposite
// end of the selection from the caret.
- void SetAnchor(int posAnchor);
+ void SetAnchor(int anchor);
// Retrieve the text of the line containing the caret.
// Returns the index of the caret on the line.
@@ -2917,9 +2961,9 @@ public:
// Set the current end of line mode.
void SetEOLMode(int eolMode);
- // Set the current styling position to pos and the styling mask to mask.
- // The styling mask can be used to protect some bits in each styling byte from modification.
- void StartStyling(int pos, int mask);
+ // Set the current styling position to start.
+ // The unused parameter is no longer used and should be set to 0.
+ void StartStyling(int start, int unused=0);
// Change style from current styling position for length characters to a style
// and move the current styling position to after this newly styled segment.
@@ -2997,7 +3041,7 @@ public:
void MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp);
// Add a set of markers to a line.
- void MarkerAddSet(int line, int set);
+ void MarkerAddSet(int line, int markerSet);
// Set the alpha used for a marker that is drawn in the text area, not the margin.
void MarkerSetAlpha(int markerNumber, int alpha);
@@ -3032,6 +3076,18 @@ public:
// Retrieve the cursor shown in a margin.
int GetMarginCursor(int margin) const;
+ // Set the background colour of a margin. Only visible for SC_MARGIN_COLOUR.
+ void SetMarginBackground(int margin, const wxColour& back);
+
+ // Retrieve the background colour of a margin
+ wxColour GetMarginBackground(int margin) const;
+
+ // Allocate a non-standard number of margins.
+ void SetMarginCount(int margins);
+
+ // How many margins are there?.
+ int GetMarginCount() const;
+
// Clear all the styles and make equivalent to the global default style.
void StyleClearAll();
@@ -3054,7 +3110,7 @@ public:
void StyleSetFaceName(int style, const wxString& fontName);
// Set a style to have its end of line filled or not.
- void StyleSetEOLFilled(int style, bool filled);
+ void StyleSetEOLFilled(int style, bool eolFilled);
// Reset the default style to its state at startup
void StyleResetDefault();
@@ -3103,10 +3159,10 @@ public:
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);
+ void StyleSetCase(int style, int caseVisible);
// Set the size of characters of a style. Size is in points multiplied by 100.
- void StyleSetSizeFractional(int style, int caseForce);
+ void StyleSetSizeFractional(int style, int sizeHundredthPoints);
// Get the size of characters of a style in points multiplied by 100
int StyleGetSizeFractional(int style) const;
@@ -3141,10 +3197,10 @@ public:
// Set the foreground colour of the caret.
void SetCaretForeground(const wxColour& fore);
- // When key+modifier combination km is pressed perform msg.
+ // When key+modifier combination keyDefinition is pressed perform sciCommand.
void CmdKeyAssign(int key, int modifiers, int cmd);
- // When key+modifier combination km is pressed do nothing.
+ // When key+modifier combination keyDefinition is pressed do nothing.
void CmdKeyClear(int key, int modifiers);
// Drop all key mappings.
@@ -3177,40 +3233,40 @@ public:
void EndUndoAction();
// Set an indicator to plain, squiggle or TT.
- void IndicatorSetStyle(int indic, int style);
+ void IndicatorSetStyle(int indicator, int indicatorStyle);
// Retrieve the style of an indicator.
- int IndicatorGetStyle(int indic) const;
+ int IndicatorGetStyle(int indicator) const;
// Set the foreground colour of an indicator.
- void IndicatorSetForeground(int indic, const wxColour& fore);
+ void IndicatorSetForeground(int indicator, const wxColour& fore);
// Retrieve the foreground colour of an indicator.
- wxColour IndicatorGetForeground(int indic) const;
+ wxColour IndicatorGetForeground(int indicator) const;
// Set an indicator to draw under text or over(default).
- void IndicatorSetUnder(int indic, bool under);
+ void IndicatorSetUnder(int indicator, bool under);
// Retrieve whether indicator drawn under or over text.
- bool IndicatorGetUnder(int indic) const;
+ bool IndicatorGetUnder(int indicator) const;
// Set a hover indicator to plain, squiggle or TT.
- void IndicatorSetHoverStyle(int indic, int style);
+ void IndicatorSetHoverStyle(int indicator, int indicatorStyle);
// Retrieve the hover style of an indicator.
- int IndicatorGetHoverStyle(int indic) const;
+ int IndicatorGetHoverStyle(int indicator) const;
// Set the foreground hover colour of an indicator.
- void IndicatorSetHoverForeground(int indic, const wxColour& fore);
+ void IndicatorSetHoverForeground(int indicator, const wxColour& fore);
// Retrieve the foreground hover colour of an indicator.
- wxColour IndicatorGetHoverForeground(int indic) const;
+ wxColour IndicatorGetHoverForeground(int indicator) const;
// Set the attributes of an indicator.
- void IndicatorSetFlags(int indic, int flags);
+ void IndicatorSetFlags(int indicator, int flags);
// Retrieve the attributes of an indicator.
- int IndicatorGetFlags(int indic) const;
+ int IndicatorGetFlags(int indicator) const;
// Set the foreground colour of all whitespace and whether to use this setting.
void SetWhitespaceForeground(bool useSetting, const wxColour& fore);
@@ -3258,9 +3314,9 @@ public:
void StyleSetChangeable(int style, bool changeable);
// Display a auto-completion list.
- // The lenEntered parameter indicates how many characters before
+ // The lengthEntered parameter indicates how many characters before
// the caret should be used to provide context.
- void AutoCompShow(int lenEntered, const wxString& itemList);
+ void AutoCompShow(int lengthEntered, const wxString& itemList);
// Remove the auto-completion list from the screen.
void AutoCompCancel();
@@ -3285,7 +3341,7 @@ public:
int AutoCompGetSeparator() const;
// Select the item in the auto-completion list that starts with a string.
- void AutoCompSelect(const wxString& text);
+ void AutoCompSelect(const wxString& select);
// Should the auto-completion list be cancelled if the user backspaces to a
// position before where the box was created.
@@ -3368,7 +3424,7 @@ public:
bool GetUseTabs() const;
// Change the indentation of a line to a number of columns.
- void SetLineIndentation(int line, int indentSize);
+ void SetLineIndentation(int line, int indentation);
// Retrieve the number of columns that a line is indented.
int GetLineIndentation(int line) const;
@@ -3380,10 +3436,10 @@ public:
int GetColumn(int pos) const;
// Count characters between two positions.
- int CountCharacters(int startPos, int endPos);
+ int CountCharacters(int start, int end);
// Show or hide the horizontal scroll bar.
- void SetUseHorizontalScrollBar(bool show);
+ void SetUseHorizontalScrollBar(bool visible);
// Is the horizontal scroll bar visible?
bool GetUseHorizontalScrollBar() const;
@@ -3414,22 +3470,22 @@ public:
bool GetReadOnly() const;
// Sets the position of the caret.
- void SetCurrentPos(int pos);
+ void SetCurrentPos(int caret);
// Sets the position that starts the selection - this becomes the anchor.
- void SetSelectionStart(int pos);
+ void SetSelectionStart(int anchor);
// Returns the position at the start of the selection.
int GetSelectionStart() const;
- // Sets the position that ends the selection - this becomes the currentPosition.
- void SetSelectionEnd(int pos);
+ // Sets the position that ends the selection - this becomes the caret.
+ void SetSelectionEnd(int caret);
// 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);
+ void SetEmptySelection(int caret);
// Sets the print magnification added to the point size of each style for printing.
void SetPrintMagnification(int magnification);
@@ -3486,7 +3542,7 @@ public:
wxString GetTextRange(int startPos, int endPos);
// Draw the selection in normal style or with selection highlighted.
- void HideSelection(bool normal);
+ void HideSelection(bool hide);
// Retrieve the line containing a position.
int LineFromPosition(int pos) const;
@@ -3552,7 +3608,7 @@ public:
void* GetDirectPointer() const;
// Set to overtype (true) or insert mode.
- void SetOvertype(bool overtype);
+ void SetOvertype(bool overType);
// Returns true if overtype mode is active otherwise false is returned.
bool GetOvertype() const;
@@ -3565,14 +3621,14 @@ public:
// Sets the position that starts the target which is used for updating the
// document without affecting the scroll position.
- void SetTargetStart(int pos);
+ void SetTargetStart(int start);
// Get the position that starts the target.
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);
+ void SetTargetEnd(int end);
// Get the position that ends the target.
int GetTargetEnd() const;
@@ -3608,7 +3664,7 @@ public:
int SearchInTarget(const wxString& text);
// Set the search flags used by SearchInTarget.
- void SetSearchFlags(int flags);
+ void SetSearchFlags(int searchFlags);
// Get the search flags used by SearchInTarget.
int GetSearchFlags() const;
@@ -3629,7 +3685,7 @@ public:
void CallTipSetPosAtStart(int posStart);
// Highlight a segment of the definition.
- void CallTipSetHighlight(int start, int end);
+ void CallTipSetHighlight(int highlightStart, int highlightEnd);
// Set the background colour for the call tip.
void CallTipSetBackground(const wxColour& back);
@@ -3647,13 +3703,13 @@ public:
void CallTipSetPosition(bool above);
// Find the display line of a document line taking hidden lines into account.
- int VisibleFromDocLine(int line);
+ int VisibleFromDocLine(int docLine);
// Find the document line of a display line taking hidden lines into account.
- int DocLineFromVisible(int lineDisplay);
+ int DocLineFromVisible(int displayLine);
// The number of display lines needed to wrap a document line
- int WrapCount(int line);
+ int WrapCount(int docLine);
// Set the fold level of a line.
// This encodes an integer level along with flags indicating whether the
@@ -3690,6 +3746,12 @@ public:
// Switch a header line between expanded and contracted.
void ToggleFold(int line);
+ // Switch a header line between expanded and contracted and show some text after the line.
+ void ToggleFoldShowText(int line, const wxString& text);
+
+ // Set the style of fold display text
+ void FoldDisplayTextSetStyle(int style);
+
// Expand or contract a fold header.
void FoldLine(int line, int action);
@@ -3752,7 +3814,7 @@ public:
int GetIdleStyling() const;
// Sets whether text is word wrapped.
- void SetWrapMode(int mode);
+ void SetWrapMode(int wrapMode);
// Retrieve whether text is word wrapped.
int GetWrapMode() const;
@@ -3776,13 +3838,13 @@ public:
int GetWrapStartIndent() const;
// Sets how wrapped sublines are placed. Default is fixed.
- void SetWrapIndentMode(int mode);
+ void SetWrapIndentMode(int wrapIndentMode);
// Retrieve how wrapped sublines are placed. Default is fixed.
int GetWrapIndentMode() const;
// Sets the degree of caching of layout information.
- void SetLayoutCache(int mode);
+ void SetLayoutCache(int cacheMode);
// Retrieve the degree of caching of layout information.
int GetLayoutCache() const;
@@ -3817,7 +3879,7 @@ public:
int TextHeight(int line);
// Show or hide the vertical scroll bar.
- void SetUseVerticalScrollBar(bool show);
+ void SetUseVerticalScrollBar(bool visible);
// Is the vertical scroll bar visible?
bool GetUseVerticalScrollBar() const;
@@ -3842,7 +3904,7 @@ public:
void SetPhasesDraw(int phases);
// Scroll so that a display line is at the top of the display.
- void SetFirstVisibleLine(int lineDisplay);
+ void SetFirstVisibleLine(int displayLine);
// Change the effect of pasting when there are multiple selections.
void SetMultiPaste(int multiPaste);
@@ -3861,8 +3923,10 @@ public:
// where possible.
void LinesSplit(int pixelWidth);
- // Set the colours used as a chequerboard pattern in the fold margin
+ // Set one of the colours used as a chequerboard pattern in the fold margin
void SetFoldMarginColour(bool useSetting, const wxColour& back);
+
+ // Set the other colour used as a chequerboard pattern in the fold margin
void SetFoldMarginHiColour(bool useSetting, const wxColour& fore);
// Move caret down one line.
@@ -4023,16 +4087,28 @@ public:
// caret position.
void LineEndDisplayExtend();
- // These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
- // except they behave differently when word-wrap is enabled:
- // They go first to the start / end of the display line, like (Home|LineEnd)Display
- // The difference is that, the cursor is already at the point, it goes on to the start
- // or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
+ // Like Home but when word-wrap is enabled goes first to start of display line
+ // HomeDisplay, then to start of document line Home.
void HomeWrap();
+
+ // Like HomeExtend but when word-wrap is enabled extends first to start of display line
+ // HomeDisplayExtend, then to start of document line HomeExtend.
void HomeWrapExtend();
+
+ // Like LineEnd but when word-wrap is enabled goes first to end of display line
+ // LineEndDisplay, then to start of document line LineEnd.
void LineEndWrap();
+
+ // Like LineEndExtend but when word-wrap is enabled extends first to end of display line
+ // LineEndDisplayExtend, then to start of document line LineEndExtend.
void LineEndWrapExtend();
+
+ // Like VCHome but when word-wrap is enabled goes first to start of display line
+ // VCHomeDisplay, then behaves like VCHome.
void VCHomeWrap();
+
+ // Like VCHomeExtend but when word-wrap is enabled extends first to start of display line
+ // VCHomeDisplayExtend, then behaves like VCHomeExtend.
void VCHomeWrapExtend();
// Copy the line containing the caret.
@@ -4045,19 +4121,20 @@ public:
int LineLength(int line) const;
// Highlight the characters at two positions.
- void BraceHighlight(int pos1, int pos2);
+ void BraceHighlight(int posA, int posB);
// Use specified indicator to highlight matching braces instead of changing their style.
- void BraceHighlightIndicator(bool useBraceHighlightIndicator, int indicator);
+ void BraceHighlightIndicator(bool useSetting, 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);
+ void BraceBadLightIndicator(bool useSetting, int indicator);
// Find the position of a matching brace or INVALID_POSITION if no match.
- int BraceMatch(int pos);
+ // The maxReStyle must be 0 for now. It may be defined in a future release.
+ int BraceMatch(int pos, int maxReStyle=0);
// Are the end of line characters visible?
bool GetViewEOL() const;
@@ -4072,7 +4149,7 @@ public:
void SetDocPointer(void* docPointer);
// Set which document modification events are sent to the container.
- void SetModEventMask(int mask);
+ void SetModEventMask(int eventMask);
// Retrieve the column number which text should be kept within.
int GetEdgeColumn() const;
@@ -4084,9 +4161,9 @@ public:
// Retrieve the edge highlight mode.
int GetEdgeMode() const;
- // The edge may be displayed by a line (EDGE_LINE) or by highlighting text that
+ // The edge may be displayed by a line (EDGE_LINE/EDGE_MULTILINE) or by highlighting text that
// goes beyond it (EDGE_BACKGROUND) or not displayed at all (EDGE_NONE).
- void SetEdgeMode(int mode);
+ void SetEdgeMode(int edgeMode);
// Retrieve the colour used in edge indication.
wxColour GetEdgeColour() const;
@@ -4094,30 +4171,36 @@ public:
// Change the colour used in edge indication.
void SetEdgeColour(const wxColour& edgeColour);
+ // Add a new vertical edge to the view.
+ void MultiEdgeAddLine(int column, const wxColour& edgeColour);
+
+ // Clear all vertical edges.
+ void MultiEdgeClearAll();
+
// Sets the current caret position to be the search anchor.
void SearchAnchor();
// Find some text starting at the search anchor.
// Does not ensure the selection is visible.
- int SearchNext(int flags, const wxString& text);
+ int SearchNext(int searchFlags, const wxString& text);
// Find some text starting at the search anchor and moving backwards.
// Does not ensure the selection is visible.
- int SearchPrev(int flags, const wxString& text);
+ int SearchPrev(int searchFlags, const wxString& text);
// Retrieves the number of lines completely visible.
int LinesOnScreen() const;
// Set whether a pop up menu is displayed automatically when the user presses
- // the wrong mouse button.
- void UsePopUp(bool allowPopUp);
+ // the wrong mouse button on certain areas.
+ void UsePopUp(int popUpMode);
// Is the selection rectangular? The alternative is the more common stream selection.
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);
+ void SetZoom(int zoomInPoints);
// Retrieve the zoom level.
int GetZoom() const;
@@ -4142,7 +4225,7 @@ public:
bool GetSTCFocus() const;
// Change error status - 0 = OK.
- void SetStatus(int statusCode);
+ void SetStatus(int status);
// Get error status.
int GetStatus() const;
@@ -4153,6 +4236,12 @@ public:
// Get whether mouse gets captured.
bool GetMouseDownCaptures() const;
+ // Set whether the mouse wheel can be active outside the window.
+ void SetMouseWheelCaptures(bool captures);
+
+ // Get whether mouse wheel can be active outside the window.
+ bool GetMouseWheelCaptures() const;
+
// Sets the cursor to one of the SC_CURSOR* values.
void SetSTCCursor(int cursorType);
@@ -4191,7 +4280,7 @@ public:
void DelLineRight();
// Get and Set the xOffset (ie, horizontal scroll position).
- void SetXOffset(int newOffset);
+ void SetXOffset(int xOffset);
int GetXOffset() const;
// Set the last x chosen value to be the caret x position.
@@ -4206,7 +4295,7 @@ public:
void SetYCaretPolicy(int caretPolicy, int caretSlop);
// Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE).
- void SetPrintWrapMode(int mode);
+ void SetPrintWrapMode(int wrapMode);
// Is printing line wrapped?
int GetPrintWrapMode() const;
@@ -4235,10 +4324,16 @@ public:
// Get the HotspotSingleLine property
bool GetHotspotSingleLine() const;
- // Move caret between paragraphs (delimited by empty lines).
+ // Move caret down one paragraph (delimited by empty lines).
void ParaDown();
+
+ // Extend selection down one paragraph (delimited by empty lines).
void ParaDownExtend();
+
+ // Move caret up one paragraph (delimited by empty lines).
void ParaUp();
+
+ // Extend selection up one paragraph (delimited by empty lines).
void ParaUpExtend();
// Given a valid document position, return the previous position taking code
@@ -4261,7 +4356,7 @@ public:
// 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);
+ void SetSelectionMode(int selectionMode);
// Get the mode of the current selection.
int GetSelectionMode() const;
@@ -4413,22 +4508,22 @@ public:
int GetIndicatorValue() const;
// Turn a indicator on over a range.
- void IndicatorFillRange(int position, int fillLength);
+ void IndicatorFillRange(int start, int lengthFill);
// Turn a indicator off over a range.
- void IndicatorClearRange(int position, int clearLength);
+ void IndicatorClearRange(int start, int lengthClear);
- // Are any indicators present at position?
- int IndicatorAllOnFor(int position);
+ // Are any indicators present at pos?
+ int IndicatorAllOnFor(int pos);
- // What value does a particular indicator have at at a position?
- int IndicatorValueAt(int indicator, int position);
+ // What value does a particular indicator have at a position?
+ int IndicatorValueAt(int indicator, int pos);
// Where does a particular indicator start?
- int IndicatorStart(int indicator, int position);
+ int IndicatorStart(int indicator, int pos);
// Where does a particular indicator end?
- int IndicatorEnd(int indicator, int position);
+ int IndicatorEnd(int indicator, int pos);
// Set number of entries in position cache
void SetPositionCacheSize(int size);
@@ -4445,7 +4540,7 @@ public:
// 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.
+ // to lengthRange bytes.
const char* GetRangePointer(int position, int rangeLength) const;
// Return a position which, to avoid performance costs, should not be within
@@ -4589,7 +4684,7 @@ public:
bool GetAdditionalCaretsBlink() const;
// Set whether additional carets are visible
- void SetAdditionalCaretsVisible(bool additionalCaretsBlink);
+ void SetAdditionalCaretsVisible(bool additionalCaretsVisible);
// Whether additional carets are visible
bool GetAdditionalCaretsVisible() const;
@@ -4614,35 +4709,71 @@ public:
// Which selection is the main selection
int GetMainSelection() const;
- void SetSelectionNCaret(int selection, int pos);
+
+ // Set the caret position of the nth selection.
+ void SetSelectionNCaret(int selection, int caret);
+
+ // Return the caret position of the nth selection.
int GetSelectionNCaret(int selection) const;
- void SetSelectionNAnchor(int selection, int posAnchor);
+
+ // Set the anchor position of the nth selection.
+ void SetSelectionNAnchor(int selection, int anchor);
+
+ // Return the anchor position of the nth selection.
int GetSelectionNAnchor(int selection) const;
+
+ // Set the virtual space of the caret of the nth selection.
void SetSelectionNCaretVirtualSpace(int selection, int space);
+
+ // Return the virtual space of the caret of the nth selection.
int GetSelectionNCaretVirtualSpace(int selection) const;
+
+ // Set the virtual space of the anchor of the nth selection.
void SetSelectionNAnchorVirtualSpace(int selection, int space);
+
+ // Return the virtual space of the anchor of the nth selection.
int GetSelectionNAnchorVirtualSpace(int selection) const;
// Sets the position that starts the selection - this becomes the anchor.
- void SetSelectionNStart(int selection, int pos);
+ void SetSelectionNStart(int selection, int anchor);
// 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);
+ void SetSelectionNEnd(int selection, int caret);
// Returns the position at the end of the selection.
int GetSelectionNEnd(int selection) const;
- void SetRectangularSelectionCaret(int pos);
+
+ // Set the caret position of the rectangular selection.
+ void SetRectangularSelectionCaret(int caret);
+
+ // Return the caret position of the rectangular selection.
int GetRectangularSelectionCaret() const;
- void SetRectangularSelectionAnchor(int posAnchor);
+
+ // Set the anchor position of the rectangular selection.
+ void SetRectangularSelectionAnchor(int anchor);
+
+ // Return the anchor position of the rectangular selection.
int GetRectangularSelectionAnchor() const;
+
+ // Set the virtual space of the caret of the rectangular selection.
void SetRectangularSelectionCaretVirtualSpace(int space);
+
+ // Return the virtual space of the caret of the rectangular selection.
int GetRectangularSelectionCaretVirtualSpace() const;
+
+ // Set the virtual space of the anchor of the rectangular selection.
void SetRectangularSelectionAnchorVirtualSpace(int space);
+
+ // Return the virtual space of the anchor of the rectangular selection.
int GetRectangularSelectionAnchorVirtualSpace() const;
+
+ // Set options for virtual space behaviour.
void SetVirtualSpaceOptions(int virtualSpaceOptions);
+
+ // Return options for virtual space behaviour.
int GetVirtualSpaceOptions() const;
// On GTK+, allow selecting the modifier key to use for mouse-based
@@ -4794,7 +4925,7 @@ public:
void SetProperty(const wxString& key, const wxString& value);
// Set up the key words used by the lexer.
- void SetKeyWords(int keywordSet, const wxString& keyWords);
+ void SetKeyWords(int keyWordSet, const wxString& keyWords);
// Set the lexing language of the document based on string name.
void SetLexerLanguage(const wxString& language);
@@ -4811,7 +4942,7 @@ public:
// Retrieve a 'property' value previously set with SetProperty,
// interpreted as an int AFTER any '$()' variable replacement.
- int GetPropertyInt(const wxString& key) const;
+ int GetPropertyInt(const wxString &key, int defaultValue=0) const;
// Retrieve the number of bits the current lexer needs for styling.
int GetStyleBitsNeeded() const;
@@ -5214,6 +5345,13 @@ public:
return wxTextAreaBase::HitTest(pt, col, row);
}
+ // methods deprecated due to changes in the scintilla library
+ // ---------------------------------------------
+
+ wxDEPRECATED_MSG("use UsePopUp(int) instead.")
+ void UsePopUp(bool allowPopUp);
+
+
static wxVersionInfo GetLibraryVersionInfo();
protected:
@@ -5231,6 +5369,7 @@ protected:
void OnScroll(wxScrollEvent& evt);
void OnSize(wxSizeEvent& evt);
void OnMouseLeftDown(wxMouseEvent& evt);
+ void OnMouseRightDown(wxMouseEvent& evt);
void OnMouseMove(wxMouseEvent& evt);
void OnMouseLeftUp(wxMouseEvent& evt);
void OnMouseRightUp(wxMouseEvent& evt);
@@ -5432,6 +5571,8 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_RELEASE_CLICK, wxSt
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_CLIPBOARD_COPY, wxStyledTextEvent );
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_CLIPBOARD_PASTE, wxStyledTextEvent );
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_COMPLETED, wxStyledTextEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_MARGIN_RIGHT_CLICK, wxStyledTextEvent );
+
#else
enum {
wxEVT_STC_CHANGE,
@@ -5467,7 +5608,8 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_COMPLETED, wxStyle
wxEVT_STC_HOTSPOT_RELEASE_CLICK,
wxEVT_STC_CLIPBOARD_COPY,
wxEVT_STC_CLIPBOARD_PASTE,
- wxEVT_STC_AUTOCOMP_COMPLETED
+ wxEVT_STC_AUTOCOMP_COMPLETED,
+ wxEVT_STC_MARGIN_RIGHT_CLICK
};
#endif
@@ -5513,6 +5655,7 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
#define EVT_STC_CLIPBOARD_COPY(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CLIPBOARD_COPY, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
#define EVT_STC_CLIPBOARD_PASTE(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CLIPBOARD_PASTE, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
#define EVT_STC_AUTOCOMP_COMPLETED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_COMPLETED, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
+#define EVT_STC_MARGIN_RIGHT_CLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MARGIN_RIGHT_CLICK, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
#endif
diff --git a/interface/wx/stc/stc.h b/interface/wx/stc/stc.h
index 021667e72a..ebe222c5a9 100644
--- a/interface/wx/stc/stc.h
+++ b/interface/wx/stc/stc.h
@@ -25,6 +25,8 @@
#define wxSTC_WS_VISIBLEALWAYS 1
#define wxSTC_WS_VISIBLEAFTERINDENT 2
#define wxSTC_WS_VISIBLEONLYININDENT 3
+#define wxSTC_SCTD_LONGARROW 0
+#define wxSTC_SCTD_STRIKEOUT 1
#define wxSTC_EOL_CRLF 0
#define wxSTC_EOL_CR 1
#define wxSTC_EOL_LF 2
@@ -89,6 +91,7 @@
#define wxSTC_MARGIN_FORE 3
#define wxSTC_MARGIN_TEXT 4
#define wxSTC_MARGIN_RTEXT 5
+#define wxSTC_MARGIN_COLOUR 6
/// 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.
@@ -99,6 +102,7 @@
#define wxSTC_STYLE_CONTROLCHAR 36
#define wxSTC_STYLE_INDENTGUIDE 37
#define wxSTC_STYLE_CALLTIP 38
+#define wxSTC_STYLE_FOLDDISPLAYTEXT 39
#define wxSTC_STYLE_LASTPREDEFINED 39
#define wxSTC_STYLE_MAX 255
@@ -154,6 +158,8 @@
#define wxSTC_INDIC_COMPOSITIONTHIN 15
#define wxSTC_INDIC_FULLBOX 16
#define wxSTC_INDIC_TEXTFORE 17
+#define wxSTC_INDIC_POINT 18
+#define wxSTC_INDIC_POINTCHARACTER 19
#define wxSTC_INDIC_IME 32
#define wxSTC_INDIC_IME_MAX 35
#define wxSTC_INDIC_MAX 35
@@ -194,6 +200,9 @@
#define wxSTC_FOLDLEVELWHITEFLAG 0x1000
#define wxSTC_FOLDLEVELHEADERFLAG 0x2000
#define wxSTC_FOLDLEVELNUMBERMASK 0x0FFF
+#define wxSTC_FOLDDISPLAYTEXT_HIDDEN 0
+#define wxSTC_FOLDDISPLAYTEXT_STANDARD 1
+#define wxSTC_FOLDDISPLAYTEXT_BOXED 2
#define wxSTC_FOLDACTION_CONTRACT 0
#define wxSTC_FOLDACTION_EXPAND 1
#define wxSTC_FOLDACTION_TOGGLE 2
@@ -244,6 +253,10 @@
#define wxSTC_EDGE_NONE 0
#define wxSTC_EDGE_LINE 1
#define wxSTC_EDGE_BACKGROUND 2
+#define wxSTC_EDGE_MULTILINE 3
+#define wxSTC_POPUP_NEVER 0
+#define wxSTC_POPUP_ALL 1
+#define wxSTC_POPUP_TEXT 2
#define wxSTC_STATUS_OK 0
#define wxSTC_STATUS_FAILURE 1
#define wxSTC_STATUS_BADALLOC 2
@@ -313,6 +326,7 @@
#define wxSTC_SCVS_NONE 0
#define wxSTC_SCVS_RECTANGULARSELECTION 1
#define wxSTC_SCVS_USERACCESSIBLE 2
+#define wxSTC_SCVS_NOWRAPLINESTART 4
#define wxSTC_TECHNOLOGY_DEFAULT 0
#define wxSTC_TECHNOLOGY_DIRECTWRITE 1
#define wxSTC_TECHNOLOGY_DIRECTWRITERETAIN 2
@@ -517,6 +531,7 @@
#define wxSTC_LEX_IHEX 118
#define wxSTC_LEX_TEHEX 119
#define wxSTC_LEX_JSON 120
+#define wxSTC_LEX_EDIFACT 121
/// When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
/// value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -1050,6 +1065,20 @@
#define wxSTC_BAAN_IDENTIFIER 8
#define wxSTC_BAAN_STRINGEOL 9
#define wxSTC_BAAN_WORD2 10
+#define wxSTC_BAAN_WORD3 11
+#define wxSTC_BAAN_WORD4 12
+#define wxSTC_BAAN_WORD5 13
+#define wxSTC_BAAN_WORD6 14
+#define wxSTC_BAAN_WORD7 15
+#define wxSTC_BAAN_WORD8 16
+#define wxSTC_BAAN_WORD9 17
+#define wxSTC_BAAN_TABLEDEF 18
+#define wxSTC_BAAN_TABLESQL 19
+#define wxSTC_BAAN_FUNCTION 20
+#define wxSTC_BAAN_DOMDEF 21
+#define wxSTC_BAAN_FUNCDEF 22
+#define wxSTC_BAAN_OBJECTDEF 23
+#define wxSTC_BAAN_DEFINEDEF 24
/// Lexical states for SCLEX_LISP
#define wxSTC_LISP_DEFAULT 0
@@ -1821,38 +1850,19 @@
#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
+#define wxSTC_ABL_DEFAULT 0
+#define wxSTC_ABL_NUMBER 1
+#define wxSTC_ABL_WORD 2
+#define wxSTC_ABL_STRING 3
+#define wxSTC_ABL_CHARACTER 4
+#define wxSTC_ABL_PREPROCESSOR 5
+#define wxSTC_ABL_OPERATOR 6
+#define wxSTC_ABL_IDENTIFIER 7
+#define wxSTC_ABL_BLOCK 8
+#define wxSTC_ABL_END 9
+#define wxSTC_ABL_COMMENT 10
+#define wxSTC_ABL_TASKMARKER 11
+#define wxSTC_ABL_LINECOMMENT 12
/// Lexical states for SCLEX_ABAQUS
#define wxSTC_ABAQUS_DEFAULT 0
@@ -2406,6 +2416,15 @@
#define wxSTC_JSON_KEYWORD 11
#define wxSTC_JSON_LDKEYWORD 12
#define wxSTC_JSON_ERROR 13
+#define wxSTC_EDI_DEFAULT 0
+#define wxSTC_EDI_SEGMENTSTART 1
+#define wxSTC_EDI_SEGMENTEND 2
+#define wxSTC_EDI_SEP_ELEMENT 3
+#define wxSTC_EDI_SEP_COMPOSITE 4
+#define wxSTC_EDI_SEP_RELEASE 5
+#define wxSTC_EDI_UNA 6
+#define wxSTC_EDI_UNH 7
+#define wxSTC_EDI_BADSEGMENT 8
//}}}
@@ -2591,16 +2610,28 @@
/// caret position.
#define wxSTC_CMD_LINEENDDISPLAYEXTEND 2348
-/// These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-/// except they behave differently when word-wrap is enabled:
-/// They go first to the start / end of the display line, like (Home|LineEnd)Display
-/// The difference is that, the cursor is already at the point, it goes on to the start
-/// or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
+/// Like Home but when word-wrap is enabled goes first to start of display line
+/// HomeDisplay, then to start of document line Home.
#define wxSTC_CMD_HOMEWRAP 2349
+
+/// Like HomeExtend but when word-wrap is enabled extends first to start of display line
+/// HomeDisplayExtend, then to start of document line HomeExtend.
#define wxSTC_CMD_HOMEWRAPEXTEND 2450
+
+/// Like LineEnd but when word-wrap is enabled goes first to end of display line
+/// LineEndDisplay, then to start of document line LineEnd.
#define wxSTC_CMD_LINEENDWRAP 2451
+
+/// Like LineEndExtend but when word-wrap is enabled extends first to end of display line
+/// LineEndDisplayExtend, then to start of document line LineEndExtend.
#define wxSTC_CMD_LINEENDWRAPEXTEND 2452
+
+/// Like VCHome but when word-wrap is enabled goes first to start of display line
+/// VCHomeDisplay, then behaves like VCHome.
#define wxSTC_CMD_VCHOMEWRAP 2453
+
+/// Like VCHomeExtend but when word-wrap is enabled extends first to start of display line
+/// VCHomeDisplayExtend, then behaves like VCHomeExtend.
#define wxSTC_CMD_VCHOMEWRAPEXTEND 2454
/// Copy the line containing the caret.
@@ -2626,10 +2657,16 @@
/// Delete forwards from the current position to the end of the line.
#define wxSTC_CMD_DELLINERIGHT 2396
-/// Move caret between paragraphs (delimited by empty lines).
+/// Move caret down one paragraph (delimited by empty lines).
#define wxSTC_CMD_PARADOWN 2413
+
+/// Extend selection down one paragraph (delimited by empty lines).
#define wxSTC_CMD_PARADOWNEXTEND 2414
+
+/// Move caret up one paragraph (delimited by empty lines).
#define wxSTC_CMD_PARAUP 2415
+
+/// Extend selection up one paragraph (delimited by empty lines).
#define wxSTC_CMD_PARAUPEXTEND 2416
/// Move caret down one line, extending rectangular selection to new caret position.
@@ -2805,6 +2842,10 @@
Process a @c wxEVT_STC_AUTOCOMP_COMPLETED event, generated after an autocompletion list has closed and inserted its text into the control. Valid event functions: @link wxStyledTextEvent::GetPosition GetPosition@endlink, @link wxStyledTextEvent::GetString GetString@endlink, @link wxStyledTextEvent::GetKey GetKey@endlink, @link wxStyledTextEvent::GetListCompletionMethod GetListCompletionMethod@endlink.
@since 3.1.1
+ @event{EVT_STC_MARGIN_RIGHT_CLICK(id, fn)}
+ Process a @c wxEVT_STC_MARGIN_RIGHT_CLICK event. Valid event functions: @link wxStyledTextEvent::GetMargin GetMargin@endlink, @link wxStyledTextEvent::GetModifiers GetModifiers@endlink, @link wxStyledTextEvent::GetPosition GetPosition@endlink, @link wxStyledTextEvent::GetAlt GetAlt@endlink, @link wxStyledTextEvent::GetControl GetControl@endlink, @link wxStyledTextEvent::GetShift GetShift@endlink.
+ @since 3.1.1
+
@endEventTable
@library{wxstc}
@@ -2875,7 +2916,7 @@ public:
/**
Delete a range of text in the document.
*/
- void DeleteRange(int pos, int deleteLength);
+ void DeleteRange(int start, int lengthDelete);
/**
Set all style bytes to 0, remove all folding information.
@@ -2942,12 +2983,12 @@ public:
/**
Retrieve the line number at which a particular marker is located.
*/
- int MarkerLineFromHandle(int handle);
+ int MarkerLineFromHandle(int markerHandle);
/**
Delete a marker.
*/
- void MarkerDeleteHandle(int handle);
+ void MarkerDeleteHandle(int markerHandle);
/**
Is undo history being collected?
@@ -2965,6 +3006,17 @@ public:
*/
void SetViewWhiteSpace(int viewWS);
+ /**
+ Retrieve the current tab draw mode.
+ Returns one of SCTD_* constants.
+ */
+ int GetTabDrawMode() const;
+
+ /**
+ Set how tabs are drawn when visible.
+ */
+ void SetTabDrawMode(int tabDrawMode);
+
/**
Find the position from a point within the window.
*/
@@ -2984,13 +3036,13 @@ public:
/**
Set caret to a position and ensure it is visible.
*/
- void GotoPos(int pos);
+ void GotoPos(int caret);
/**
Set the selection anchor to a position. The anchor is the opposite
end of the selection from the caret.
*/
- void SetAnchor(int posAnchor);
+ void SetAnchor(int anchor);
/**
Retrieve the text of the line containing the caret.
@@ -3020,10 +3072,10 @@ public:
void SetEOLMode(int eolMode);
/**
- Set the current styling position to pos and the styling mask to mask.
- The styling mask can be used to protect some bits in each styling byte from modification.
+ Set the current styling position to start.
+ The unused parameter is no longer used and should be set to 0.
*/
- void StartStyling(int pos, int mask);
+ void StartStyling(int start, int unused=0);
/**
Change style from current styling position for length characters to a style
@@ -3149,7 +3201,7 @@ public:
/**
Add a set of markers to a line.
*/
- void MarkerAddSet(int line, int set);
+ void MarkerAddSet(int line, int markerSet);
/**
Set the alpha used for a marker that is drawn in the text area, not the margin.
@@ -3206,6 +3258,26 @@ public:
*/
int GetMarginCursor(int margin) const;
+ /**
+ Set the background colour of a margin. Only visible for SC_MARGIN_COLOUR.
+ */
+ void SetMarginBackground(int margin, const wxColour& back);
+
+ /**
+ Retrieve the background colour of a margin
+ */
+ wxColour GetMarginBackground(int margin) const;
+
+ /**
+ Allocate a non-standard number of margins.
+ */
+ void SetMarginCount(int margins);
+
+ /**
+ How many margins are there?.
+ */
+ int GetMarginCount() const;
+
/**
Clear all the styles and make equivalent to the global default style.
*/
@@ -3244,7 +3316,7 @@ public:
/**
Set a style to have its end of line filled or not.
*/
- void StyleSetEOLFilled(int style, bool filled);
+ void StyleSetEOLFilled(int style, bool eolFilled);
/**
Reset the default style to its state at startup
@@ -3325,12 +3397,12 @@ public:
/**
Set a style to be mixed case, or to force upper or lower case.
*/
- void StyleSetCase(int style, int caseForce);
+ void StyleSetCase(int style, int caseVisible);
/**
Set the size of characters of a style. Size is in points multiplied by 100.
*/
- void StyleSetSizeFractional(int style, int caseForce);
+ void StyleSetSizeFractional(int style, int sizeHundredthPoints);
/**
Get the size of characters of a style in points multiplied by 100
@@ -3388,12 +3460,12 @@ public:
void SetCaretForeground(const wxColour& fore);
/**
- When key+modifier combination km is pressed perform msg.
+ When key+modifier combination keyDefinition is pressed perform sciCommand.
*/
void CmdKeyAssign(int key, int modifiers, int cmd);
/**
- When key+modifier combination km is pressed do nothing.
+ When key+modifier combination keyDefinition is pressed do nothing.
*/
void CmdKeyClear(int key, int modifiers);
@@ -3447,62 +3519,62 @@ public:
/**
Set an indicator to plain, squiggle or TT.
*/
- void IndicatorSetStyle(int indic, int style);
+ void IndicatorSetStyle(int indicator, int indicatorStyle);
/**
Retrieve the style of an indicator.
*/
- int IndicatorGetStyle(int indic) const;
+ int IndicatorGetStyle(int indicator) const;
/**
Set the foreground colour of an indicator.
*/
- void IndicatorSetForeground(int indic, const wxColour& fore);
+ void IndicatorSetForeground(int indicator, const wxColour& fore);
/**
Retrieve the foreground colour of an indicator.
*/
- wxColour IndicatorGetForeground(int indic) const;
+ wxColour IndicatorGetForeground(int indicator) const;
/**
Set an indicator to draw under text or over(default).
*/
- void IndicatorSetUnder(int indic, bool under);
+ void IndicatorSetUnder(int indicator, bool under);
/**
Retrieve whether indicator drawn under or over text.
*/
- bool IndicatorGetUnder(int indic) const;
+ bool IndicatorGetUnder(int indicator) const;
/**
Set a hover indicator to plain, squiggle or TT.
*/
- void IndicatorSetHoverStyle(int indic, int style);
+ void IndicatorSetHoverStyle(int indicator, int indicatorStyle);
/**
Retrieve the hover style of an indicator.
*/
- int IndicatorGetHoverStyle(int indic) const;
+ int IndicatorGetHoverStyle(int indicator) const;
/**
Set the foreground hover colour of an indicator.
*/
- void IndicatorSetHoverForeground(int indic, const wxColour& fore);
+ void IndicatorSetHoverForeground(int indicator, const wxColour& fore);
/**
Retrieve the foreground hover colour of an indicator.
*/
- wxColour IndicatorGetHoverForeground(int indic) const;
+ wxColour IndicatorGetHoverForeground(int indicator) const;
/**
Set the attributes of an indicator.
*/
- void IndicatorSetFlags(int indic, int flags);
+ void IndicatorSetFlags(int indicator, int flags);
/**
Retrieve the attributes of an indicator.
*/
- int IndicatorGetFlags(int indic) const;
+ int IndicatorGetFlags(int indicator) const;
/**
Set the foreground colour of all whitespace and whether to use this setting.
@@ -3579,10 +3651,10 @@ public:
/**
Display a auto-completion list.
- The lenEntered parameter indicates how many characters before
+ The lengthEntered parameter indicates how many characters before
the caret should be used to provide context.
*/
- void AutoCompShow(int lenEntered, const wxString& itemList);
+ void AutoCompShow(int lengthEntered, const wxString& itemList);
/**
Remove the auto-completion list from the screen.
@@ -3623,7 +3695,7 @@ public:
/**
Select the item in the auto-completion list that starts with a string.
*/
- void AutoCompSelect(const wxString& text);
+ void AutoCompSelect(const wxString& select);
/**
Should the auto-completion list be cancelled if the user backspaces to a
@@ -3756,7 +3828,7 @@ public:
/**
Change the indentation of a line to a number of columns.
*/
- void SetLineIndentation(int line, int indentSize);
+ void SetLineIndentation(int line, int indentation);
/**
Retrieve the number of columns that a line is indented.
@@ -3776,12 +3848,12 @@ public:
/**
Count characters between two positions.
*/
- int CountCharacters(int startPos, int endPos);
+ int CountCharacters(int start, int end);
/**
Show or hide the horizontal scroll bar.
*/
- void SetUseHorizontalScrollBar(bool show);
+ void SetUseHorizontalScrollBar(bool visible);
/**
Is the horizontal scroll bar visible?
@@ -3832,12 +3904,12 @@ public:
/**
Sets the position of the caret.
*/
- void SetCurrentPos(int pos);
+ void SetCurrentPos(int caret);
/**
Sets the position that starts the selection - this becomes the anchor.
*/
- void SetSelectionStart(int pos);
+ void SetSelectionStart(int anchor);
/**
Returns the position at the start of the selection.
@@ -3845,9 +3917,9 @@ public:
int GetSelectionStart() const;
/**
- Sets the position that ends the selection - this becomes the currentPosition.
+ Sets the position that ends the selection - this becomes the caret.
*/
- void SetSelectionEnd(int pos);
+ void SetSelectionEnd(int caret);
/**
Returns the position at the end of the selection.
@@ -3857,7 +3929,7 @@ public:
/**
Set caret to a position, while removing any existing selection.
*/
- void SetEmptySelection(int pos);
+ void SetEmptySelection(int caret);
/**
Sets the print magnification added to the point size of each style for printing.
@@ -3948,7 +4020,7 @@ public:
/**
Draw the selection in normal style or with selection highlighted.
*/
- void HideSelection(bool normal);
+ void HideSelection(bool hide);
/**
Retrieve the line containing a position.
@@ -4056,7 +4128,7 @@ public:
/**
Set to overtype (true) or insert mode.
*/
- void SetOvertype(bool overtype);
+ void SetOvertype(bool overType);
/**
Returns true if overtype mode is active otherwise false is returned.
@@ -4077,7 +4149,7 @@ public:
Sets the position that starts the target which is used for updating the
document without affecting the scroll position.
*/
- void SetTargetStart(int pos);
+ void SetTargetStart(int start);
/**
Get the position that starts the target.
@@ -4088,7 +4160,7 @@ public:
Sets the position that ends the target which is used for updating the
document without affecting the scroll position.
*/
- void SetTargetEnd(int pos);
+ void SetTargetEnd(int end);
/**
Get the position that ends the target.
@@ -4142,7 +4214,7 @@ public:
/**
Set the search flags used by SearchInTarget.
*/
- void SetSearchFlags(int flags);
+ void SetSearchFlags(int searchFlags);
/**
Get the search flags used by SearchInTarget.
@@ -4177,7 +4249,7 @@ public:
/**
Highlight a segment of the definition.
*/
- void CallTipSetHighlight(int start, int end);
+ void CallTipSetHighlight(int highlightStart, int highlightEnd);
/**
Set the background colour for the call tip.
@@ -4207,17 +4279,17 @@ public:
/**
Find the display line of a document line taking hidden lines into account.
*/
- int VisibleFromDocLine(int line);
+ int VisibleFromDocLine(int docLine);
/**
Find the document line of a display line taking hidden lines into account.
*/
- int DocLineFromVisible(int lineDisplay);
+ int DocLineFromVisible(int displayLine);
/**
The number of display lines needed to wrap a document line
*/
- int WrapCount(int line);
+ int WrapCount(int docLine);
/**
Set the fold level of a line.
@@ -4276,6 +4348,16 @@ public:
*/
void ToggleFold(int line);
+ /**
+ Switch a header line between expanded and contracted and show some text after the line.
+ */
+ void ToggleFoldShowText(int line, const wxString& text);
+
+ /**
+ Set the style of fold display text
+ */
+ void FoldDisplayTextSetStyle(int style);
+
/**
Expand or contract a fold header.
*/
@@ -4380,7 +4462,7 @@ public:
/**
Sets whether text is word wrapped.
*/
- void SetWrapMode(int mode);
+ void SetWrapMode(int wrapMode);
/**
Retrieve whether text is word wrapped.
@@ -4420,7 +4502,7 @@ public:
/**
Sets how wrapped sublines are placed. Default is fixed.
*/
- void SetWrapIndentMode(int mode);
+ void SetWrapIndentMode(int wrapIndentMode);
/**
Retrieve how wrapped sublines are placed. Default is fixed.
@@ -4430,7 +4512,7 @@ public:
/**
Sets the degree of caching of layout information.
*/
- void SetLayoutCache(int mode);
+ void SetLayoutCache(int cacheMode);
/**
Retrieve the degree of caching of layout information.
@@ -4485,7 +4567,7 @@ public:
/**
Show or hide the vertical scroll bar.
*/
- void SetUseVerticalScrollBar(bool show);
+ void SetUseVerticalScrollBar(bool visible);
/**
Is the vertical scroll bar visible?
@@ -4524,7 +4606,7 @@ public:
/**
Scroll so that a display line is at the top of the display.
*/
- void SetFirstVisibleLine(int lineDisplay);
+ void SetFirstVisibleLine(int displayLine);
/**
Change the effect of pasting when there are multiple selections.
@@ -4554,9 +4636,13 @@ public:
void LinesSplit(int pixelWidth);
/**
- Set the colours used as a chequerboard pattern in the fold margin
+ Set one of the colours used as a chequerboard pattern in the fold margin
*/
void SetFoldMarginColour(bool useSetting, const wxColour& back);
+
+ /**
+ Set the other colour used as a chequerboard pattern in the fold margin
+ */
void SetFoldMarginHiColour(bool useSetting, const wxColour& fore);
/**
@@ -4820,17 +4906,39 @@ public:
void LineEndDisplayExtend();
/**
- These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
- except they behave differently when word-wrap is enabled:
- They go first to the start / end of the display line, like (Home|LineEnd)Display
- The difference is that, the cursor is already at the point, it goes on to the start
- or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
+ Like Home but when word-wrap is enabled goes first to start of display line
+ HomeDisplay, then to start of document line Home.
*/
void HomeWrap();
+
+ /**
+ Like HomeExtend but when word-wrap is enabled extends first to start of display line
+ HomeDisplayExtend, then to start of document line HomeExtend.
+ */
void HomeWrapExtend();
+
+ /**
+ Like LineEnd but when word-wrap is enabled goes first to end of display line
+ LineEndDisplay, then to start of document line LineEnd.
+ */
void LineEndWrap();
+
+ /**
+ Like LineEndExtend but when word-wrap is enabled extends first to end of display line
+ LineEndDisplayExtend, then to start of document line LineEndExtend.
+ */
void LineEndWrapExtend();
+
+ /**
+ Like VCHome but when word-wrap is enabled goes first to start of display line
+ VCHomeDisplay, then behaves like VCHome.
+ */
void VCHomeWrap();
+
+ /**
+ Like VCHomeExtend but when word-wrap is enabled extends first to start of display line
+ VCHomeDisplayExtend, then behaves like VCHomeExtend.
+ */
void VCHomeWrapExtend();
/**
@@ -4851,12 +4959,12 @@ public:
/**
Highlight the characters at two positions.
*/
- void BraceHighlight(int pos1, int pos2);
+ void BraceHighlight(int posA, int posB);
/**
Use specified indicator to highlight matching braces instead of changing their style.
*/
- void BraceHighlightIndicator(bool useBraceHighlightIndicator, int indicator);
+ void BraceHighlightIndicator(bool useSetting, int indicator);
/**
Highlight the character at a position indicating there is no matching brace.
@@ -4866,12 +4974,13 @@ public:
/**
Use specified indicator to highlight non matching brace instead of changing its style.
*/
- void BraceBadLightIndicator(bool useBraceBadLightIndicator, int indicator);
+ void BraceBadLightIndicator(bool useSetting, int indicator);
/**
Find the position of a matching brace or INVALID_POSITION if no match.
+ The maxReStyle must be 0 for now. It may be defined in a future release.
*/
- int BraceMatch(int pos);
+ int BraceMatch(int pos, int maxReStyle=0);
/**
Are the end of line characters visible?
@@ -4896,7 +5005,7 @@ public:
/**
Set which document modification events are sent to the container.
*/
- void SetModEventMask(int mask);
+ void SetModEventMask(int eventMask);
/**
Retrieve the column number which text should be kept within.
@@ -4915,10 +5024,10 @@ public:
int GetEdgeMode() const;
/**
- The edge may be displayed by a line (EDGE_LINE) or by highlighting text that
+ The edge may be displayed by a line (EDGE_LINE/EDGE_MULTILINE) or by highlighting text that
goes beyond it (EDGE_BACKGROUND) or not displayed at all (EDGE_NONE).
*/
- void SetEdgeMode(int mode);
+ void SetEdgeMode(int edgeMode);
/**
Retrieve the colour used in edge indication.
@@ -4930,6 +5039,16 @@ public:
*/
void SetEdgeColour(const wxColour& edgeColour);
+ /**
+ Add a new vertical edge to the view.
+ */
+ void MultiEdgeAddLine(int column, const wxColour& edgeColour);
+
+ /**
+ Clear all vertical edges.
+ */
+ void MultiEdgeClearAll();
+
/**
Sets the current caret position to be the search anchor.
*/
@@ -4939,13 +5058,13 @@ public:
Find some text starting at the search anchor.
Does not ensure the selection is visible.
*/
- int SearchNext(int flags, const wxString& text);
+ int SearchNext(int searchFlags, const wxString& text);
/**
Find some text starting at the search anchor and moving backwards.
Does not ensure the selection is visible.
*/
- int SearchPrev(int flags, const wxString& text);
+ int SearchPrev(int searchFlags, const wxString& text);
/**
Retrieves the number of lines completely visible.
@@ -4954,9 +5073,9 @@ public:
/**
Set whether a pop up menu is displayed automatically when the user presses
- the wrong mouse button.
+ the wrong mouse button on certain areas.
*/
- void UsePopUp(bool allowPopUp);
+ void UsePopUp(int popUpMode);
/**
Is the selection rectangular? The alternative is the more common stream selection.
@@ -4967,7 +5086,7 @@ public:
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);
+ void SetZoom(int zoomInPoints);
/**
Retrieve the zoom level.
@@ -5008,7 +5127,7 @@ public:
/**
Change error status - 0 = OK.
*/
- void SetStatus(int statusCode);
+ void SetStatus(int status);
/**
Get error status.
@@ -5025,6 +5144,16 @@ public:
*/
bool GetMouseDownCaptures() const;
+ /**
+ Set whether the mouse wheel can be active outside the window.
+ */
+ void SetMouseWheelCaptures(bool captures);
+
+ /**
+ Get whether mouse wheel can be active outside the window.
+ */
+ bool GetMouseWheelCaptures() const;
+
/**
Sets the cursor to one of the SC_CURSOR* values.
*/
@@ -5087,7 +5216,7 @@ public:
/**
Get and Set the xOffset (ie, horizontal scroll position).
*/
- void SetXOffset(int newOffset);
+ void SetXOffset(int xOffset);
int GetXOffset() const;
/**
@@ -5110,7 +5239,7 @@ public:
/**
Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE).
*/
- void SetPrintWrapMode(int mode);
+ void SetPrintWrapMode(int wrapMode);
/**
Is printing line wrapped?
@@ -5158,11 +5287,23 @@ public:
bool GetHotspotSingleLine() const;
/**
- Move caret between paragraphs (delimited by empty lines).
+ Move caret down one paragraph (delimited by empty lines).
*/
void ParaDown();
+
+ /**
+ Extend selection down one paragraph (delimited by empty lines).
+ */
void ParaDownExtend();
+
+ /**
+ Move caret up one paragraph (delimited by empty lines).
+ */
void ParaUp();
+
+ /**
+ Extend selection up one paragraph (delimited by empty lines).
+ */
void ParaUpExtend();
/**
@@ -5197,7 +5338,7 @@ public:
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);
+ void SetSelectionMode(int selectionMode);
/**
Get the mode of the current selection.
@@ -5447,32 +5588,32 @@ public:
/**
Turn a indicator on over a range.
*/
- void IndicatorFillRange(int position, int fillLength);
+ void IndicatorFillRange(int start, int lengthFill);
/**
Turn a indicator off over a range.
*/
- void IndicatorClearRange(int position, int clearLength);
+ void IndicatorClearRange(int start, int lengthClear);
/**
- Are any indicators present at position?
+ Are any indicators present at pos?
*/
- int IndicatorAllOnFor(int position);
+ int IndicatorAllOnFor(int pos);
/**
- What value does a particular indicator have at at a position?
+ What value does a particular indicator have at a position?
*/
- int IndicatorValueAt(int indicator, int position);
+ int IndicatorValueAt(int indicator, int pos);
/**
Where does a particular indicator start?
*/
- int IndicatorStart(int indicator, int position);
+ int IndicatorStart(int indicator, int pos);
/**
Where does a particular indicator end?
*/
- int IndicatorEnd(int indicator, int position);
+ int IndicatorEnd(int indicator, int pos);
/**
Set number of entries in position cache
@@ -5498,7 +5639,7 @@ public:
/**
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.
+ to lengthRange bytes.
*/
const char* GetRangePointer(int position, int rangeLength) const;
@@ -5737,7 +5878,7 @@ public:
/**
Set whether additional carets are visible
*/
- void SetAdditionalCaretsVisible(bool additionalCaretsBlink);
+ void SetAdditionalCaretsVisible(bool additionalCaretsVisible);
/**
Whether additional carets are visible
@@ -5778,19 +5919,51 @@ public:
Which selection is the main selection
*/
int GetMainSelection() const;
- void SetSelectionNCaret(int selection, int pos);
+
+ /**
+ Set the caret position of the nth selection.
+ */
+ void SetSelectionNCaret(int selection, int caret);
+
+ /**
+ Return the caret position of the nth selection.
+ */
int GetSelectionNCaret(int selection) const;
- void SetSelectionNAnchor(int selection, int posAnchor);
+
+ /**
+ Set the anchor position of the nth selection.
+ */
+ void SetSelectionNAnchor(int selection, int anchor);
+
+ /**
+ Return the anchor position of the nth selection.
+ */
int GetSelectionNAnchor(int selection) const;
+
+ /**
+ Set the virtual space of the caret of the nth selection.
+ */
void SetSelectionNCaretVirtualSpace(int selection, int space);
+
+ /**
+ Return the virtual space of the caret of the nth selection.
+ */
int GetSelectionNCaretVirtualSpace(int selection) const;
+
+ /**
+ Set the virtual space of the anchor of the nth selection.
+ */
void SetSelectionNAnchorVirtualSpace(int selection, int space);
+
+ /**
+ Return the virtual space of the anchor of the nth selection.
+ */
int GetSelectionNAnchorVirtualSpace(int selection) const;
/**
Sets the position that starts the selection - this becomes the anchor.
*/
- void SetSelectionNStart(int selection, int pos);
+ void SetSelectionNStart(int selection, int anchor);
/**
Returns the position at the start of the selection.
@@ -5800,21 +5973,61 @@ public:
/**
Sets the position that ends the selection - this becomes the currentPosition.
*/
- void SetSelectionNEnd(int selection, int pos);
+ void SetSelectionNEnd(int selection, int caret);
/**
Returns the position at the end of the selection.
*/
int GetSelectionNEnd(int selection) const;
- void SetRectangularSelectionCaret(int pos);
+
+ /**
+ Set the caret position of the rectangular selection.
+ */
+ void SetRectangularSelectionCaret(int caret);
+
+ /**
+ Return the caret position of the rectangular selection.
+ */
int GetRectangularSelectionCaret() const;
- void SetRectangularSelectionAnchor(int posAnchor);
+
+ /**
+ Set the anchor position of the rectangular selection.
+ */
+ void SetRectangularSelectionAnchor(int anchor);
+
+ /**
+ Return the anchor position of the rectangular selection.
+ */
int GetRectangularSelectionAnchor() const;
+
+ /**
+ Set the virtual space of the caret of the rectangular selection.
+ */
void SetRectangularSelectionCaretVirtualSpace(int space);
+
+ /**
+ Return the virtual space of the caret of the rectangular selection.
+ */
int GetRectangularSelectionCaretVirtualSpace() const;
+
+ /**
+ Set the virtual space of the anchor of the rectangular selection.
+ */
void SetRectangularSelectionAnchorVirtualSpace(int space);
+
+ /**
+ Return the virtual space of the anchor of the rectangular selection.
+ */
int GetRectangularSelectionAnchorVirtualSpace() const;
+
+ /**
+ Set options for virtual space behaviour.
+ */
void SetVirtualSpaceOptions(int virtualSpaceOptions);
+
+ /**
+ Return options for virtual space behaviour.
+ */
int GetVirtualSpaceOptions() const;
/**
@@ -6058,7 +6271,7 @@ public:
/**
Set up the key words used by the lexer.
*/
- void SetKeyWords(int keywordSet, const wxString& keyWords);
+ void SetKeyWords(int keyWordSet, const wxString& keyWords);
/**
Set the lexing language of the document based on string name.
@@ -6085,7 +6298,7 @@ public:
Retrieve a 'property' value previously set with SetProperty,
interpreted as an int AFTER any '$()' variable replacement.
*/
- int GetPropertyInt(const wxString& key) const;
+ int GetPropertyInt(const wxString &key, int defaultValue=0) const;
/**
Retrieve the number of bits the current lexer needs for styling.
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 9144d9b8d3..02b31da0ad 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -991,6 +991,15 @@ void ScintillaWX::DoLeftButtonDown(Point pt, unsigned int curTime, bool shift, b
ButtonDown(pt, curTime, shift, ctrl, alt);
}
+void ScintillaWX::DoRightButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) {
+ if (!PointInSelection(pt)) {
+ CancelModes();
+ SetEmptySelection(PositionFromLocation(pt));
+ }
+
+ RightButtonDownWithModifiers(pt, curTime, ModifierFlags(shift, ctrl, alt));
+}
+
void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) {
ButtonUp(pt, curTime, ctrl);
}
@@ -1135,7 +1144,7 @@ void ScintillaWX::DoCommand(int ID) {
void ScintillaWX::DoContextMenu(Point pt) {
- if (displayPopupMenu)
+ if (ShouldDisplayPopup(pt))
ContextMenu(pt);
}
diff --git a/src/stc/ScintillaWX.h b/src/stc/ScintillaWX.h
index 1afb3be108..41c39b4146 100644
--- a/src/stc/ScintillaWX.h
+++ b/src/stc/ScintillaWX.h
@@ -159,6 +159,7 @@ public:
void DoGainFocus();
void DoSysColourChange();
void DoLeftButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
+ void DoRightButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
void DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl);
void DoLeftButtonMove(Point pt);
void DoMiddleButtonUp(Point pt);
diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index ef4440d372..270d6f6d5a 100755
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -140,7 +140,7 @@ methodOverrideMap = {
}
int len = endPos - startPos;
if (!len) return buf;
- TextRange tr;
+ Sci_TextRange tr;
tr.lpstrText = (char*)buf.GetWriteBuf(len*2+1);
tr.chrg.cpMin = startPos;
tr.chrg.cpMax = endPos;
@@ -181,8 +181,6 @@ methodOverrideMap = {
0),
- 'SetUsePalette' : (None, 0,0,0),
-
'MarkerSetFore' : ('MarkerSetForeground', 0, 0, 0),
'MarkerSetBack' : ('MarkerSetBackground', 0, 0, 0),
'MarkerSetBackSelected' : ('MarkerSetBackgroundSelected', 0,0,0),
@@ -228,7 +226,10 @@ methodOverrideMap = {
''',
('Define a marker from a bitmap',)),
-
+ 'GetMargins' : ('GetMarginCount', 0, 0, 0),
+ 'SetMargins' : ('SetMarginCount', 0, 0, 0),
+ 'GetMarginBackN' : ('GetMarginBackground', 0, 0, 0),
+ 'SetMarginBackN' : ('SetMarginBackground', 0, 0, 0),
'SetMarginTypeN' : ('SetMarginType', 0, 0, 0),
'GetMarginTypeN' : ('GetMarginType', 0, 0, 0),
'SetMarginWidthN' : ('SetMarginWidth', 0, 0, 0),
@@ -351,6 +352,16 @@ methodOverrideMap = {
'ClearAllCmdKeys' : ('CmdKeyClearAll', 0, 0, 0),
+ 'StartStyling' :
+ (0,
+ 'void %s(int start, int unused=0);',
+
+ '''void %s(int start, int unused) {
+ wxASSERT_MSG(unused==0,
+ "The second argument passed to StartStyling should be 0");
+
+ SendMsg(%s, start, unused);''',
+ 0),
'SetStylingEx' :
('SetStyleBytes',
@@ -449,8 +460,6 @@ methodOverrideMap = {
'GetCaretFore' : ('GetCaretForeground', 0, 0, 0),
- 'GetUsePalette' : (None, 0, 0, 0),
-
'FindText' :
(0,
'''int %s(int minPos, int maxPos, const wxString& text, int flags=0);''',
@@ -458,7 +467,7 @@ methodOverrideMap = {
'''int %s(int minPos, int maxPos,
const wxString& text,
int flags) {
- TextToFind ft;
+ Sci_TextToFind ft;
ft.chrg.cpMin = minPos;
ft.chrg.cpMax = maxPos;
const wxWX2MBbuf buf = wx2stc(text);
@@ -483,7 +492,7 @@ methodOverrideMap = {
wxDC* target,
wxRect renderRect,
wxRect pageRect) {
- RangeToFormat fr;
+ Sci_RangeToFormat fr;
if (endPos < startPos) {
int temp = startPos;
@@ -558,7 +567,7 @@ methodOverrideMap = {
if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1);
char* buf = (char*)mbuf.GetWriteBuf(len);
- TextRange tr;
+ Sci_TextRange tr;
tr.lpstrText = buf;
tr.chrg.cpMin = startPos;
tr.chrg.cpMax = endPos;
@@ -710,10 +719,23 @@ methodOverrideMap = {
("Retrieve a 'property' value previously set with SetProperty,",
"with '$()' variable replacement on returned buffer.")),
- 'GetPropertyInt' : (0, 0, 0,
+ 'GetPropertyInt' :
+ (0,
+ 'int %s(const wxString &key, int defaultValue=0) const;',
+ '''int %s(const wxString &key, int defaultValue) const {
+ return SendMsg(%s, (uptr_t)(const char*)wx2stc(key), defaultValue);''',
("Retrieve a 'property' value previously set with SetProperty,",
"interpreted as an int AFTER any '$()' variable replacement.")),
+ 'BraceMatch' :
+ (0,
+ 'int %s(int pos, int maxReStyle=0);',
+ '''int %s(int pos, int maxReStyle){
+ wxASSERT_MSG(maxReStyle==0,
+ "The second argument passed to BraceMatch should be 0");
+
+ return SendMsg(%s, pos, maxReStyle);''',
+ 0),
'GetDocPointer' :
(0,
diff --git a/src/stc/scintilla/README.txt b/src/stc/scintilla/README.txt
index f5498d4509..071178d25d 100644
--- a/src/stc/scintilla/README.txt
+++ b/src/stc/scintilla/README.txt
@@ -3,7 +3,7 @@ directories from the Scintilla source distribution. All other code
needed to implement Scintilla on top of wxWidgets is located in the
directory above this one.
-The current version of the Scintilla code is 3.6.6
+The current version of the Scintilla code is 3.7.2
These are the basic steps needed to update the version of Scintilla used by wxSTC.
diff --git a/src/stc/scintilla/include/Platform.h b/src/stc/scintilla/include/Platform.h
index 63269d0036..1ff48ecb14 100644
--- a/src/stc/scintilla/include/Platform.h
+++ b/src/stc/scintilla/include/Platform.h
@@ -526,8 +526,4 @@ public:
}
#endif
-#if defined(__GNUC__) && defined(SCINTILLA_QT)
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
#endif
diff --git a/src/stc/scintilla/include/SciLexer.h b/src/stc/scintilla/include/SciLexer.h
index 6b98b09fc7..44c02a84ae 100644
--- a/src/stc/scintilla/include/SciLexer.h
+++ b/src/stc/scintilla/include/SciLexer.h
@@ -133,6 +133,7 @@
#define SCLEX_IHEX 118
#define SCLEX_TEHEX 119
#define SCLEX_JSON 120
+#define SCLEX_EDIFACT 121
#define SCLEX_AUTOMATIC 1000
#define SCE_P_DEFAULT 0
#define SCE_P_COMMENTLINE 1
@@ -599,6 +600,20 @@
#define SCE_BAAN_IDENTIFIER 8
#define SCE_BAAN_STRINGEOL 9
#define SCE_BAAN_WORD2 10
+#define SCE_BAAN_WORD3 11
+#define SCE_BAAN_WORD4 12
+#define SCE_BAAN_WORD5 13
+#define SCE_BAAN_WORD6 14
+#define SCE_BAAN_WORD7 15
+#define SCE_BAAN_WORD8 16
+#define SCE_BAAN_WORD9 17
+#define SCE_BAAN_TABLEDEF 18
+#define SCE_BAAN_TABLESQL 19
+#define SCE_BAAN_FUNCTION 20
+#define SCE_BAAN_DOMDEF 21
+#define SCE_BAAN_FUNCDEF 22
+#define SCE_BAAN_OBJECTDEF 23
+#define SCE_BAAN_DEFINEDEF 24
#define SCE_LISP_DEFAULT 0
#define SCE_LISP_COMMENT 1
#define SCE_LISP_NUMBER 2
@@ -1277,38 +1292,19 @@
#define SCE_PLM_OPERATOR 5
#define SCE_PLM_CONTROL 6
#define SCE_PLM_KEYWORD 7
-#define SCE_4GL_DEFAULT 0
-#define SCE_4GL_NUMBER 1
-#define SCE_4GL_WORD 2
-#define SCE_4GL_STRING 3
-#define SCE_4GL_CHARACTER 4
-#define SCE_4GL_PREPROCESSOR 5
-#define SCE_4GL_OPERATOR 6
-#define SCE_4GL_IDENTIFIER 7
-#define SCE_4GL_BLOCK 8
-#define SCE_4GL_END 9
-#define SCE_4GL_COMMENT1 10
-#define SCE_4GL_COMMENT2 11
-#define SCE_4GL_COMMENT3 12
-#define SCE_4GL_COMMENT4 13
-#define SCE_4GL_COMMENT5 14
-#define SCE_4GL_COMMENT6 15
-#define SCE_4GL_DEFAULT_ 16
-#define SCE_4GL_NUMBER_ 17
-#define SCE_4GL_WORD_ 18
-#define SCE_4GL_STRING_ 19
-#define SCE_4GL_CHARACTER_ 20
-#define SCE_4GL_PREPROCESSOR_ 21
-#define SCE_4GL_OPERATOR_ 22
-#define SCE_4GL_IDENTIFIER_ 23
-#define SCE_4GL_BLOCK_ 24
-#define SCE_4GL_END_ 25
-#define SCE_4GL_COMMENT1_ 26
-#define SCE_4GL_COMMENT2_ 27
-#define SCE_4GL_COMMENT3_ 28
-#define SCE_4GL_COMMENT4_ 29
-#define SCE_4GL_COMMENT5_ 30
-#define SCE_4GL_COMMENT6_ 31
+#define SCE_ABL_DEFAULT 0
+#define SCE_ABL_NUMBER 1
+#define SCE_ABL_WORD 2
+#define SCE_ABL_STRING 3
+#define SCE_ABL_CHARACTER 4
+#define SCE_ABL_PREPROCESSOR 5
+#define SCE_ABL_OPERATOR 6
+#define SCE_ABL_IDENTIFIER 7
+#define SCE_ABL_BLOCK 8
+#define SCE_ABL_END 9
+#define SCE_ABL_COMMENT 10
+#define SCE_ABL_TASKMARKER 11
+#define SCE_ABL_LINECOMMENT 12
#define SCE_ABAQUS_DEFAULT 0
#define SCE_ABAQUS_COMMENT 1
#define SCE_ABAQUS_COMMENTBLOCK 2
@@ -1802,6 +1798,15 @@
#define SCE_JSON_KEYWORD 11
#define SCE_JSON_LDKEYWORD 12
#define SCE_JSON_ERROR 13
+#define SCE_EDI_DEFAULT 0
+#define SCE_EDI_SEGMENTSTART 1
+#define SCE_EDI_SEGMENTEND 2
+#define SCE_EDI_SEP_ELEMENT 3
+#define SCE_EDI_SEP_COMPOSITE 4
+#define SCE_EDI_SEP_RELEASE 5
+#define SCE_EDI_UNA 6
+#define SCE_EDI_UNH 7
+#define SCE_EDI_BADSEGMENT 8
/* --Autogenerated -- end of section automatically generated from Scintilla.iface */
#endif
diff --git a/src/stc/scintilla/include/Scintilla.h b/src/stc/scintilla/include/Scintilla.h
index 99bc6e7b1c..6a36d24f4e 100644
--- a/src/stc/scintilla/include/Scintilla.h
+++ b/src/stc/scintilla/include/Scintilla.h
@@ -11,8 +11,6 @@
#ifndef SCINTILLA_H
#define SCINTILLA_H
-#include "Sci_Position.h"
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -28,20 +26,21 @@ int Scintilla_LinkLexers(void);
}
#endif
-/* Here should be placed typedefs for uptr_t, an unsigned integer type large enough to
- * hold a pointer and sptr_t, a signed integer large enough to hold a pointer.
- * May need to be changed for 64 bit platforms. */
-#if defined(_WIN32)
-#include
-#endif
-#ifdef MAXULONG_PTR
-typedef ULONG_PTR uptr_t;
-typedef LONG_PTR sptr_t;
+// Include header that defines basic numeric types.
+#if defined(_MSC_VER)
+// Older releases of MSVC did not have stdint.h.
+#include
#else
-typedef unsigned long uptr_t;
-typedef long sptr_t;
+#include
#endif
+// Define uptr_t, an unsigned integer type large enough to hold a pointer.
+typedef uintptr_t uptr_t;
+// Define sptr_t, a signed integer large enough to hold a pointer.
+typedef intptr_t sptr_t;
+
+#include "Sci_Position.h"
+
typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
/* ++Autogenerated -- start of section automatically generated from Scintilla.iface */
@@ -76,6 +75,10 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCWS_VISIBLEONLYININDENT 3
#define SCI_GETVIEWWS 2020
#define SCI_SETVIEWWS 2021
+#define SCTD_LONGARROW 0
+#define SCTD_STRIKEOUT 1
+#define SCI_GETTABDRAWMODE 2698
+#define SCI_SETTABDRAWMODE 2699
#define SCI_POSITIONFROMPOINT 2022
#define SCI_POSITIONFROMPOINTCLOSE 2023
#define SCI_GOTOLINE 2024
@@ -167,6 +170,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SC_MARGIN_FORE 3
#define SC_MARGIN_TEXT 4
#define SC_MARGIN_RTEXT 5
+#define SC_MARGIN_COLOUR 6
#define SCI_SETMARGINTYPEN 2240
#define SCI_GETMARGINTYPEN 2241
#define SCI_SETMARGINWIDTHN 2242
@@ -177,6 +181,10 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCI_GETMARGINSENSITIVEN 2247
#define SCI_SETMARGINCURSORN 2248
#define SCI_GETMARGINCURSORN 2249
+#define SCI_SETMARGINBACKN 2250
+#define SCI_GETMARGINBACKN 2251
+#define SCI_SETMARGINS 2252
+#define SCI_GETMARGINS 2253
#define STYLE_DEFAULT 32
#define STYLE_LINENUMBER 33
#define STYLE_BRACELIGHT 34
@@ -184,6 +192,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define STYLE_CONTROLCHAR 36
#define STYLE_INDENTGUIDE 37
#define STYLE_CALLTIP 38
+#define STYLE_FOLDDISPLAYTEXT 39
#define STYLE_LASTPREDEFINED 39
#define STYLE_MAX 255
#define SC_CHARSET_ANSI 0
@@ -282,6 +291,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define INDIC_COMPOSITIONTHIN 15
#define INDIC_FULLBOX 16
#define INDIC_TEXTFORE 17
+#define INDIC_POINT 18
+#define INDIC_POINTCHARACTER 19
#define INDIC_IME 32
#define INDIC_IME_MAX 35
#define INDIC_MAX 35
@@ -475,6 +486,11 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCI_SETFOLDEXPANDED 2229
#define SCI_GETFOLDEXPANDED 2230
#define SCI_TOGGLEFOLD 2231
+#define SCI_TOGGLEFOLDSHOWTEXT 2700
+#define SC_FOLDDISPLAYTEXT_HIDDEN 0
+#define SC_FOLDDISPLAYTEXT_STANDARD 1
+#define SC_FOLDDISPLAYTEXT_BOXED 2
+#define SCI_FOLDDISPLAYTEXTSETSTYLE 2701
#define SC_FOLDACTION_CONTRACT 0
#define SC_FOLDACTION_EXPAND 1
#define SC_FOLDACTION_TOGGLE 2
@@ -650,16 +666,22 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define EDGE_NONE 0
#define EDGE_LINE 1
#define EDGE_BACKGROUND 2
+#define EDGE_MULTILINE 3
#define SCI_GETEDGECOLUMN 2360
#define SCI_SETEDGECOLUMN 2361
#define SCI_GETEDGEMODE 2362
#define SCI_SETEDGEMODE 2363
#define SCI_GETEDGECOLOUR 2364
#define SCI_SETEDGECOLOUR 2365
+#define SCI_MULTIEDGEADDLINE 2694
+#define SCI_MULTIEDGECLEARALL 2695
#define SCI_SEARCHANCHOR 2366
#define SCI_SEARCHNEXT 2367
#define SCI_SEARCHPREV 2368
#define SCI_LINESONSCREEN 2370
+#define SC_POPUP_NEVER 0
+#define SC_POPUP_ALL 1
+#define SC_POPUP_TEXT 2
#define SCI_USEPOPUP 2371
#define SCI_SELECTIONISRECTANGLE 2372
#define SCI_SETZOOM 2373
@@ -679,6 +701,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCI_GETSTATUS 2383
#define SCI_SETMOUSEDOWNCAPTURES 2384
#define SCI_GETMOUSEDOWNCAPTURES 2385
+#define SCI_SETMOUSEWHEELCAPTURES 2696
+#define SCI_GETMOUSEWHEELCAPTURES 2697
#define SC_CURSORNORMAL -1
#define SC_CURSORARROW 2
#define SC_CURSORWAIT 4
@@ -895,6 +919,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCVS_NONE 0
#define SCVS_RECTANGULARSELECTION 1
#define SCVS_USERACCESSIBLE 2
+#define SCVS_NOWRAPLINESTART 4
#define SCI_SETVIRTUALSPACEOPTIONS 2596
#define SCI_GETVIRTUALSPACEOPTIONS 2597
#define SCI_SETRECTANGULARSELECTIONMODIFIER 2598
@@ -1069,16 +1094,13 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
#define SCN_FOCUSIN 2028
#define SCN_FOCUSOUT 2029
#define SCN_AUTOCCOMPLETED 2030
+#define SCN_MARGINRIGHTCLICK 2031
/* --Autogenerated -- end of section automatically generated from Scintilla.iface */
/* These structures are defined to be exactly the same shape as the Win32
* CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs.
* So older code that treats Scintilla as a RichEdit will work. */
-#if defined(__cplusplus) && defined(SCI_NAMESPACE)
-namespace Scintilla {
-#endif
-
struct Sci_CharacterRange {
Sci_PositionCR cpMin;
Sci_PositionCR cpMax;
@@ -1095,10 +1117,6 @@ struct Sci_TextToFind {
struct Sci_CharacterRange chrgText;
};
-#define CharacterRange Sci_CharacterRange
-#define TextRange Sci_TextRange
-#define TextToFind Sci_TextToFind
-
typedef void *Sci_SurfaceID;
struct Sci_Rectangle {
@@ -1119,8 +1137,6 @@ struct Sci_RangeToFormat {
struct Sci_CharacterRange chrg;
};
-#define RangeToFormat Sci_RangeToFormat
-
#ifndef __cplusplus
/* For the GTK+ platform, g-ir-scanner needs to have these typedefs. This
* is not required in C++ code and actually seems to break ScintillaEditPy */
@@ -1137,8 +1153,6 @@ struct Sci_NotifyHeader {
unsigned int code;
};
-#define NotifyHeader Sci_NotifyHeader
-
struct SCNotification {
Sci_NotifyHeader nmhdr;
Sci_Position position;
@@ -1178,18 +1192,17 @@ struct SCNotification {
/* SCN_AUTOCSELECTION, SCN_AUTOCCOMPLETED, SCN_USERLISTSELECTION, */
};
-#if defined(__cplusplus) && defined(SCI_NAMESPACE)
-}
-#endif
-
#ifdef INCLUDE_DEPRECATED_FEATURES
-#define SC_CP_DBCS 1
-#define SCI_SETUSEPALETTE 2039
-#define SCI_GETUSEPALETTE 2139
#define SCI_SETKEYSUNICODE 2521
#define SCI_GETKEYSUNICODE 2522
+#define CharacterRange Sci_CharacterRange
+#define TextRange Sci_TextRange
+#define TextToFind Sci_TextToFind
+#define RangeToFormat Sci_RangeToFormat
+#define NotifyHeader Sci_NotifyHeader
+
#endif
#endif
diff --git a/src/stc/scintilla/include/Scintilla.iface b/src/stc/scintilla/include/Scintilla.iface
index 310d877a9a..6b9a77f66e 100644
--- a/src/stc/scintilla/include/Scintilla.iface
+++ b/src/stc/scintilla/include/Scintilla.iface
@@ -105,7 +105,7 @@ fun void ChangeInsertion=2672(int length, string text)
fun void ClearAll=2004(,)
# Delete a range of text in the document.
-fun void DeleteRange=2645(position pos, int deleteLength)
+fun void DeleteRange=2645(position start, int lengthDelete)
# Set all style bytes to 0, remove all folding information.
fun void ClearDocumentStyle=2005(,)
@@ -147,10 +147,10 @@ fun int GetStyledText=2015(, textrange tr)
fun bool CanRedo=2016(,)
# Retrieve the line number at which a particular marker is located.
-fun int MarkerLineFromHandle=2017(int handle,)
+fun int MarkerLineFromHandle=2017(int markerHandle,)
# Delete a marker.
-fun void MarkerDeleteHandle=2018(int handle,)
+fun void MarkerDeleteHandle=2018(int markerHandle,)
# Is undo history being collected?
get bool GetUndoCollection=2019(,)
@@ -168,6 +168,17 @@ get int GetViewWS=2020(,)
# Make white space characters invisible, always visible or visible outside indentation.
set void SetViewWS=2021(int viewWS,)
+enu TabDrawMode=SCTD_
+val SCTD_LONGARROW=0
+val SCTD_STRIKEOUT=1
+
+# Retrieve the current tab draw mode.
+# Returns one of SCTD_* constants.
+get int GetTabDrawMode=2698(,)
+
+# Set how tabs are drawn when visible.
+set void SetTabDrawMode=2699(int tabDrawMode,)
+
# Find the position from a point within the window.
fun position PositionFromPoint=2022(int x, int y)
@@ -179,11 +190,11 @@ fun position PositionFromPointClose=2023(int x, int y)
fun void GotoLine=2024(int line,)
# Set caret to a position and ensure it is visible.
-fun void GotoPos=2025(position pos,)
+fun void GotoPos=2025(position caret,)
# Set the selection anchor to a position. The anchor is the opposite
# end of the selection from the caret.
-set void SetAnchor=2026(position posAnchor,)
+set void SetAnchor=2026(position anchor,)
# Retrieve the text of the line containing the caret.
# Returns the index of the caret on the line.
@@ -207,9 +218,9 @@ get int GetEOLMode=2030(,)
# Set the current end of line mode.
set void SetEOLMode=2031(int eolMode,)
-# Set the current styling position to pos and the styling mask to mask.
-# The styling mask can be used to protect some bits in each styling byte from modification.
-fun void StartStyling=2032(position pos, int mask)
+# Set the current styling position to start.
+# The unused parameter is no longer used and should be set to 0.
+fun void StartStyling=2032(position start, int unused)
# Change style from current styling position for length characters to a style
# and move the current styling position to after this newly styled segment.
@@ -346,7 +357,7 @@ fun int MarkerPrevious=2048(int lineStart, int markerMask)
fun void MarkerDefinePixmap=2049(int markerNumber, string pixmap)
# Add a set of markers to a line.
-fun void MarkerAddSet=2466(int line, int set)
+fun void MarkerAddSet=2466(int line, int markerSet)
# Set the alpha used for a marker that is drawn in the text area, not the margin.
set void MarkerSetAlpha=2476(int markerNumber, int alpha)
@@ -360,6 +371,7 @@ val SC_MARGIN_BACK=2
val SC_MARGIN_FORE=3
val SC_MARGIN_TEXT=4
val SC_MARGIN_RTEXT=5
+val SC_MARGIN_COLOUR=6
# Set a margin to be either numeric or symbolic.
set void SetMarginTypeN=2240(int margin, int marginType)
@@ -391,6 +403,18 @@ set void SetMarginCursorN=2248(int margin, int cursor)
# Retrieve the cursor shown in a margin.
get int GetMarginCursorN=2249(int margin,)
+# Set the background colour of a margin. Only visible for SC_MARGIN_COLOUR.
+set void SetMarginBackN=2250(int margin, colour back)
+
+# Retrieve the background colour of a margin
+get colour GetMarginBackN=2251(int margin,)
+
+# Allocate a non-standard number of margins.
+set void SetMargins=2252(int margins,)
+
+# How many margins are there?.
+get int GetMargins=2253(,)
+
# 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.
enu StylesCommon=STYLE_
@@ -401,6 +425,7 @@ val STYLE_BRACEBAD=35
val STYLE_CONTROLCHAR=36
val STYLE_INDENTGUIDE=37
val STYLE_CALLTIP=38
+val STYLE_FOLDDISPLAYTEXT=39
val STYLE_LASTPREDEFINED=39
val STYLE_MAX=255
@@ -452,7 +477,7 @@ set void StyleSetSize=2055(int style, int sizePoints)
set void StyleSetFont=2056(int style, string fontName)
# Set a style to have its end of line filled or not.
-set void StyleSetEOLFilled=2057(int style, bool filled)
+set void StyleSetEOLFilled=2057(int style, bool eolFilled)
# Reset the default style to its state at startup
fun void StyleResetDefault=2058(,)
@@ -509,12 +534,12 @@ get bool StyleGetChangeable=2492(int style,)
get bool StyleGetHotSpot=2493(int style,)
# Set a style to be mixed case, or to force upper or lower case.
-set void StyleSetCase=2060(int style, int caseForce)
+set void StyleSetCase=2060(int style, int caseVisible)
val SC_FONT_SIZE_MULTIPLIER=100
# Set the size of characters of a style. Size is in points multiplied by 100.
-set void StyleSetSizeFractional=2061(int style, int caseForce)
+set void StyleSetSizeFractional=2061(int style, int sizeHundredthPoints)
# Get the size of characters of a style in points multiplied by 100
get int StyleGetSizeFractional=2062(int style,)
@@ -557,11 +582,11 @@ set void SetSelEOLFilled=2480(bool filled,)
# Set the foreground colour of the caret.
set void SetCaretFore=2069(colour fore,)
-# When key+modifier combination km is pressed perform msg.
-fun void AssignCmdKey=2070(keymod km, int msg)
+# When key+modifier combination keyDefinition is pressed perform sciCommand.
+fun void AssignCmdKey=2070(keymod keyDefinition, int sciCommand)
-# When key+modifier combination km is pressed do nothing.
-fun void ClearCmdKey=2071(keymod km,)
+# When key+modifier combination keyDefinition is pressed do nothing.
+fun void ClearCmdKey=2071(keymod keyDefinition,)
# Drop all key mappings.
fun void ClearAllCmdKeys=2072(,)
@@ -613,6 +638,8 @@ val INDIC_COMPOSITIONTHICK=14
val INDIC_COMPOSITIONTHIN=15
val INDIC_FULLBOX=16
val INDIC_TEXTFORE=17
+val INDIC_POINT=18
+val INDIC_POINTCHARACTER=19
val INDIC_IME=32
val INDIC_IME_MAX=35
val INDIC_MAX=35
@@ -623,34 +650,34 @@ val INDIC2_MASK=0x80
val INDICS_MASK=0xE0
# Set an indicator to plain, squiggle or TT.
-set void IndicSetStyle=2080(int indic, int style)
+set void IndicSetStyle=2080(int indicator, int indicatorStyle)
# Retrieve the style of an indicator.
-get int IndicGetStyle=2081(int indic,)
+get int IndicGetStyle=2081(int indicator,)
# Set the foreground colour of an indicator.
-set void IndicSetFore=2082(int indic, colour fore)
+set void IndicSetFore=2082(int indicator, colour fore)
# Retrieve the foreground colour of an indicator.
-get colour IndicGetFore=2083(int indic,)
+get colour IndicGetFore=2083(int indicator,)
# Set an indicator to draw under text or over(default).
-set void IndicSetUnder=2510(int indic, bool under)
+set void IndicSetUnder=2510(int indicator, bool under)
# Retrieve whether indicator drawn under or over text.
-get bool IndicGetUnder=2511(int indic,)
+get bool IndicGetUnder=2511(int indicator,)
# Set a hover indicator to plain, squiggle or TT.
-set void IndicSetHoverStyle=2680(int indic, int style)
+set void IndicSetHoverStyle=2680(int indicator, int indicatorStyle)
# Retrieve the hover style of an indicator.
-get int IndicGetHoverStyle=2681(int indic,)
+get int IndicGetHoverStyle=2681(int indicator,)
# Set the foreground hover colour of an indicator.
-set void IndicSetHoverFore=2682(int indic, colour fore)
+set void IndicSetHoverFore=2682(int indicator, colour fore)
# Retrieve the foreground hover colour of an indicator.
-get colour IndicGetHoverFore=2683(int indic,)
+get colour IndicGetHoverFore=2683(int indicator,)
val SC_INDICVALUEBIT=0x1000000
val SC_INDICVALUEMASK=0xFFFFFF
@@ -659,10 +686,10 @@ enu IndicFlag=SC_INDICFLAG_
val SC_INDICFLAG_VALUEFORE=1
# Set the attributes of an indicator.
-set void IndicSetFlags=2684(int indic, int flags)
+set void IndicSetFlags=2684(int indicator, int flags)
# Retrieve the attributes of an indicator.
-get int IndicGetFlags=2685(int indic,)
+get int IndicGetFlags=2685(int indicator,)
# Set the foreground colour of all whitespace and whether to use this setting.
fun void SetWhitespaceFore=2084(bool useSetting, colour fore)
@@ -710,9 +737,9 @@ set void SetCaretLineBack=2098(colour back,)
set void StyleSetChangeable=2099(int style, bool changeable)
# Display a auto-completion list.
-# The lenEntered parameter indicates how many characters before
+# The lengthEntered parameter indicates how many characters before
# the caret should be used to provide context.
-fun void AutoCShow=2100(int lenEntered, string itemList)
+fun void AutoCShow=2100(int lengthEntered, string itemList)
# Remove the auto-completion list from the screen.
fun void AutoCCancel=2101(,)
@@ -737,7 +764,7 @@ set void AutoCSetSeparator=2106(int separatorCharacter,)
get int AutoCGetSeparator=2107(,)
# Select the item in the auto-completion list that starts with a string.
-fun void AutoCSelect=2108(, string text)
+fun void AutoCSelect=2108(, string select)
# Should the auto-completion list be cancelled if the user backspaces to a
# position before where the box was created.
@@ -820,7 +847,7 @@ set void SetUseTabs=2124(bool useTabs,)
get bool GetUseTabs=2125(,)
# Change the indentation of a line to a number of columns.
-set void SetLineIndentation=2126(int line, int indentSize)
+set void SetLineIndentation=2126(int line, int indentation)
# Retrieve the number of columns that a line is indented.
get int GetLineIndentation=2127(int line,)
@@ -832,10 +859,10 @@ get position GetLineIndentPosition=2128(int line,)
get int GetColumn=2129(position pos,)
# Count characters between two positions.
-fun int CountCharacters=2633(int startPos, int endPos)
+fun int CountCharacters=2633(position start, position end)
# Show or hide the horizontal scroll bar.
-set void SetHScrollBar=2130(bool show,)
+set void SetHScrollBar=2130(bool visible,)
# Is the horizontal scroll bar visible?
get bool GetHScrollBar=2131(,)
@@ -871,22 +898,22 @@ get colour GetCaretFore=2138(,)
get bool GetReadOnly=2140(,)
# Sets the position of the caret.
-set void SetCurrentPos=2141(position pos,)
+set void SetCurrentPos=2141(position caret,)
# Sets the position that starts the selection - this becomes the anchor.
-set void SetSelectionStart=2142(position pos,)
+set void SetSelectionStart=2142(position anchor,)
# Returns the position at the start of the selection.
get position GetSelectionStart=2143(,)
-# Sets the position that ends the selection - this becomes the currentPosition.
-set void SetSelectionEnd=2144(position pos,)
+# Sets the position that ends the selection - this becomes the caret.
+set void SetSelectionEnd=2144(position caret,)
# Returns the position at the end of the selection.
get position GetSelectionEnd=2145(,)
# Set caret to a position, while removing any existing selection.
-fun void SetEmptySelection=2556(position pos,)
+fun void SetEmptySelection=2556(position caret,)
# Sets the print magnification added to the point size of each style for printing.
set void SetPrintMagnification=2146(int magnification,)
@@ -921,7 +948,7 @@ val SCFIND_POSIX=0x00400000
val SCFIND_CXX11REGEX=0x00800000
# Find some text in the document.
-fun position FindText=2150(int flags, findtext ft)
+fun position FindText=2150(int searchFlags, findtext ft)
# On Windows, will draw the document into a display context such as a printer.
fun position FormatRange=2151(bool draw, formatrange fr)
@@ -952,7 +979,7 @@ get int GetMarginRight=2158(,)
get bool GetModify=2159(,)
# Select a range of text.
-fun void SetSel=2160(position start, position end)
+fun void SetSel=2160(position anchor, position caret)
# Retrieve the selected text.
# Return the length of the text.
@@ -964,7 +991,7 @@ fun int GetSelText=2161(, stringresult text)
fun int GetTextRange=2162(, textrange tr)
# Draw the selection in normal style or with selection highlighted.
-fun void HideSelection=2163(bool normal,)
+fun void HideSelection=2163(bool hide,)
# Retrieve the x value of the point in the window where a position is displayed.
fun int PointXFromPosition=2164(, position pos)
@@ -1041,7 +1068,7 @@ get int GetDirectFunction=2184(,)
get int GetDirectPointer=2185(,)
# Set to overtype (true) or insert mode.
-set void SetOvertype=2186(bool overtype,)
+set void SetOvertype=2186(bool overType,)
# Returns true if overtype mode is active otherwise false is returned.
get bool GetOvertype=2187(,)
@@ -1054,14 +1081,14 @@ get int GetCaretWidth=2189(,)
# Sets the position that starts the target which is used for updating the
# document without affecting the scroll position.
-set void SetTargetStart=2190(position pos,)
+set void SetTargetStart=2190(position start,)
# Get the position that starts the target.
get position GetTargetStart=2191(,)
# Sets the position that ends the target which is used for updating the
# document without affecting the scroll position.
-set void SetTargetEnd=2192(position pos,)
+set void SetTargetEnd=2192(position end,)
# Get the position that ends the target.
get position GetTargetEnd=2193(,)
@@ -1070,7 +1097,7 @@ get position GetTargetEnd=2193(,)
fun void SetTargetRange=2686(position start, position end)
# Retrieve the text in the target.
-get int GetTargetText=2687(, stringresult characters)
+get int GetTargetText=2687(, stringresult text)
# Make the target range start and end be the same as the selection range start and end.
fun void TargetFromSelection=2287(,)
@@ -1097,7 +1124,7 @@ fun int ReplaceTargetRE=2195(int length, string text)
fun int SearchInTarget=2197(int length, string text)
# Set the search flags used by SearchInTarget.
-set void SetSearchFlags=2198(int flags,)
+set void SetSearchFlags=2198(int searchFlags,)
# Get the search flags used by SearchInTarget.
get int GetSearchFlags=2199(,)
@@ -1118,7 +1145,7 @@ fun position CallTipPosStart=2203(,)
set void CallTipSetPosStart=2214(int posStart,)
# Highlight a segment of the definition.
-fun void CallTipSetHlt=2204(int start, int end)
+fun void CallTipSetHlt=2204(int highlightStart, int highlightEnd)
# Set the background colour for the call tip.
set void CallTipSetBack=2205(colour back,)
@@ -1136,13 +1163,13 @@ set void CallTipUseStyle=2212(int tabSize,)
set void CallTipSetPosition=2213(bool above,)
# Find the display line of a document line taking hidden lines into account.
-fun int VisibleFromDocLine=2220(int line,)
+fun int VisibleFromDocLine=2220(int docLine,)
# Find the document line of a display line taking hidden lines into account.
-fun int DocLineFromVisible=2221(int lineDisplay,)
+fun int DocLineFromVisible=2221(int displayLine,)
# The number of display lines needed to wrap a document line
-fun int WrapCount=2235(int line,)
+fun int WrapCount=2235(int docLine,)
enu FoldLevel=SC_FOLDLEVEL
val SC_FOLDLEVELBASE=0x400
@@ -1185,7 +1212,18 @@ get bool GetFoldExpanded=2230(int line,)
# Switch a header line between expanded and contracted.
fun void ToggleFold=2231(int line,)
-enu FoldAction=SC_FOLDACTION
+# Switch a header line between expanded and contracted and show some text after the line.
+fun void ToggleFoldShowText=2700(int line, string text)
+
+enu foldDisplayTextStyle=SC_FOLDDISPLAYTEXTSTYLE_
+val SC_FOLDDISPLAYTEXT_HIDDEN=0
+val SC_FOLDDISPLAYTEXT_STANDARD=1
+val SC_FOLDDISPLAYTEXT_BOXED=2
+
+# Set the style of fold display text
+set void FoldDisplayTextSetStyle=2701(int style,)
+
+enu FoldAction=SC_FOLDACTION_
val SC_FOLDACTION_CONTRACT=0
val SC_FOLDACTION_EXPAND=1
val SC_FOLDACTION_TOGGLE=2
@@ -1279,7 +1317,7 @@ val SC_WRAP_CHAR=2
val SC_WRAP_WHITESPACE=3
# Sets whether text is word wrapped.
-set void SetWrapMode=2268(int mode,)
+set void SetWrapMode=2268(int wrapMode,)
# Retrieve whether text is word wrapped.
get int GetWrapMode=2269(,)
@@ -1319,7 +1357,7 @@ val SC_WRAPINDENT_SAME=1
val SC_WRAPINDENT_INDENT=2
# Sets how wrapped sublines are placed. Default is fixed.
-set void SetWrapIndentMode=2472(int mode,)
+set void SetWrapIndentMode=2472(int wrapIndentMode,)
# Retrieve how wrapped sublines are placed. Default is fixed.
get int GetWrapIndentMode=2473(,)
@@ -1331,7 +1369,7 @@ val SC_CACHE_PAGE=2
val SC_CACHE_DOCUMENT=3
# Sets the degree of caching of layout information.
-set void SetLayoutCache=2272(int mode,)
+set void SetLayoutCache=2272(int cacheMode,)
# Retrieve the degree of caching of layout information.
get int GetLayoutCache=2273(,)
@@ -1366,7 +1404,7 @@ get bool GetEndAtLastLine=2278(,)
fun int TextHeight=2279(int line,)
# Show or hide the vertical scroll bar.
-set void SetVScrollBar=2280(bool show,)
+set void SetVScrollBar=2280(bool visible,)
# Is the vertical scroll bar visible?
get bool GetVScrollBar=2281(,)
@@ -1381,7 +1419,7 @@ get bool GetTwoPhaseDraw=2283(,)
# and then the foreground. This avoids chopping off characters that overlap the next run.
set void SetTwoPhaseDraw=2284(bool twoPhase,)
-enu FontQuality=SC_PHASES_
+enu PhasesDraw=SC_PHASES_
val SC_PHASES_ONE=0
val SC_PHASES_TWO=1
val SC_PHASES_MULTIPLE=2
@@ -1411,7 +1449,7 @@ set void SetFontQuality=2611(int fontQuality,)
get int GetFontQuality=2612(,)
# Scroll so that a display line is at the top of the display.
-set void SetFirstVisibleLine=2613(int lineDisplay,)
+set void SetFirstVisibleLine=2613(int displayLine,)
enu MultiPaste=SC_MULTIPASTE_
val SC_MULTIPASTE_ONCE=0
@@ -1434,8 +1472,9 @@ fun void LinesJoin=2288(,)
# where possible.
fun void LinesSplit=2289(int pixelWidth,)
-# Set the colours used as a chequerboard pattern in the fold margin
+# Set one of the colours used as a chequerboard pattern in the fold margin
fun void SetFoldMarginColour=2290(bool useSetting, colour back)
+# Set the other colour used as a chequerboard pattern in the fold margin
fun void SetFoldMarginHiColour=2291(bool useSetting, colour fore)
## New messages go here
@@ -1599,17 +1638,28 @@ fun void LineEndDisplay=2347(,)
# caret position.
fun void LineEndDisplayExtend=2348(,)
-# These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-# except they behave differently when word-wrap is enabled:
-# They go first to the start / end of the display line, like (Home|LineEnd)Display
-# The difference is that, the cursor is already at the point, it goes on to the start
-# or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
-
+# Like Home but when word-wrap is enabled goes first to start of display line
+# HomeDisplay, then to start of document line Home.
fun void HomeWrap=2349(,)
+
+# Like HomeExtend but when word-wrap is enabled extends first to start of display line
+# HomeDisplayExtend, then to start of document line HomeExtend.
fun void HomeWrapExtend=2450(,)
+
+# Like LineEnd but when word-wrap is enabled goes first to end of display line
+# LineEndDisplay, then to start of document line LineEnd.
fun void LineEndWrap=2451(,)
+
+# Like LineEndExtend but when word-wrap is enabled extends first to end of display line
+# LineEndDisplayExtend, then to start of document line LineEndExtend.
fun void LineEndWrapExtend=2452(,)
+
+# Like VCHome but when word-wrap is enabled goes first to start of display line
+# VCHomeDisplay, then behaves like VCHome.
fun void VCHomeWrap=2453(,)
+
+# Like VCHomeExtend but when word-wrap is enabled extends first to start of display line
+# VCHomeDisplayExtend, then behaves like VCHomeExtend.
fun void VCHomeWrapExtend=2454(,)
# Copy the line containing the caret.
@@ -1622,19 +1672,20 @@ fun void MoveCaretInsideView=2401(,)
fun int LineLength=2350(int line,)
# Highlight the characters at two positions.
-fun void BraceHighlight=2351(position pos1, position pos2)
+fun void BraceHighlight=2351(position posA, position posB)
# Use specified indicator to highlight matching braces instead of changing their style.
-fun void BraceHighlightIndicator=2498(bool useBraceHighlightIndicator, int indicator)
+fun void BraceHighlightIndicator=2498(bool useSetting, int indicator)
# Highlight the character at a position indicating there is no matching brace.
fun void BraceBadLight=2352(position pos,)
# Use specified indicator to highlight non matching brace instead of changing its style.
-fun void BraceBadLightIndicator=2499(bool useBraceBadLightIndicator, int indicator)
+fun void BraceBadLightIndicator=2499(bool useSetting, int indicator)
# Find the position of a matching brace or INVALID_POSITION if no match.
-fun position BraceMatch=2353(position pos,)
+# The maxReStyle must be 0 for now. It may be defined in a future release.
+fun position BraceMatch=2353(position pos, int maxReStyle)
# Are the end of line characters visible?
get bool GetViewEOL=2355(,)
@@ -1646,15 +1697,16 @@ set void SetViewEOL=2356(bool visible,)
get int GetDocPointer=2357(,)
# Change the document object used.
-set void SetDocPointer=2358(, int pointer)
+set void SetDocPointer=2358(, int doc)
# Set which document modification events are sent to the container.
-set void SetModEventMask=2359(int mask,)
+set void SetModEventMask=2359(int eventMask,)
enu EdgeVisualStyle=EDGE_
val EDGE_NONE=0
val EDGE_LINE=1
val EDGE_BACKGROUND=2
+val EDGE_MULTILINE=3
# Retrieve the column number which text should be kept within.
get int GetEdgeColumn=2360(,)
@@ -1666,9 +1718,9 @@ set void SetEdgeColumn=2361(int column,)
# Retrieve the edge highlight mode.
get int GetEdgeMode=2362(,)
-# The edge may be displayed by a line (EDGE_LINE) or by highlighting text that
+# The edge may be displayed by a line (EDGE_LINE/EDGE_MULTILINE) or by highlighting text that
# goes beyond it (EDGE_BACKGROUND) or not displayed at all (EDGE_NONE).
-set void SetEdgeMode=2363(int mode,)
+set void SetEdgeMode=2363(int edgeMode,)
# Retrieve the colour used in edge indication.
get colour GetEdgeColour=2364(,)
@@ -1676,30 +1728,41 @@ get colour GetEdgeColour=2364(,)
# Change the colour used in edge indication.
set void SetEdgeColour=2365(colour edgeColour,)
+# Add a new vertical edge to the view.
+fun void MultiEdgeAddLine=2694(int column, colour edgeColour)
+
+# Clear all vertical edges.
+fun void MultiEdgeClearAll=2695(,)
+
# Sets the current caret position to be the search anchor.
fun void SearchAnchor=2366(,)
# Find some text starting at the search anchor.
# Does not ensure the selection is visible.
-fun int SearchNext=2367(int flags, string text)
+fun int SearchNext=2367(int searchFlags, string text)
# Find some text starting at the search anchor and moving backwards.
# Does not ensure the selection is visible.
-fun int SearchPrev=2368(int flags, string text)
+fun int SearchPrev=2368(int searchFlags, string text)
# Retrieves the number of lines completely visible.
get int LinesOnScreen=2370(,)
+enu PopUp=SC_POPUP_
+val SC_POPUP_NEVER=0
+val SC_POPUP_ALL=1
+val SC_POPUP_TEXT=2
+
# Set whether a pop up menu is displayed automatically when the user presses
-# the wrong mouse button.
-fun void UsePopUp=2371(bool allowPopUp,)
+# the wrong mouse button on certain areas.
+fun void UsePopUp=2371(int popUpMode,)
# Is the selection rectangular? The alternative is the more common stream selection.
get bool SelectionIsRectangle=2372(,)
# 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.
-set void SetZoom=2373(int zoom,)
+set void SetZoom=2373(int zoomInPoints,)
# Retrieve the zoom level.
get int GetZoom=2374(,)
@@ -1727,7 +1790,7 @@ val SC_STATUS_WARN_START=1000
val SC_STATUS_WARN_REGEX=1001
# Change error status - 0 = OK.
-set void SetStatus=2382(int statusCode,)
+set void SetStatus=2382(int status,)
# Get error status.
get int GetStatus=2383(,)
@@ -1736,6 +1799,11 @@ set void SetMouseDownCaptures=2384(bool captures,)
# Get whether mouse gets captured.
get bool GetMouseDownCaptures=2385(,)
+# Set whether the mouse wheel can be active outside the window.
+set void SetMouseWheelCaptures=2696(bool captures,)
+# Get whether mouse wheel can be active outside the window.
+get bool GetMouseWheelCaptures=2697(,)
+
enu CursorShape=SC_CURSOR
val SC_CURSORNORMAL=-1
val SC_CURSORARROW=2
@@ -1777,7 +1845,7 @@ fun void DelLineLeft=2395(,)
fun void DelLineRight=2396(,)
# Get and Set the xOffset (ie, horizontal scroll position).
-set void SetXOffset=2397(int newOffset,)
+set void SetXOffset=2397(int xOffset,)
get int GetXOffset=2398(,)
# Set the last x chosen value to be the caret x position.
@@ -1819,7 +1887,7 @@ fun void SetXCaretPolicy=2402(int caretPolicy, int caretSlop)
fun void SetYCaretPolicy=2403(int caretPolicy, int caretSlop)
# Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE).
-set void SetPrintWrapMode=2406(int mode,)
+set void SetPrintWrapMode=2406(int wrapMode,)
# Is printing line wrapped?
get int GetPrintWrapMode=2407(,)
@@ -1848,10 +1916,13 @@ set void SetHotspotSingleLine=2421(bool singleLine,)
# Get the HotspotSingleLine property
get bool GetHotspotSingleLine=2497(,)
-# Move caret between paragraphs (delimited by empty lines).
+# Move caret down one paragraph (delimited by empty lines).
fun void ParaDown=2413(,)
+# Extend selection down one paragraph (delimited by empty lines).
fun void ParaDownExtend=2414(,)
+# Move caret up one paragraph (delimited by empty lines).
fun void ParaUp=2415(,)
+# Extend selection up one paragraph (delimited by empty lines).
fun void ParaUpExtend=2416(,)
# Given a valid document position, return the previous position taking code
@@ -1880,7 +1951,7 @@ val SC_SEL_THIN=3
# Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE/SC_SEL_THIN) or
# by lines (SC_SEL_LINES).
-set void SetSelectionMode=2422(int mode,)
+set void SetSelectionMode=2422(int selectionMode,)
# Get the mode of the current selection.
get int GetSelectionMode=2423(,)
@@ -1970,7 +2041,7 @@ get int AutoCGetCurrent=2445(,)
# Get currently selected item text in the auto-completion list
# Returns the length of the item text
# Result is NUL-terminated.
-get int AutoCGetCurrentText=2610(, stringresult s)
+get int AutoCGetCurrentText=2610(, stringresult text)
enu CaseInsensitiveBehaviour=SC_CASEINSENSITIVEBEHAVIOUR_
val SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE=0
@@ -2080,22 +2151,22 @@ set void SetIndicatorValue=2502(int value,)
get int GetIndicatorValue=2503(,)
# Turn a indicator on over a range.
-fun void IndicatorFillRange=2504(int position, int fillLength)
+fun void IndicatorFillRange=2504(position start, int lengthFill)
# Turn a indicator off over a range.
-fun void IndicatorClearRange=2505(int position, int clearLength)
+fun void IndicatorClearRange=2505(position start, int lengthClear)
-# Are any indicators present at position?
-fun int IndicatorAllOnFor=2506(int position,)
+# Are any indicators present at pos?
+fun int IndicatorAllOnFor=2506(position pos,)
-# What value does a particular indicator have at at a position?
-fun int IndicatorValueAt=2507(int indicator, int position)
+# What value does a particular indicator have at a position?
+fun int IndicatorValueAt=2507(int indicator, position pos)
# Where does a particular indicator start?
-fun int IndicatorStart=2508(int indicator, int position)
+fun int IndicatorStart=2508(int indicator, position pos)
# Where does a particular indicator end?
-fun int IndicatorEnd=2509(int indicator, int position)
+fun int IndicatorEnd=2509(int indicator, position pos)
# Set number of entries in position cache
set void SetPositionCache=2514(int size,)
@@ -2112,8 +2183,8 @@ get int GetCharacterPointer=2520(,)
# 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.
-get int GetRangePointer=2643(int position, int rangeLength)
+# to lengthRange bytes.
+get int GetRangePointer=2643(position start, int lengthRange)
# Return a position which, to avoid performance costs, should not be within
# the range of a call to GetRangePointer.
@@ -2268,7 +2339,7 @@ set void SetAdditionalCaretsBlink=2567(bool additionalCaretsBlink,)
get bool GetAdditionalCaretsBlink=2568(,)
# Set whether additional carets are visible
-set void SetAdditionalCaretsVisible=2608(bool additionalCaretsBlink,)
+set void SetAdditionalCaretsVisible=2608(bool additionalCaretsVisible,)
# Whether additional carets are visible
get bool GetAdditionalCaretsVisible=2609(,)
@@ -2283,10 +2354,10 @@ get bool GetSelectionEmpty=2650(,)
fun void ClearSelections=2571(,)
# Set a simple selection
-fun int SetSelection=2572(int caret, int anchor)
+fun int SetSelection=2572(position caret, position anchor)
# Add a selection
-fun int AddSelection=2573(int caret, int anchor)
+fun int AddSelection=2573(position caret, position anchor)
# Drop one selection
fun void DropSelectionN=2671(int selection,)
@@ -2297,42 +2368,61 @@ set void SetMainSelection=2574(int selection,)
# Which selection is the main selection
get int GetMainSelection=2575(,)
-set void SetSelectionNCaret=2576(int selection, position pos)
+# Set the caret position of the nth selection.
+set void SetSelectionNCaret=2576(int selection, position caret)
+# Return the caret position of the nth selection.
get position GetSelectionNCaret=2577(int selection,)
-set void SetSelectionNAnchor=2578(int selection, position posAnchor)
+# Set the anchor position of the nth selection.
+set void SetSelectionNAnchor=2578(int selection, position anchor)
+# Return the anchor position of the nth selection.
get position GetSelectionNAnchor=2579(int selection,)
+# Set the virtual space of the caret of the nth selection.
set void SetSelectionNCaretVirtualSpace=2580(int selection, int space)
+# Return the virtual space of the caret of the nth selection.
get int GetSelectionNCaretVirtualSpace=2581(int selection,)
+# Set the virtual space of the anchor of the nth selection.
set void SetSelectionNAnchorVirtualSpace=2582(int selection, int space)
+# Return the virtual space of the anchor of the nth selection.
get int GetSelectionNAnchorVirtualSpace=2583(int selection,)
# Sets the position that starts the selection - this becomes the anchor.
-set void SetSelectionNStart=2584(int selection, position pos)
+set void SetSelectionNStart=2584(int selection, position anchor)
# Returns the position at the start of the selection.
get position GetSelectionNStart=2585(int selection,)
# Sets the position that ends the selection - this becomes the currentPosition.
-set void SetSelectionNEnd=2586(int selection, position pos)
+set void SetSelectionNEnd=2586(int selection, position caret)
# Returns the position at the end of the selection.
get position GetSelectionNEnd=2587(int selection,)
-set void SetRectangularSelectionCaret=2588(position pos,)
+# Set the caret position of the rectangular selection.
+set void SetRectangularSelectionCaret=2588(position caret,)
+# Return the caret position of the rectangular selection.
get position GetRectangularSelectionCaret=2589(,)
-set void SetRectangularSelectionAnchor=2590(position posAnchor,)
+# Set the anchor position of the rectangular selection.
+set void SetRectangularSelectionAnchor=2590(position anchor,)
+# Return the anchor position of the rectangular selection.
get position GetRectangularSelectionAnchor=2591(,)
+# Set the virtual space of the caret of the rectangular selection.
set void SetRectangularSelectionCaretVirtualSpace=2592(int space,)
+# Return the virtual space of the caret of the rectangular selection.
get int GetRectangularSelectionCaretVirtualSpace=2593(,)
+# Set the virtual space of the anchor of the rectangular selection.
set void SetRectangularSelectionAnchorVirtualSpace=2594(int space,)
+# Return the virtual space of the anchor of the rectangular selection.
get int GetRectangularSelectionAnchorVirtualSpace=2595(,)
enu VirtualSpace=SCVS_
val SCVS_NONE=0
val SCVS_RECTANGULARSELECTION=1
val SCVS_USERACCESSIBLE=2
+val SCVS_NOWRAPLINESTART=4
+# Set options for virtual space behaviour.
set void SetVirtualSpaceOptions=2596(int virtualSpaceOptions,)
+# Return options for virtual space behaviour.
get int GetVirtualSpaceOptions=2597(,)
# On GTK+, allow selecting the modifier key to use for mouse-based
@@ -2509,7 +2599,7 @@ set void SetProperty=4004(string key, string value)
val KEYWORDSET_MAX=8
# Set up the key words used by the lexer.
-set void SetKeyWords=4005(int keywordSet, string keyWords)
+set void SetKeyWords=4005(int keyWordSet, string keyWords)
# Set the lexing language of the document based on string name.
set void SetLexerLanguage=4006(, string language)
@@ -2519,16 +2609,16 @@ fun void LoadLexerLibrary=4007(, string path)
# Retrieve a "property" value previously set with SetProperty.
# Result is NUL-terminated.
-get int GetProperty=4008(string key, stringresult buf)
+get int GetProperty=4008(string key, stringresult value)
# Retrieve a "property" value previously set with SetProperty,
# with "$()" variable replacement on returned buffer.
# Result is NUL-terminated.
-get int GetPropertyExpanded=4009(string key, stringresult buf)
+get int GetPropertyExpanded=4009(string key, stringresult value)
# Retrieve a "property" value previously set with SetProperty,
# interpreted as an int AFTER any "$()" variable replacement.
-get int GetPropertyInt=4010(string key,)
+get int GetPropertyInt=4010(string key, int defaultValue)
# Retrieve the number of bits the current lexer needs for styling.
get int GetStyleBitsNeeded=4011(,)
@@ -2536,7 +2626,7 @@ get int GetStyleBitsNeeded=4011(,)
# Retrieve the name of the lexer.
# Return the length of the text.
# Result is NUL-terminated.
-get int GetLexerLanguage=4012(, stringresult text)
+get int GetLexerLanguage=4012(, stringresult language)
# For private communication between an application and a known lexer.
fun int PrivateLexerCall=4013(int operation, int pointer)
@@ -2800,6 +2890,7 @@ val SCLEX_SREC=117
val SCLEX_IHEX=118
val SCLEX_TEHEX=119
val SCLEX_JSON=120
+val SCLEX_EDIFACT=121
# When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
# value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -3332,6 +3423,20 @@ val SCE_BAAN_OPERATOR=7
val SCE_BAAN_IDENTIFIER=8
val SCE_BAAN_STRINGEOL=9
val SCE_BAAN_WORD2=10
+val SCE_BAAN_WORD3=11
+val SCE_BAAN_WORD4=12
+val SCE_BAAN_WORD5=13
+val SCE_BAAN_WORD6=14
+val SCE_BAAN_WORD7=15
+val SCE_BAAN_WORD8=16
+val SCE_BAAN_WORD9=17
+val SCE_BAAN_TABLEDEF=18
+val SCE_BAAN_TABLESQL=19
+val SCE_BAAN_FUNCTION=20
+val SCE_BAAN_DOMDEF=21
+val SCE_BAAN_FUNCDEF=22
+val SCE_BAAN_OBJECTDEF=23
+val SCE_BAAN_DEFINEDEF=24
# Lexical states for SCLEX_LISP
lex Lisp=SCLEX_LISP SCE_LISP_
val SCE_LISP_DEFAULT=0
@@ -4106,39 +4211,20 @@ val SCE_PLM_OPERATOR=5
val SCE_PLM_CONTROL=6
val SCE_PLM_KEYWORD=7
# Lexical state for SCLEX_PROGRESS
-lex Progress=SCLEX_PROGRESS SCE_4GL_
-val SCE_4GL_DEFAULT=0
-val SCE_4GL_NUMBER=1
-val SCE_4GL_WORD=2
-val SCE_4GL_STRING=3
-val SCE_4GL_CHARACTER=4
-val SCE_4GL_PREPROCESSOR=5
-val SCE_4GL_OPERATOR=6
-val SCE_4GL_IDENTIFIER=7
-val SCE_4GL_BLOCK=8
-val SCE_4GL_END=9
-val SCE_4GL_COMMENT1=10
-val SCE_4GL_COMMENT2=11
-val SCE_4GL_COMMENT3=12
-val SCE_4GL_COMMENT4=13
-val SCE_4GL_COMMENT5=14
-val SCE_4GL_COMMENT6=15
-val SCE_4GL_DEFAULT_=16
-val SCE_4GL_NUMBER_=17
-val SCE_4GL_WORD_=18
-val SCE_4GL_STRING_=19
-val SCE_4GL_CHARACTER_=20
-val SCE_4GL_PREPROCESSOR_=21
-val SCE_4GL_OPERATOR_=22
-val SCE_4GL_IDENTIFIER_=23
-val SCE_4GL_BLOCK_=24
-val SCE_4GL_END_=25
-val SCE_4GL_COMMENT1_=26
-val SCE_4GL_COMMENT2_=27
-val SCE_4GL_COMMENT3_=28
-val SCE_4GL_COMMENT4_=29
-val SCE_4GL_COMMENT5_=30
-val SCE_4GL_COMMENT6_=31
+lex Progress=SCLEX_PROGRESS SCE_ABL_
+val SCE_ABL_DEFAULT=0
+val SCE_ABL_NUMBER=1
+val SCE_ABL_WORD=2
+val SCE_ABL_STRING=3
+val SCE_ABL_CHARACTER=4
+val SCE_ABL_PREPROCESSOR=5
+val SCE_ABL_OPERATOR=6
+val SCE_ABL_IDENTIFIER=7
+val SCE_ABL_BLOCK=8
+val SCE_ABL_END=9
+val SCE_ABL_COMMENT=10
+val SCE_ABL_TASKMARKER=11
+val SCE_ABL_LINECOMMENT=12
# Lexical states for SCLEX_ABAQUS
lex ABAQUS=SCLEX_ABAQUS SCE_ABAQUS_
val SCE_ABAQUS_DEFAULT=0
@@ -4694,6 +4780,16 @@ val SCE_JSON_COMPACTIRI=10
val SCE_JSON_KEYWORD=11
val SCE_JSON_LDKEYWORD=12
val SCE_JSON_ERROR=13
+lex EDIFACT=SCLEX_EDIFACT SCE_EDI_
+val SCE_EDI_DEFAULT=0
+val SCE_EDI_SEGMENTSTART=1
+val SCE_EDI_SEGMENTEND=2
+val SCE_EDI_SEP_ELEMENT=3
+val SCE_EDI_SEP_COMPOSITE=4
+val SCE_EDI_SEP_RELEASE=5
+val SCE_EDI_UNA=6
+val SCE_EDI_UNH=7
+val SCE_EDI_BADSEGMENT=8
# Events
@@ -4728,6 +4824,7 @@ evt void HotSpotReleaseClick=2027(int modifiers, int position)
evt void FocusIn=2028(void)
evt void FocusOut=2029(void)
evt void AutoCCompleted=2030(string text, int position, int ch, CompletionMethods listCompletionMethod)
+evt void MarginRightClick=2031(int modifiers, int position, int margin)
# There are no provisional APIs currently, but some arguments to SCI_SETTECHNOLOGY are provisional.
@@ -4735,19 +4832,6 @@ cat Provisional
cat Deprecated
-# Deprecated in 2.21
-# The SC_CP_DBCS value can be used to indicate a DBCS mode for GTK+.
-val SC_CP_DBCS=1
-
-# Deprecated in 2.30
-
-# In palette mode?
-get bool GetUsePalette=2139(,)
-
-# In palette mode, Scintilla uses the environment's palette calls to display
-# more colours. This may lead to ugly displays.
-set void SetUsePalette=2039(bool usePalette,)
-
# Deprecated in 3.5.5
# Always interpret keyboard input as Unicode
diff --git a/src/stc/scintilla/lexers/LexAbaqus.cxx b/src/stc/scintilla/lexers/LexAbaqus.cxx
index 509d89a0ae..5f265c7228 100644
--- a/src/stc/scintilla/lexers/LexAbaqus.cxx
+++ b/src/stc/scintilla/lexers/LexAbaqus.cxx
@@ -581,14 +581,14 @@ WordList *[], Accessor &styler) {
for ( Sci_Position ll = beginData; ll < beginComment; ll++ )
SafeSetLevel(ll, datLevel, styler) ;
- if ( prvKeyLineTp == 5 ) {
- level += 1 ;
- }
+ if ( prvKeyLineTp == 5 ) {
+ level += 1 ;
+ }
- if ( prvKeyLineTp == 6 ) {
- level -= 1 ;
- }
- for ( Sci_Position m = beginComment; m <= endLine; m++ )
+ if ( prvKeyLineTp == 6 ) {
+ level -= 1 ;
+ }
+ for ( Sci_Position m = beginComment; m <= endLine; m++ )
SafeSetLevel(m, level, styler) ;
}
diff --git a/src/stc/scintilla/lexers/LexBaan.cxx b/src/stc/scintilla/lexers/LexBaan.cxx
index 8da2f3a3e7..4587ecc4fb 100644
--- a/src/stc/scintilla/lexers/LexBaan.cxx
+++ b/src/stc/scintilla/lexers/LexBaan.cxx
@@ -1,134 +1,702 @@
// Scintilla source code edit control
/** @file LexBaan.cxx
- ** Lexer for Baan.
- ** Based heavily on LexCPP.cxx
- **/
+** Lexer for Baan.
+** Based heavily on LexCPP.cxx
+**/
// Copyright 2001- by Vamsi Potluru & Praveen Ambekar
// The License.txt file describes the conditions under which this software may be distributed.
+// C standard library
#include
#include
-#include
-#include
-#include
-#include
+// C++ wrappers of C standard library
+#include
+
+// C++ standard library
+#include
+#include