Removed deprecated APIs.

Added gets to match sets for UndoCollection, BufferedDraw, CodePage,
UsePalette, ReadOnly, CaretFore, and ModEventMask.
Undo collection status is a bool again - enumeration deprecated.
Timing code commented out.

4 files changed, 27 insertions, 65 deletions

diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx
index e6aa4a013..3f094ce96 100644
--- a/src/CellBuffer.cxx
+++ b/src/CellBuffer.cxx
@@ -567,7 +567,7 @@ CellBuffer::CellBuffer(int initialLength) {
 	gaplen = initialLength;
 	part2body = body + gaplen;
 	readOnly = false;
-	collectingUndo = undoCollectAutoStart;
+	collectingUndo = true;
 }
 
 CellBuffer::~CellBuffer() {
@@ -952,7 +952,7 @@ void CellBuffer::BasicDeleteChars(int position, int deleteLength) {
 	part2body = body + gaplen;
 }
 
-undoCollectionType CellBuffer::SetUndoCollection(undoCollectionType collectUndo) {
+bool CellBuffer::SetUndoCollection(bool collectUndo) {
 	collectingUndo = collectUndo;
 	uh.DropUndoSequence();
 	return collectingUndo;
diff --git a/src/CellBuffer.h b/src/CellBuffer.h
index 409a8749d..7a3eabaeb 100644
--- a/src/CellBuffer.h
+++ b/src/CellBuffer.h
@@ -88,8 +88,6 @@ public:
 	void Grab(Action *source);
 };
 
-enum undoCollectionType { undoCollectNone, undoCollectAutoStart, undoCollectManualStart };
-
 class UndoHistory {
 	Action *actions;
 	int lenActions;
@@ -141,7 +139,7 @@ private:
 	char *part2body;
 	bool readOnly;
 
-	undoCollectionType collectingUndo;
+	bool collectingUndo;
 	UndoHistory uh;
 
 	LineVector lv;
@@ -199,7 +197,7 @@ public:
 	void BasicInsertString(int position, char *s, int insertLength);
 	void BasicDeleteChars(int position, int deleteLength);
 
-	undoCollectionType SetUndoCollection(undoCollectionType collectUndo);
+	bool SetUndoCollection(bool collectUndo);
 	bool IsCollectingUndo();
 	void BeginUndoAction();
 	void EndUndoAction();
diff --git a/src/Document.h b/src/Document.h
index 64955639e..b8f24ebe1 100644
--- a/src/Document.h
+++ b/src/Document.h
@@ -113,9 +113,10 @@ public:
 	bool CanUndo() { return cb.CanUndo(); }
 	bool CanRedo() { return cb.CanRedo(); }
 	void DeleteUndoHistory() { cb.DeleteUndoHistory(); }
-	undoCollectionType SetUndoCollection(undoCollectionType collectUndo) {
+	bool SetUndoCollection(bool collectUndo) {
 		return cb.SetUndoCollection(collectUndo);
 	}
+	bool IsCollectingUndo() { return cb.IsCollectingUndo(); }
 	void BeginUndoAction() { cb.BeginUndoAction(); }
 	void EndUndoAction() { cb.EndUndoAction(); }
 	void SetSavePoint();
@@ -128,6 +129,7 @@ public:
 	void Indent(bool forwards, int lineBottom, int lineTop);
 	void ConvertLineEnds(int eolModeSet);
 	void SetReadOnly(bool set) { cb.SetReadOnly(set); }
+	bool IsReadOnly() { return cb.IsReadOnly(); }
 
 	void InsertChar(int pos, char ch);
 	void InsertString(int position, const char *s);
diff --git a/src/Editor.cxx b/src/Editor.cxx
index e6ddd3874..26f61f7c8 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -3160,6 +3160,9 @@ LRESULT Editor::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
 		pdoc->SetReadOnly(wParam);
 		return TRUE;
 
+	case SCI_GETREADONLY:
+		return pdoc->IsReadOnly();
+
 	case EM_CANPASTE:
 		return 1;
 
@@ -3277,15 +3280,11 @@ LRESULT Editor::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
 		return 0;
 
 	case SCI_SETUNDOCOLLECTION:
-		pdoc->SetUndoCollection(static_cast<enum undoCollectionType>(wParam));
+		pdoc->SetUndoCollection(wParam);
 		return 0;
 
-#ifdef INCLUDE_DEPRECATED_FEATURES
-	case SCI_APPENDUNDOSTARTACTION:
-		// Not just deprecated - now dead
-		//pdoc->AppendUndoStartAction();
-		return 0;
-#endif
+	case SCI_GETUNDOCOLLECTION:
+		return pdoc->IsCollectingUndo();
 
 	case SCI_BEGINUNDOACTION:
 		pdoc->BeginUndoAction();
@@ -3424,19 +3423,13 @@ LRESULT Editor::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
 		pdoc->SetStyles(wParam, reinterpret_cast<char *>(lParam));
 		break;
 
-#ifdef INCLUDE_DEPRECATED_FEATURES
-	case SCI_SETMARGINWIDTH:
-		if (wParam < 100) {
-			vs.ms[1].width = wParam;
-		}
-		InvalidateStyleRedraw();
-		break;
-#endif
-
 	case SCI_SETBUFFEREDDRAW:
 		bufferedDraw = wParam;
 		break;
 
+	case SCI_GETBUFFEREDDRAW:
+		return bufferedDraw;
+
 	case SCI_SETTABWIDTH:
 		if (wParam > 0)
 			pdoc->tabInChars = wParam;
@@ -3509,20 +3502,17 @@ LRESULT Editor::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
 		pdoc->dbcsCodePage = wParam;
 		break;
 
-#ifdef INCLUDE_DEPRECATED_FEATURES
-	case SCI_SETLINENUMBERWIDTH:
-		if (wParam < 200) {
-			vs.ms[0].width = wParam;
-		}
-		InvalidateStyleRedraw();
-		break;
-#endif
+	case SCI_GETCODEPAGE:
+		return pdoc->dbcsCodePage;
 
 	case SCI_SETUSEPALETTE:
 		palette.allowRealization = wParam;
 		InvalidateStyleRedraw();
 		break;
 
+	case SCI_GETUSEPALETTE:
+		return palette.allowRealization;
+
 		// Marker definition and setting
 	case SCI_MARKERDEFINE:
 		if (wParam <= MARKER_MAX)
@@ -3790,40 +3780,6 @@ LRESULT Editor::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
 		displayPopupMenu = wParam;
 		break;
 
-  #ifdef INCLUDE_DEPRECATED_FEATURES
-	case SCI_SETFORE:
-		vs.styles[STYLE_DEFAULT].fore.desired = Colour(wParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETBACK:
-		vs.styles[STYLE_DEFAULT].back.desired = Colour(wParam);
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETBOLD:
-		vs.styles[STYLE_DEFAULT].bold = wParam;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETITALIC:
-		vs.styles[STYLE_DEFAULT].italic = wParam;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETSIZE:
-		vs.styles[STYLE_DEFAULT].size = wParam;
-		InvalidateStyleRedraw();
-		break;
-
-	case SCI_SETFONT:
-		if (wParam == 0)
-			return 0;
-		strcpy(vs.styles[STYLE_DEFAULT].fontName, reinterpret_cast<char *>(wParam));
-		InvalidateStyleRedraw();
-		break;
-#endif
-
 	case SCI_SETSELFORE:
 		vs.selforeset = wParam;
 		vs.selforeground.desired = Colour(lParam);
@@ -3841,6 +3797,9 @@ LRESULT Editor::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
 		InvalidateStyleRedraw();
 		break;
 
+	case SCI_GETCARETFORE:
+		return vs.caretcolour.desired.AsLong();
+
 	case SCI_ASSIGNCMDKEY:
 		kmap.AssignCmdKey(LOWORD(wParam), HIWORD(wParam), lParam);
 		break;
@@ -3997,6 +3956,9 @@ LRESULT Editor::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
 		modEventMask = wParam;
 		return 0;
 		
+	case SCI_GETMODEVENTMASK:
+		return modEventMask;
+		
 	case SCI_CONVERTEOLS:
 		pdoc->ConvertLineEnds(wParam);
 		SetSelection(currentPos, anchor);	// Ensure selection inside document