From 977371ca0595af895bf255b135292e12f80eff01 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Thu, 2 Apr 2009 07:51:33 +0000
Subject: Method to find the symbol defined for a marker number.
 SC_MARK_AVAILABLE defined.

---
 doc/ScintillaDoc.html   | 10 ++++++++++
 include/Scintilla.h     |  1 +
 include/Scintilla.iface |  4 ++++
 src/Editor.cxx          |  7 +++++++
 4 files changed, 22 insertions(+)

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 67524b6f8..cf869e1c0 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -2772,6 +2772,8 @@ struct TextToFind {
     markerSymbols)</a><br />
      <a class="message" href="#SCI_MARKERDEFINEPIXMAP">SCI_MARKERDEFINEPIXMAP(int markerNumber,
     const char *xpm)</a><br />
+     <a class="message" href="#SCI_MARKERSYMBOLDEFINED">SCI_MARKERSYMBOLDEFINED(int markerNumber)
+     </a><br />
      <a class="message" href="#SCI_MARKERSETFORE">SCI_MARKERSETFORE(int markerNumber, int
     colour)</a><br />
      <a class="message" href="#SCI_MARKERSETBACK">SCI_MARKERSETBACK(int markerNumber, int
@@ -2808,6 +2810,10 @@ struct TextToFind {
     The <code>SC_MARK_EMPTY</code> symbol is invisible, allowing client code to track the movement
     of lines. You would also use it if you changed the folding style and wanted one or more of the
     <code>SC_FOLDERNUM_</code>* markers to have no associated symbol.</p>
+    
+    <p>Applications may use the marker symbol <code>SC_MARK_AVAILABLE</code> to indicate that 
+    plugins may allocate that marker number.
+    </p>
 
     <p>There are also marker symbols designed for use in the folding margin in a flattened tree
     style.<br />
@@ -2949,6 +2955,10 @@ struct TextToFind {
     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_MARKERSYMBOLDEFINED">SCI_MARKERSYMBOLDEFINED(int markerNumber)</b><br />
+     Returns the symbol defined for a markerNumber with <code>SCI_MARKERDEFINE</code> 
+     or <code>SC_MARK_PIXMAP</code> if defined with <code>SCI_MARKERDEFINEPIXMAP</code>.</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"
diff --git a/include/Scintilla.h b/include/Scintilla.h
index 3edb6da41..6c3509344 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -677,6 +677,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_GETEXTRAASCENT 2526
 #define SCI_SETEXTRADESCENT 2527
 #define SCI_GETEXTRADESCENT 2528
+#define SCI_MARKERSYMBOLDEFINED 2529
 #define SCI_STARTRECORD 3001
 #define SCI_STOPRECORD 3002
 #define SCI_SETLEXER 4001
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 166d37d2a..ed31a803e 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -269,6 +269,7 @@ val SC_MARK_ARROWS=24
 val SC_MARK_PIXMAP=25
 val SC_MARK_FULLRECT=26
 val SC_MARK_LEFTRECT=27
+val SC_MARK_AVAILABLE=28
 
 val SC_MARK_CHARACTER=10000
 
@@ -1828,6 +1829,9 @@ set void SetExtraDescent=2527(int extraDescent,)
 # Get extra descent for each line
 get int GetExtraDescent=2528(,)
 
+# Which symbol was defined for markerNumber with MarkerDefine
+fun int MarkerSymbolDefined=2529(int markerNumber,)
+
 # Start notifying the container of all key presses and commands.
 fun void StartRecord=3001(,)
 
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 78e0429d4..7ba26bb53 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -6819,6 +6819,13 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		InvalidateStyleData();
 		RedrawSelMargin();
 		break;
+
+	case SCI_MARKERSYMBOLDEFINED:
+		if (wParam <= MARKER_MAX)
+			return vs.markers[wParam].markType;
+		else
+			return 0;
+
 	case SCI_MARKERSETFORE:
 		if (wParam <= MARKER_MAX)
 			vs.markers[wParam].fore.desired = ColourDesired(lParam);
-- 
cgit v1.2.3