aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc
diff options
context:
space:
mode:
authorJustin Dailey <unknown>2017-07-09 10:25:15 +1000
committerJustin Dailey <unknown>2017-07-09 10:25:15 +1000
commit534d196395a1ee9f6667d032dbd9ae02e8eb0b9d (patch)
tree1470ec7f3bd58760993d112d3b4ed4287f42da9e /doc
parent403011f8e0d24df6a257f2d43b431f0fd3b1740f (diff)
downloadscintilla-mirror-534d196395a1ee9f6667d032dbd9ae02e8eb0b9d.tar.gz
Backport: Bug [#1955]. The data parameter to ILoader::AddData made const.
Backport of changeset 6340:52f12c3eebcd.
Diffstat (limited to 'doc')
-rw-r--r--doc/ScintillaDoc.html2
-rw-r--r--doc/ScintillaHistory.html4
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index e28cffaaf..2679975dc 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -5763,7 +5763,7 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
<span class="S5">public</span><span class="S10">:</span><br />
<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>Release<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S2">// Returns a status code from SC_STATUS_*</span><br />
-<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>AddData<span class="S10">(</span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>data<span class="S10">,</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>length<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
+<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">int</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>AddData<span class="S10">(</span><span class="S5">const</span><span class="S0"> </span><span class="S5">char</span><span class="S0"> </span><span class="S10">*</span>data<span class="S10">,</span><span class="S0"> </span>Sci_Position<span class="S0"> </span>length<span class="S10">)</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
<span class="S0">&nbsp; &nbsp; &nbsp; &nbsp; </span><span class="S5">virtual</span><span class="S0"> </span><span class="S5">void</span><span class="S0"> </span><span class="S10">*</span><span class="S0"> </span>SCI_METHOD<span class="S0"> </span>ConvertToDocument<span class="S10">()</span><span class="S0"> </span><span class="S10">=</span><span class="S0"> </span><span class="S4">0</span><span class="S10">;</span><br />
<span class="S10">};</span><br />
</div>
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 76f7149cd..874497f7a 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -539,6 +539,10 @@
An SCN_AUTOCSELECTIONCHANGE notification is sent when items are highlighted in an autocompletion or user list.
</li>
<li>
+ The data parameter to ILoader::AddData made const.
+ <a href="http://sourceforge.net/p/scintilla/bugs/1955/">Bug #1955</a>.
+ </li>
+ <li>
The Matlab lexer treats 'end' as a number rather than a keyword when used as a index.
This also stops incorrect folding.
<a href="http://sourceforge.net/p/scintilla/bugs/1951/">Bug #1951</a>.