Updated PJ Naughter's CScintillaCtrl library to the latest version available.

Signed-off-by: Stefan-Mihai MOGA <stefan-mihai@moga.doctor>

Author: mihaimoga

IntelliFile.rc

@@ -201,6 +201,11 @@ <h2>History</h2>
                                 <li>Updated PJ Naughter's <code>CScintillaCtrl</code> library to the latest version available. <blockquote>Updated class to work with Scintilla v5.5.5. New messages wrapped include: <code>SCI_SETUNDOSELECTIONHISTORY</code>, <code>SCI_GETUNDOSELECTIONHISTORY</code>, <code>SCI_GETSELECTIONSERIALIZED</code> and <code>SCI_SETSELECTIONSERIALIZED</code>.</blockquote></li>
                             </ul>
                         </li>
+                        <li>Version 1.39 (April 12<sup>th</sup>, 2025):
+                            <ul>
+                                <li>Updated PJ Naughter's <code>CScintillaCtrl</code> library to the latest version available. <blockquote>Updated <code>CScintillaCtrl:: MarkerSymbolDefined</code> method to return <code>MarkerSymbol</code>.</blockquote></li>
+                            </ul>
+                        </li>
                     </ul>
                 </div>
             </div>

ReleaseNotes.html

@@ -329,6 +329,8 @@ History: PJN / 19-03-2004 1. Initial implementation synchronized to the v1.59 re
          PJN / 21-12-2024 1. Verified the code against Scintilla v5.5.4.
          PJN / 16-03-2025 1. Updated class to work with Scintilla v5.5.5. New messages wrapped include: SCI_SETUNDOSELECTIONHISTORY,
                           SCI_GETUNDOSELECTIONHISTORY, SCI_GETSELECTIONSERIALIZED and SCI_SETSELECTIONSERIALIZED.
+         PJN / 11-04-2025 1. Updated CScintillaCtrl::MarkerSymbolDefined method to return MarkerSymbol.
+                          2. Verified the code against Scintilla v5.5.6.
 
 Copyright (c) 2004 - 2025 by PJ Naughter (Web: www.naughter.com, Email: pjna@naughter.com)
 
@@ -657,6 +659,20 @@ CScintillaCtrl::StringW CScintillaCtrl::GetLine(_In_ Line line)
 	return UTF82W(sUTF8, -1);
 }
 
+CScintillaCtrl::StringW CScintillaCtrl::GetSelectionSerialized()
+{
+	//Work out the length of string to allocate
+	const Position nUTF8Length{ GetSelectionSerialized(nullptr) };
+
+	//Call the function which does the work
+	StringA sUTF8;
+#pragma warning(suppress: 26472)
+	GetSelectionSerialized(sUTF8.GetBufferSetLength(static_cast<int>(nUTF8Length)));
+	sUTF8.ReleaseBuffer();
+
+	return UTF82W(sUTF8, -1);
+}
+
 void CScintillaCtrl::ReplaceSel(_In_z_ const wchar_t* text)
 {
 	//Convert the unicode text to UTF8
@@ -1332,6 +1348,18 @@ CScintillaCtrl::StringA CScintillaCtrl::GetLine(_In_ Line line)
 	return sLine;
 }
 
+CScintillaCtrl::StringA CScintillaCtrl::GetSelectionSerialized()
+{
+	//Call the function which does the work
+	StringA sSelectionSerialized;
+	const Position nLength{ GetSelectionSerialized(nullptr) };
+#pragma warning(suppress: 26472)
+	char* pszSelectionSerialized{ sSelectionSerialized.GetBufferSetLength(static_cast<int>(nLength)) };
+	GetSelectionSerialized(pszSelectionSerialized);
+	sSelectionSerialized.ReleaseBuffer();
+	return sSelectionSerialized;
+}
+
 CScintillaCtrl::StringA CScintillaCtrl::GetSCIProperty(_In_z_ const char* key)
 {
 	//Validate our parameters
@@ -4931,9 +4959,9 @@ int CScintillaCtrl::GetExtraDescent()
 	return static_cast<int>(Call(static_cast<UINT>(Message::GetExtraDescent), 0, 0));
 }
 
-int CScintillaCtrl::MarkerSymbolDefined(_In_ int markerNumber)
+MarkerSymbol CScintillaCtrl::MarkerSymbolDefined(_In_ int markerNumber)
 {
-	return static_cast<int>(Call(static_cast<UINT>(Message::MarkerSymbolDefined), static_cast<WPARAM>(markerNumber), 0));
+	return static_cast<MarkerSymbol>(Call(static_cast<UINT>(Message::MarkerSymbolDefined), static_cast<WPARAM>(markerNumber), 0));
 }
 
 void CScintillaCtrl::MarginSetText(_In_ Line line, _In_z_ const char* text)

ScintillaCtrl.cpp

@@ -156,6 +156,7 @@ namespace Scintilla
 		void AutoCSetFillUps(_In_z_ const wchar_t* characterSet);
 		void UserListShow(_In_ int listType, _In_z_ const wchar_t* itemList);
 		[[nodiscard]] StringW GetLine(_In_ Line line);
+		[[nodiscard]] StringW GetSelectionSerialized();
 		void ReplaceSel(_In_z_ const wchar_t* text);
 		void SetText(_In_z_ const wchar_t* text);
 		[[nodiscard]] StringW GetText(_In_ int length);
@@ -214,6 +215,7 @@ namespace Scintilla
 		[[nodiscard]] StringA GetSelText();
 		[[nodiscard]] StringA GetCurLine();
 		[[nodiscard]] StringA GetLine(_In_ Line line);
+		[[nodiscard]] StringA GetSelectionSerialized();
 		[[nodiscard]] StringA GetSCIProperty(_In_z_ const char* key);
 		[[nodiscard]] StringA GetText(_In_ int length);
 		[[nodiscard]] StringA GetPropertyExpanded(_In_z_ const char* key);
@@ -889,7 +891,7 @@ namespace Scintilla
 		[[nodiscard]] int GetExtraAscent();
 		void SetExtraDescent(_In_ int extraDescent);
 		[[nodiscard]] int GetExtraDescent();
-		[[nodiscard]] int MarkerSymbolDefined(_In_ int markerNumber);
+		[[nodiscard]] MarkerSymbol MarkerSymbolDefined(_In_ int markerNumber);
 		void MarginSetText(_In_ Line line, _In_z_ const char* text);
 		int MarginGetText(_In_ Line line, _Inout_opt_z_ char* text);
 		void MarginSetStyle(_In_ Line line, _In_ int style);

ScintillaCtrl.h

@@ -964,15 +964,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:IntelliFile"
-        "ProductCode" = "8:{4FC4CC87-EF0B-43B3-939E-725553566F0F}"
-        "PackageCode" = "8:{7EC88866-EA16-4069-A662-C76D789EFECD}"
+        "ProductCode" = "8:{0751DB02-AE21-4651-AD0C-F69EDCEC5231}"
+        "PackageCode" = "8:{3F07DDDF-3271-408A-BA9C-F6B3B2A9313E}"
         "UpgradeCode" = "8:{C73D3F5F-8D57-4947-AD1B-57B770138A7D}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.38"
+        "ProductVersion" = "8:1.39"
         "Manufacturer" = "8:Stefan-Mihai MOGA"
         "ARPHELPTELEPHONE" = "8:+40745497982"
         "ARPHELPLINK" = "8:https://www.moga.doctor/"

Setup/Setup.vdproj

@@ -94,7 +94,7 @@ <h1>Software Content Register</h1>
 
                     <p><strong>CScintillaCtrl, CScintillaDoc, CScintillaView</strong><br>
                         Description: <em>These classes provides a MFC and ATL/WTL wrapping for the Scintilla edit control (<a href="http://www.scintilla.org" target="_blank">http://www.scintilla.org</a>). This control provides an open source cross platform edit control. Some of the features it provides include syntax colouring, call tips, brace highlighting, Styles, margins and markers to name but a few. The provided wrapper classes make it easier to include the control in MFC / WTL projects on Windows.</em><br>
-                        Version: 1.92<br>
+                        Version: 1.93<br>
                         Home Page: <a href="https://www.naughter.com/scintilla.html" target="_blank">https://www.naughter.com/scintilla.html</a><br>
                         License: Custom (PJ Naughter's license)<br>
                         Format: source code, binary</p>