Bug [#1224]. Use enum for undo selection history and make API names more

consistent as 'undo selection' instead of 'selection undo' as more closely
associated with undo than selection.

5 files changed, 21 insertions, 10 deletions

diff --git a/include/Scintilla.h b/include/Scintilla.h
index 9f5b4e7a2..736a7e2d5 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -532,8 +532,10 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SC_CHANGE_HISTORY_INDICATORS 4
 #define SCI_SETCHANGEHISTORY 2780
 #define SCI_GETCHANGEHISTORY 2781
-#define SCI_SETSELECTIONUNDOHISTORY 2782
-#define SCI_GETSELECTIONUNDOHISTORY 2783
+#define SC_UNDO_SELECTION_HISTORY_DISABLED 0
+#define SC_UNDO_SELECTION_HISTORY_ENABLED 1
+#define SCI_SETUNDOSELECTIONHISTORY 2782
+#define SCI_GETUNDOSELECTIONHISTORY 2783
 #define SCI_GETFIRSTVISIBLELINE 2152
 #define SCI_GETLINE 2153
 #define SCI_GETLINECOUNT 2154
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index ba37ceaf3..65d3d157b 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -1334,11 +1334,15 @@ set void SetChangeHistory=2780(ChangeHistoryOption changeHistory,)
 # Report change history status.
 get ChangeHistoryOption GetChangeHistory=2781(,)
 
-# Enable or disable selection undo history.
-set void SetSelectionUndoHistory=2782(bool selectionUndoHistory,)
+enu UndoSelectionHistoryOption=SC_UNDO_SELECTION_HISTORY_
+val SC_UNDO_SELECTION_HISTORY_DISABLED=0
+val SC_UNDO_SELECTION_HISTORY_ENABLED=1
 
-# Report selection undo history status.
-get bool GetSelectionUndoHistory=2783(,)
+# Enable or disable undo selection history.
+set void SetUndoSelectionHistory=2782(UndoSelectionHistoryOption undoSelectionHistory,)
+
+# Report undo selection history status.
+get UndoSelectionHistoryOption GetUndoSelectionHistory=2783(,)
 
 # Retrieve the display line at the top of the display.
 get line GetFirstVisibleLine=2152(,)
diff --git a/include/ScintillaCall.h b/include/ScintillaCall.h
index ab0bb3306..bcd462be9 100644
--- a/include/ScintillaCall.h
+++ b/include/ScintillaCall.h
@@ -360,8 +360,8 @@ public:
 	Position FormatRangeFull(bool draw, RangeToFormatFull *fr);
 	void SetChangeHistory(Scintilla::ChangeHistoryOption changeHistory);
 	Scintilla::ChangeHistoryOption ChangeHistory();
-	void SetSelectionUndoHistory(bool selectionUndoHistory);
-	bool SelectionUndoHistory();
+	void SetUndoSelectionHistory(Scintilla::UndoSelectionHistoryOption undoSelectionHistory);
+	Scintilla::UndoSelectionHistoryOption UndoSelectionHistory();
 	Line FirstVisibleLine();
 	Position GetLine(Line line, char *text);
 	std::string GetLine(Line line);
diff --git a/include/ScintillaMessages.h b/include/ScintillaMessages.h
index 02dd42e24..f60be4d52 100644
--- a/include/ScintillaMessages.h
+++ b/include/ScintillaMessages.h
@@ -285,8 +285,8 @@ enum class Message {
 	FormatRangeFull = 2777,
 	SetChangeHistory = 2780,
 	GetChangeHistory = 2781,
-	SetSelectionUndoHistory = 2782,
-	GetSelectionUndoHistory = 2783,
+	SetUndoSelectionHistory = 2782,
+	GetUndoSelectionHistory = 2783,
 	GetFirstVisibleLine = 2152,
 	GetLine = 2153,
 	GetLineCount = 2154,
diff --git a/include/ScintillaTypes.h b/include/ScintillaTypes.h
index 6d3e2a705..af726b2ab 100644
--- a/include/ScintillaTypes.h
+++ b/include/ScintillaTypes.h
@@ -299,6 +299,11 @@ enum class ChangeHistoryOption {
 	Indicators = 4,
 };
 
+enum class UndoSelectionHistoryOption {
+	Disabled = 0,
+	Enabled = 1,
+};
+
 enum class FoldLevel {
 	None = 0x0,
 	Base = 0x400,