diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-09-11 09:05:35 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-09-11 09:05:35 +1000 |
| commit | d3c03f65fe25e133b8ef8a5f67b675b434605305 (patch) | |
| tree | 648194fe02ee266b1e4ee4530a3978037e883bc5 /src/EditView.cxx | |
| parent | 566b81a2fda39f83e4fbc860388385c2d3087d33 (diff) | |
| download | scintilla-mirror-d3c03f65fe25e133b8ef8a5f67b675b434605305.tar.gz | |
Backport: The Scintilla namespace is always active for internal symbols and for the lexer and document interfaces.
Backport of changeset 6388:d62863ae40a3.
Diffstat (limited to 'src/EditView.cxx')
| -rw-r--r-- | src/EditView.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx index 011d16575..8db21d5d9 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -54,9 +54,7 @@ #include "MarginView.h" #include "EditView.h" -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static inline bool IsControlCharacter(int ch) { // iscntrl returns true for lots of chars > 127 which are displayable @@ -69,9 +67,7 @@ PrintParameters::PrintParameters() { wrapState = eWrapWord; } -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif bool ValidStyledText(const ViewStyle &vs, size_t styleOffset, const StyledText &st) { if (st.multipleStyles) { @@ -171,9 +167,7 @@ void DrawStyledText(Surface *surface, const ViewStyle &vs, int styleOffset, PRec } } -#ifdef SCI_NAMESPACE } -#endif const XYPOSITION epsilon = 0.0001f; // A small nudge to avoid floating point precision issues |