diff options
| -rw-r--r-- | doc/ScintillaDoc.html | 6 | ||||
| -rw-r--r-- | include/Scintilla.h | 3 | ||||
| -rw-r--r-- | include/WinDefs.h | 1 | ||||
| -rw-r--r-- | src/Editor.cxx | 2 | 
4 files changed, 5 insertions, 7 deletions
| diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html index 42206a2a5..270160098 100644 --- a/doc/ScintillaDoc.html +++ b/doc/ScintillaDoc.html @@ -158,8 +158,6 @@ SCI_GETLENGTH  SCI_GETCURRENTPOS  SCI_GETANCHOR  SCI_SELECTALL -SCI_CHANGEPOSITION(int delta, bool extendselection) -SCI_PAGEMOVE(int cmdkey, bool extendselection)  SCI_GOTOLINE(int line)  SCI_GOTOPOS(int position)  SCI_SETANCHOR(int position) @@ -552,7 +550,7 @@ SCI_INDICGETFORE(int indicatornumber)         Autocompletion      </h3>  <pre> -SCI_AUTOCSHOW(<unused>,char *list) +SCI_AUTOCSHOW(int lenEntered;,char *list)  SCI_AUTOCCANCEL  SCI_AUTOCACTIVE  SCI_AUTOCPOSSTART @@ -582,7 +580,7 @@ SCI_AUTOCSELECT(<unused>,char *stringtoselect)         Calltips      </h3>  <pre> -SCI_CALLTIPSHOW(<unused>, char *definition) +SCI_CALLTIPSHOW(int posStart, char *definition)  SCI_CALLTIPCANCEL  SCI_CALLTIPACTIVE  SCI_CALLTIPPOSSTART diff --git a/include/Scintilla.h b/include/Scintilla.h index eecf7dfdc..6a58e9324 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -89,7 +89,6 @@ extern "C" {  #define SCI_GETVIEWWS SCI_START + 20  #define SCI_SETVIEWWS SCI_START + 21 -#define SCI_CHANGEPOSITION SCI_START + 22  #define SCI_GOTOLINE SCI_START + 24  #define SCI_GOTOPOS SCI_START + 25  #define SCI_SETANCHOR SCI_START + 26 @@ -427,6 +426,8 @@ void Scintilla_RegisterClasses(HINSTANCE hInstance);  #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 diff --git a/include/WinDefs.h b/include/WinDefs.h index e3ac3491d..be9e37cf9 100644 --- a/include/WinDefs.h +++ b/include/WinDefs.h @@ -56,7 +56,6 @@  #define EM_GETWORDBREAKPROCEX	(1104)  #define EM_GETWORDWRAPMODE	(1127)  #define EM_HIDESELECTION	(1087) -#define EM_LIMITTEXT	(197)  #define EM_LINEFROMCHAR	(201)  #define EM_LINEINDEX	(187)  #define EM_LINELENGTH	(193) diff --git a/src/Editor.cxx b/src/Editor.cxx index 2dd329fa3..3b53f806f 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -3031,7 +3031,7 @@ LRESULT Editor::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {  	case EM_SETWORDBREAKPROC:  		break; -	case EM_LIMITTEXT: +	case EM_SETLIMITTEXT:  		// wParam holds the number of characters control should be limited to  		break; | 
