From cfe3c049555422cbc7dcf3fd2fadad2f08487dd7 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Thu, 29 Sep 2016 13:33:35 +1000
Subject: Margin type SC_MARGIN_COLOUR and API SCI_SETMARGINBACKN added. Allows
 choosing any colour for a margin.

---
 doc/ScintillaDoc.html     | 12 ++++++++++--
 doc/ScintillaHistory.html |  4 ++++
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index b348a68b7..3ebf00919 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -3172,6 +3172,8 @@ struct Sci_TextToFind {
     cursor)</a><br />
      <a class="message" href="#SCI_GETMARGINCURSORN">SCI_GETMARGINCURSORN(int
     margin)</a><br />
+     <a class="message" href="#SCI_SETMARGINBACKN">SCI_SETMARGINBACKN(int margin, int colour)</a><br />
+     <a class="message" href="#SCI_GETMARGINBACKN">SCI_GETMARGINBACKN(int margin)</a><br />
      <a class="message" href="#SCI_SETMARGINLEFT">SCI_SETMARGINLEFT(&lt;unused&gt;, int
     pixels)</a><br />
      <a class="message" href="#SCI_GETMARGINLEFT">SCI_GETMARGINLEFT</a><br />
@@ -3201,9 +3203,10 @@ struct Sci_TextToFind {
     A margin with application defined text may use <code>SC_MARGIN_TEXT</code> (4) or
     <code>SC_MARGIN_RTEXT</code> (5) to right justify the text.
     By convention, margin 0 is used for line numbers and the next two are used for symbols. You can
-    also use the constants <code>SC_MARGIN_BACK</code> (2) and <code>SC_MARGIN_FORE</code> (3) for
+    also use the constants <code>SC_MARGIN_BACK</code> (2), <code>SC_MARGIN_FORE</code> (3),
+    and <code>SC_MARGIN_COLOUR</code> (6) for
     symbol margins that set their background colour to match the STYLE_DEFAULT background and
-    foreground colours.</p>
+    foreground colours or a specified colour.</p>
 
     <p><b id="SCI_SETMARGINWIDTHN">SCI_SETMARGINWIDTHN(int margin, int pixelWidth)</b><br />
      <b id="SCI_GETMARGINWIDTHN">SCI_GETMARGINWIDTHN(int margin)</b><br />
@@ -3259,6 +3262,11 @@ struct Sci_TextToFind {
      reversed arrow with
      <code>SCI_SETMARGINCURSORN(margin, SC_CURSORREVERSEARROW)</code>.</p>
 
+    <p><b id="SCI_SETMARGINBACKN">SCI_SETMARGINBACKN(int margin, int <a class="jump" href="#colour">colour</a>)</b><br />
+     <b id="SCI_GETMARGINBACKN">SCI_GETMARGINBACKN(int margin)</b><br />
+     A margin of type <code>SC_MARGIN_COLOUR</code>
+     may have its colour set with <code>SCI_SETMARGINBACKN</code>.</p>
+
     <p><b id="SCI_SETMARGINLEFT">SCI_SETMARGINLEFT(&lt;unused&gt;, int pixels)</b><br />
      <b id="SCI_GETMARGINLEFT">SCI_GETMARGINLEFT</b><br />
      <b id="SCI_SETMARGINRIGHT">SCI_SETMARGINRIGHT(&lt;unused&gt;, int pixels)</b><br />
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 16cad92ee..96de2872e 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -531,6 +531,10 @@
 	vertical edges simultaneously.
 	<li>
 	<li>
+	Margin type SC_MARGIN_COLOUR added so that the application may
+	choose any colour for a margin with SCI_SETMARGINBACKN.
+	<li>
+	<li>
 	On Win32, mouse wheel scrolling can be restricted to only occur when the mouse is
 	within the window.
 	<li>
-- 
cgit v1.2.3