aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <unknown>2010-05-02 00:06:01 +0000
committernyamatongwe <unknown>2010-05-02 00:06:01 +0000
commitf73b5ae0e7a2b461bdb59f72f2803645b48b0d7e (patch)
tree2f6dee1cbfd0205f0cae6784609eb094f3299ba8
parent9527e6f388b10afcde7088df567c3a907df77f8d (diff)
downloadscintilla-mirror-f73b5ae0e7a2b461bdb59f72f2803645b48b0d7e.tar.gz
Bug #2995278 minor fixes to typos and types.
-rw-r--r--src/Editor.cxx2
-rw-r--r--src/UniConversion.cxx2
-rw-r--r--src/UniConversion.h2
-rw-r--r--win32/ScintillaWin.cxx2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 61a349f04..074470f5f 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -1850,7 +1850,7 @@ bool BadUTF(const char *s, int len, int &trailBytes) {
return true;
if (GoodTrailByte(us[1]) && GoodTrailByte(us[2]) && GoodTrailByte(us[3])) {
if (*us == 0xf4) {
- // Chcek if encoding a value beyond the last Unicode character 10FFFF
+ // Check if encoding a value beyond the last Unicode character 10FFFF
if (us[1] > 0x8f) {
return true;
} else if (us[1] == 0x8f) {
diff --git a/src/UniConversion.cxx b/src/UniConversion.cxx
index 0064e3cba..2ef75840e 100644
--- a/src/UniConversion.cxx
+++ b/src/UniConversion.cxx
@@ -1,6 +1,6 @@
// Scintilla source code edit control
/** @file UniConversion.cxx
- ** Functions to handle UFT-8 and UCS-2 strings.
+ ** Functions to handle UTF-8 and UTF-16 strings.
**/
// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
// The License.txt file describes the conditions under which this software may be distributed.
diff --git a/src/UniConversion.h b/src/UniConversion.h
index 8cc3d0a18..2de2ef3fe 100644
--- a/src/UniConversion.h
+++ b/src/UniConversion.h
@@ -1,6 +1,6 @@
// Scintilla source code edit control
/** @file UniConversion.h
- ** Functions to handle UFT-8 and UCS-2 strings.
+ ** Functions to handle UTF-8 and UTF-16 strings.
**/
// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
// The License.txt file describes the conditions under which this software may be distributed.
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 6249f21b8..30fe7b2bd 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1375,7 +1375,7 @@ std::string ScintillaWin::CaseMapString(const std::string &s, int caseMapping) {
UINT cpDoc = CodePageOfDocument();
- unsigned int lengthUTF16 = ::MultiByteToWideChar(cpDoc, 0, s.c_str(), s.size(), NULL, NULL);
+ unsigned int lengthUTF16 = ::MultiByteToWideChar(cpDoc, 0, s.c_str(), s.size(), NULL, 0);
if (lengthUTF16 == 0) // Failed to convert
return s;