Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the bundled Scintilla version to 3.4.1.

Browse Source 
There are relatively few changes, see Scintilla changelog at
http://www.scintilla.org/ScintillaHistory.html

Closes #16182.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-10-19 12:57:22 +00:00
parent 6c40531fb7
commit a3cf902002
28 changed files with 334 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/stc/stc.cpp
View File

@@ -820,7 +820,7 @@ int wxStyledTextCtrl::StyleGetCase(int style) const
return SendMsg(SCI_STYLEGETCASE, style, 0);
}
// Get the character set of the font in a style.
// Get the character get of the font in a style.
int wxStyledTextCtrl::StyleGetCharacterSet(int style) const
{
return SendMsg(SCI_STYLEGETCHARACTERSET, style, 0);
@@ -2237,7 +2237,7 @@ void wxStyledTextCtrl::AppendText(const wxString& text) {
SendMsg(SCI_APPENDTEXT, wx2stclen(text, buf), (sptr_t)(const char*)buf);
}
// Is drawing done in two phases with backgrounds drawn before foregrounds?
// Is drawing done in two phases with backgrounds drawn before faoregrounds?
bool wxStyledTextCtrl::GetTwoPhaseDraw() const
{
return SendMsg(SCI_GETTWOPHASEDRAW, 0, 0) != 0;
@@ -4123,13 +4123,31 @@ void wxStyledTextCtrl::SetCaretLineVisibleAlways(bool alwaysVisible)
SendMsg(SCI_SETCARETLINEVISIBLEALWAYS, alwaysVisible, 0);
}
// Set the line end types that the application wants to use. May not be used if incompatible with lexer or encoding.
void wxStyledTextCtrl::SetLineEndTypesAllowed(int lineEndBitSet)
{
SendMsg(SCI_SETLINEENDTYPESALLOWED, lineEndBitSet, 0);
}
// Get the line end types currently allowed.
int wxStyledTextCtrl::GetLineEndTypesAllowed() const
{
return SendMsg(SCI_GETLINEENDTYPESALLOWED, 0, 0);
}
// Get the line end types currently recognised. May be a subset of the allowed types due to lexer limitation.
int wxStyledTextCtrl::GetLineEndTypesActive() const
{
return SendMsg(SCI_GETLINEENDTYPESACTIVE, 0, 0);
}
// Set the way a character is drawn.
void wxStyledTextCtrl::SetRepresentation(const wxString& encodedCharacter, const wxString& representation)
{
SendMsg(SCI_SETREPRESENTATION, (sptr_t)(const char*)wx2stc(encodedCharacter), (sptr_t)(const char*)wx2stc(representation));
}
// Get the way a character is drawn.
// Set the way a character is drawn.
wxString wxStyledTextCtrl::GetRepresentation(const wxString& encodedCharacter) const {
int msg = SCI_GETREPRESENTATION;
int len = SendMsg(msg, (sptr_t)(const char*)wx2stc(encodedCharacter), (sptr_t)NULL);
@@ -4290,24 +4308,6 @@ wxString wxStyledTextCtrl::DescribeKeyWordSets() const {
return stc2wx(buf);
}
// Set the line end types that the application wants to use. May not be used if incompatible with lexer or encoding.
void wxStyledTextCtrl::SetLineEndTypesAllowed(int lineEndBitSet)
{
SendMsg(SCI_SETLINEENDTYPESALLOWED, lineEndBitSet, 0);
}
// Get the line end types currently allowed.
int wxStyledTextCtrl::GetLineEndTypesAllowed() const
{
return SendMsg(SCI_GETLINEENDTYPESALLOWED, 0, 0);
}
// Get the line end types currently recognised. May be a subset of the allowed types due to lexer limitation.
int wxStyledTextCtrl::GetLineEndTypesActive() const
{
return SendMsg(SCI_GETLINEENDTYPESACTIVE, 0, 0);
}
// Bit set of LineEndType enumertion for which line ends beyond the standard
// LF, CR, and CRLF are supported by the lexer.
int wxStyledTextCtrl::GetLineEndTypesSupported() const
@@ -4903,9 +4903,6 @@ void wxStyledTextCtrl::OnSize(wxSizeEvent& WXUNUSED(evt)) {
if (m_swx) {
wxSize sz = GetClientSize();
m_swx->DoSize(sz.x, sz.y);
#if defined(__WXX11__)
PositionScrollbars();
#endif
}
}
@@ -5320,7 +5317,7 @@ wxStyledTextEvent::wxStyledTextEvent(const wxStyledTextEvent& event):
/*static*/ wxVersionInfo wxStyledTextCtrl::GetLibraryVersionInfo()
{
return wxVersionInfo("Scintilla", 3, 3, 9, "Scintilla 3.3.9");
return wxVersionInfo("Scintilla", 3, 4, 1, "Scintilla 3.4.1");
}
#endif // wxUSE_STC