aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--cocoa/ScintillaCocoa.h1
-rw-r--r--gtk/ScintillaGTK.cxx1
-rw-r--r--lexlib/StyleContext.cxx1
-rw-r--r--src/CharClassify.cxx5
-rw-r--r--src/EditView.cxx1
-rw-r--r--src/Editor.cxx1
-rw-r--r--src/MarginView.cxx1
-rw-r--r--win32/PlatWin.cxx1
-rw-r--r--win32/ScintillaWin.cxx1
9 files changed, 3 insertions, 10 deletions
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index 8ed17d7de..7622c660b 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -15,7 +15,6 @@
#include <cstddef>
#include <cstdlib>
-#include <cctype>
#include <cstdio>
#include <ctime>
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 1df3ed4b9..2fbeae39c 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -7,7 +7,6 @@
#include <cstdlib>
#include <cassert>
#include <cstring>
-#include <cctype>
#include <cstdio>
#include <ctime>
#include <cmath>
diff --git a/lexlib/StyleContext.cxx b/lexlib/StyleContext.cxx
index 683e21453..fe56e53d7 100644
--- a/lexlib/StyleContext.cxx
+++ b/lexlib/StyleContext.cxx
@@ -7,7 +7,6 @@
#include <cstdlib>
#include <cassert>
-#include <cctype>
#include "ILexer.h"
diff --git a/src/CharClassify.cxx b/src/CharClassify.cxx
index ba8433e62..5ae47a2ef 100644
--- a/src/CharClassify.cxx
+++ b/src/CharClassify.cxx
@@ -6,10 +6,11 @@
// The License.txt file describes the conditions under which this software may be distributed.
#include <cstdlib>
-#include <cctype>
+#include <cassert>
#include <stdexcept>
+#include "CharacterSet.h"
#include "CharClassify.h"
using namespace Scintilla;
@@ -25,7 +26,7 @@ void CharClassify::SetDefaultCharClasses(bool includeWordClass) {
charClass[ch] = ccNewLine;
else if (ch < 0x20 || ch == ' ')
charClass[ch] = ccSpace;
- else if (includeWordClass && (ch >= 0x80 || isalnum(ch) || ch == '_'))
+ else if (includeWordClass && (ch >= 0x80 || IsAlphaNumeric(ch) || ch == '_'))
charClass[ch] = ccWord;
else
charClass[ch] = ccPunctuation;
diff --git a/src/EditView.cxx b/src/EditView.cxx
index c97f2ae87..6356dac63 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -9,7 +9,6 @@
#include <cstdlib>
#include <cassert>
#include <cstring>
-#include <cctype>
#include <cstdio>
#include <cmath>
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 671e8a3b0..efae01a4d 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -9,7 +9,6 @@
#include <cstdlib>
#include <cassert>
#include <cstring>
-#include <cctype>
#include <cstdio>
#include <cmath>
diff --git a/src/MarginView.cxx b/src/MarginView.cxx
index 0b52056d4..9dcd81f3a 100644
--- a/src/MarginView.cxx
+++ b/src/MarginView.cxx
@@ -9,7 +9,6 @@
#include <cstdlib>
#include <cassert>
#include <cstring>
-#include <cctype>
#include <cstdio>
#include <cmath>
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index a93b3a22c..aba2a73a2 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -8,7 +8,6 @@
#include <cstddef>
#include <cstdlib>
#include <cstring>
-#include <cctype>
#include <cstdio>
#include <cstdarg>
#include <ctime>
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index e73e93405..7b9c77bcc 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -9,7 +9,6 @@
#include <cstdlib>
#include <cassert>
#include <cstring>
-#include <cctype>
#include <cstdio>
#include <cmath>
#include <climits>