From be86b31a7085c1ed73ee34e3e25ebb1458064e8c Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sat, 29 Mar 2025 09:50:04 +1100
Subject: Bug [#2469]. Return enumeration type from MarkerSymbolDefined to
 match MarkerDefine.

---
 call/ScintillaCall.cxx    | 4 ++--
 doc/ScintillaHistory.html | 4 ++++
 include/Scintilla.iface   | 2 +-
 include/ScintillaCall.h   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/call/ScintillaCall.cxx b/call/ScintillaCall.cxx
index 57b050805..662bb9406 100644
--- a/call/ScintillaCall.cxx
+++ b/call/ScintillaCall.cxx
@@ -2819,8 +2819,8 @@ int ScintillaCall::ExtraDescent() {
 	return static_cast<int>(Call(Message::GetExtraDescent));
 }
 
-int ScintillaCall::MarkerSymbolDefined(int markerNumber) {
-	return static_cast<int>(Call(Message::MarkerSymbolDefined, markerNumber));
+MarkerSymbol ScintillaCall::MarkerSymbolDefined(int markerNumber) {
+	return static_cast<Scintilla::MarkerSymbol>(Call(Message::MarkerSymbolDefined, markerNumber));
 }
 
 void ScintillaCall::MarginSetText(Line line, const char *text) {
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index b9ff5bb30..7451706ea 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -605,6 +605,10 @@
 	<a href="https://sourceforge.net/p/scintilla/bugs/2463/">Bug #2463</a>.
 	</li>
 	<li>
+	Return enumeration type from MarkerSymbolDefined to match MarkerDefine.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2469/">Bug #2469</a>.
+	</li>
+	<li>
 	On Win32, use DirectWrite for autocompletion lists when DirectWrite chosen for document text.
 	</li>
 	<li>
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index f32148b69..e1814eb5a 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -2755,7 +2755,7 @@ set void SetExtraDescent=2527(int extraDescent,)
 get int GetExtraDescent=2528(,)
 
 # Which symbol was defined for markerNumber with MarkerDefine
-fun int MarkerSymbolDefined=2529(int markerNumber,)
+fun MarkerSymbol MarkerSymbolDefined=2529(int markerNumber,)
 
 # Set the text in the text margin for a line
 set void MarginSetText=2530(line line, string text)
diff --git a/include/ScintillaCall.h b/include/ScintillaCall.h
index 345d15612..b31978725 100644
--- a/include/ScintillaCall.h
+++ b/include/ScintillaCall.h
@@ -750,7 +750,7 @@ public:
 	int ExtraAscent();
 	void SetExtraDescent(int extraDescent);
 	int ExtraDescent();
-	int MarkerSymbolDefined(int markerNumber);
+	Scintilla::MarkerSymbol MarkerSymbolDefined(int markerNumber);
 	void MarginSetText(Line line, const char *text);
 	int MarginGetText(Line line, char *text);
 	std::string MarginGetText(Line line);
-- 
cgit v1.2.3