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/ScintillaGTK.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/ScintillaGTK.cxx')
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 21762464f..48aa30a71 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -105,9 +105,7 @@ static GdkWindow *WindowFromWidget(GtkWidget *w) { #pragma warning(disable: 4505) #endif -#ifdef SCI_NAMESPACE using namespace Scintilla; -#endif static GdkWindow *PWindow(const Window &w) { GtkWidget *widget = static_cast<GtkWidget *>(w.GetID()); @@ -710,9 +708,7 @@ void ScintillaGTK::StartDrag() { #endif } -#ifdef SCI_NAMESPACE namespace Scintilla { -#endif std::string ConvertText(const char *s, size_t len, const char *charSetDest, const char *charSetSource, bool transliterations, bool silent) { // s is not const because of different versions of iconv disagreeing about const @@ -745,9 +741,7 @@ std::string ConvertText(const char *s, size_t len, const char *charSetDest, } return destForm; } -#ifdef SCI_NAMESPACE } -#endif // Returns the target converted to UTF8. // Return the length in bytes. |