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 /gtk/PlatGTK.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 'gtk/PlatGTK.cxx')
| -rw-r--r-- | gtk/PlatGTK.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 06926f347..ebedc6e93 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -57,9 +57,7 @@ static GdkWindow *WindowFromWidget(GtkWidget *w) { #pragma warning(disable: 4505) #endif -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif enum encodingType { singleByte, UTF8, dbcs}; @@ -123,9 +121,7 @@ void Font::Release() { } // Required on OS X -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif // SurfaceID is a cairo_t* class SurfaceImpl : public Surface { @@ -187,9 +183,7 @@ public: void SetUnicodeMode(bool unicodeMode_) override; void SetDBCSMode(int codePage) override; }; -#ifdef SCI_NAMESPACE } -#endif const char *CharacterSetID(int characterSet) { switch (characterSet) { |