aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc/ScintillaDoc.html20
1 files changed, 8 insertions, 12 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 460ee7f7a..49e62bbf0 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -2606,13 +2606,6 @@ struct TextToFind {
<code>SC_MARK_ARROWS</code>, <code>SC_MARK_DOTDOTDOT</code>, <code>SC_MARK_EMPTY</code>,
<code>SC_MARK_BACKGROUND</code> and <code>SC_MARK_FULLRECT</code>.</p>
- <p><b id="SCI_MARKERDEFINEPIXMAP">SCI_MARKERDEFINEPIXMAP(int markerNumber, const char
- *xpm)</b><br />
- Markers can be set to pixmaps with this message. The XPM format is used for the pixmap and it
- is limited to pixmaps that use one character per pixel. The data should be null terminated.
- Pixmaps use the <code>SC_MARK_PIXMAP</code> marker symbol. You can find the full description of
- the XPM format <a class="jump" href="http://koala.ilog.fr/lehors/xpm.html">here</a>.</p>
-
<p>The <code>SC_MARK_BACKGROUND</code> marker changes the background colour of the line only.
The <code>SC_MARK_FULLRECT</code> symbol mirrors this, changing only the margin background colour.
The <code>SC_MARK_EMPTY</code> symbol is invisible, allowing client code to track the movement
@@ -2627,14 +2620,10 @@ struct TextToFind {
<code>SC_MARK_CIRCLEPLUS</code>, <code>SC_MARK_CIRCLEPLUSCONNECTED</code>,
<code>SC_MARK_LCORNER</code>, <code>SC_MARK_LCORNERCURVE</code>, <code>SC_MARK_TCORNER</code>,
<code>SC_MARK_TCORNERCURVE</code>, and <code>SC_MARK_VLINE</code>.</p>
- <br />
- <br />
Characters can be used as markers by adding the ASCII value of the character to
<code>SC_MARK_CHARACTER</code> (10000). For example, to use 'A' (ASCII code 65) as marker
number 1 use:<br />
- <code>SCI_MARKETDEFINE(1, SC_MARK_CHARACTER+65)</code>. <br />
- <br />
-
+ <code>SCI_MARKERDEFINE(1, SC_MARK_CHARACTER+65)</code>. <br />
<p>The marker numbers <code>SC_MARKNUM_FOLDER</code> and <code>SC_MARKNUM_FOLDEROPEN</code> are
used for showing that a fold is present and open or closed. Any symbols may be assigned for
@@ -2754,6 +2743,13 @@ struct TextToFind {
</tbody>
</table>
+ <p><b id="SCI_MARKERDEFINEPIXMAP">SCI_MARKERDEFINEPIXMAP(int markerNumber, const char
+ *xpm)</b><br />
+ Markers can be set to pixmaps with this message. The XPM format is used for the pixmap and it
+ is limited to pixmaps that use one character per pixel. The data should be null terminated.
+ Pixmaps use the <code>SC_MARK_PIXMAP</code> marker symbol. You can find the full description of
+ the XPM format <a class="jump" href="http://koala.ilog.fr/lehors/xpm.html">here</a>.</p>
+
<p><b id="SCI_MARKERSETFORE">SCI_MARKERSETFORE(int markerNumber, int <a class="jump"
href="#colour">colour</a>)</b><br />
<b id="SCI_MARKERSETBACK">SCI_MARKERSETBACK(int markerNumber, int <a class="jump"