diff options
| author | nyamatongwe <devnull@localhost> | 2000-07-22 14:03:39 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2000-07-22 14:03:39 +0000 |
| commit | 0a339b29044f7af6f6c683df801216759d18ec99 (patch) | |
| tree | 68fe2d7b772d79b47c7146a68e0e94a1e9ac0e98 /src | |
| parent | 39e1b337bd828fca3726429142e0b575ea9d99e4 (diff) | |
| download | scintilla-mirror-0a339b29044f7af6f6c683df801216759d18ec99.tar.gz | |
Changed key codes to not overlap printing keys.
Mved the #ifs around DBCS support to avoid warnings on GTK+.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Document.cxx | 8 | ||||
| -rw-r--r-- | src/DocumentAccessor.cxx | 13 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/Document.cxx b/src/Document.cxx index b6b875c66..f8d349adb 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -201,8 +201,8 @@ bool Document::IsCrLf(int pos) { return (cb.CharAt(pos) == '\r') && (cb.CharAt(pos + 1) == '\n'); } -bool Document::IsDBCS(int pos) { #if PLAT_WIN +bool Document::IsDBCS(int pos) { if (dbcsCodePage) { if (SC_CP_UTF8 == dbcsCodePage) { unsigned char ch = static_cast<unsigned char>(cb.CharAt(pos)); @@ -224,10 +224,14 @@ bool Document::IsDBCS(int pos) { } } return false; +} #else +// PLAT_GTK or PLAT_WX +// TODO: support DBCS under GTK+ and WX +bool Document::IsDBCS(int) { return false; -#endif } +#endif int Document::LenChar(int pos) { if (IsCrLf(pos)) { diff --git a/src/DocumentAccessor.cxx b/src/DocumentAccessor.cxx index d3811b77c..6828e37c3 100644 --- a/src/DocumentAccessor.cxx +++ b/src/DocumentAccessor.cxx @@ -21,21 +21,22 @@ DocumentAccessor::~DocumentAccessor() { } +#if PLAT_WIN bool DocumentAccessor::InternalIsLeadByte(char ch) { -#if PLAT_GTK - // TODO: support DBCS under GTK+ - return false; -#elif PLAT_WIN if (SC_CP_UTF8 == codePage) // For lexing, all characters >= 0x80 are treated the // same so none is considered a lead byte. return false; else return IsDBCSLeadByteEx(codePage, ch); -#elif PLAT_WX +} +#else +// PLAT_GTK or PLAT_WX +// TODO: support DBCS under GTK+ and WX +bool DocumentAccessor::InternalIsLeadByte(char) { return false; -#endif } +#endif void DocumentAccessor::Fill(int position) { if (lenDoc == -1) |