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.

1 files changed, 11 insertions, 20 deletions

diff --git a/include/Scintilla.h b/include/Scintilla.h
index 7640dfaa8..04d67e78a 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -47,9 +47,7 @@ void Scintilla_RegisterClasses(HINSTANCE hInstance);
 #define SCI_CANREDO SCI_START + 16
 #define SCI_MARKERLINEFROMHANDLE SCI_START + 17
 #define SCI_MARKERDELETEHANDLE SCI_START + 18
-
-#define SC_UNDOCOLLECT_NONE 0
-#define SC_UNDOCOLLECT_AUTOSTART 1
+#define SCI_GETUNDOCOLLECTION SCI_START + 19
 
 #define SCWS_INVISIBLE 0
 #define SCWS_VISIBLEALWAYS 1
@@ -77,6 +75,7 @@ void Scintilla_RegisterClasses(HINSTANCE hInstance);
 // This is the same value as CP_UTF8 in Windows
 #define SC_CP_UTF8 65001
 
+#define SCI_GETBUFFEREDDRAW SCI_START + 34
 #define SCI_SETBUFFEREDDRAW SCI_START + 35
 #define SCI_SETTABWIDTH SCI_START + 36
 #define SCI_SETCODEPAGE SCI_START + 37
@@ -227,6 +226,10 @@ void Scintilla_RegisterClasses(HINSTANCE hInstance);
 #define SCI_SETHIGHLIGHTGUIDE SCI_START + 134
 #define SCI_GETHIGHLIGHTGUIDE SCI_START + 135
 #define SCI_GETLINEENDPOSITION SCI_START + 136
+#define SCI_GETCODEPAGE SCI_START + 137
+#define SCI_GETCARETFORE SCI_START + 138
+#define SCI_GETUSEPALETTE SCI_START + 139
+#define SCI_GETREADONLY SCI_START + 140
 
 #define SCI_CALLTIPSHOW SCI_START + 200
 #define SCI_CALLTIPCANCEL SCI_START + 201
@@ -342,6 +345,8 @@ void Scintilla_RegisterClasses(HINSTANCE hInstance);
 #define SCI_ADDREFDOCUMENT SCI_START + 376
 #define SCI_RELEASEDOCUMENT SCI_START + 377
 
+#define SCI_GETMODEVENTMASK SCI_START + 378
+
 // GTK+ Specific
 #define SCI_GRABFOCUS SCI_START + 400
 
@@ -427,23 +432,9 @@ struct SCNotification {
 
 #ifdef INCLUDE_DEPRECATED_FEATURES
 
-#define SCI_CHANGEPOSITION SCI_START + 22
-
-// Default style settings. These are deprecated and will be removed in a future version.
-#define SCI_SETFORE SCI_START + 60
-#define SCI_SETBACK SCI_START + 61
-#define SCI_SETBOLD SCI_START + 62
-#define SCI_SETITALIC SCI_START + 63
-#define SCI_SETSIZE SCI_START + 64
-#define SCI_SETFONT SCI_START + 65
-
-#define SCI_APPENDUNDOSTARTACTION SCI_START + 74
-
-#define SC_UNDOCOLLECT_MANUALSTART 2
-
-// Deprecated in release 1.22
-#define SCI_SETMARGINWIDTH SCI_START + 34
-#define SCI_SETLINENUMBERWIDTH SCI_START + 38
+// Deprecated in 1.27
+#define SC_UNDOCOLLECT_NONE 0
+#define SC_UNDOCOLLECT_AUTOSTART 1
 
 #endif