diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 12 | ||||
| -rw-r--r-- | win32/HanjaDic.cxx | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index c6080f8c9..34647b49c 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -469,6 +469,7 @@ <td>Mika Attila</td> <td>JoMazM</td> <td>Markus Moser</td> + <td>Stefan Küng</td> </tr> </table> <p> @@ -488,6 +489,17 @@ Released 17 April 2015. </li> <li> + Fix link error on Windows when SCI_NAMESPACE used. + </li> + <ul> + <h3> + <a href="http://prdownloads.sourceforge.net/scintilla/scite355.zip?download">Release 3.5.5</a> + </h3> + <ul> + <li> + Released 17 April 2015. + </li> + <li> Scintilla on Windows is now always a wide character window so SCI_SETKEYSUNICODE has no effect and SCI_GETKEYSUNICODE always returns true. These APIs are deprecated and should not be called. </li> diff --git a/win32/HanjaDic.cxx b/win32/HanjaDic.cxx index 3a86ad313..dbb755fb1 100644 --- a/win32/HanjaDic.cxx +++ b/win32/HanjaDic.cxx @@ -12,7 +12,7 @@ #include "HanjaDic.h" #ifdef SCI_NAMESPACE -using namespace Scintilla; +namespace Scintilla { #endif namespace HanjaDict { @@ -124,3 +124,6 @@ int GetHangulOfHanja(wchar_t *inout) { } } +#ifdef SCI_NAMESPACE +} +#endif |