diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/PlatWin.cxx | 16 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 8 |
2 files changed, 20 insertions, 4 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index c818ab7fa..09d97917a 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -77,6 +77,10 @@ bool IsNT() { return onNT; } +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + Point Point::FromLong(long lpoint) { return Point(static_cast<short>(LOWORD(lpoint)), static_cast<short>(HIWORD(lpoint))); } @@ -219,7 +223,7 @@ FontCached *FontCached::first = 0; FontCached::FontCached(const char *faceName_, int characterSet_, int size_, bool bold_, bool italic_) : next(0), usage(0), hash(0) { - ::SetLogFont(lf, faceName_, characterSet_, size_, bold_, italic_); + SetLogFont(lf, faceName_, characterSet_, size_, bold_, italic_); hash = HashFont(faceName_, characterSet_, size_, bold_, italic_); id = ::CreateFontIndirectA(&lf); usage = 1; @@ -296,7 +300,7 @@ void Font::Create(const char *faceName, int characterSet, int size, Release(); #ifndef FONTS_CACHED LOGFONT lf; - ::SetLogFont(lf, faceName, characterSet, size, bold, italic); + SetLogFont(lf, faceName, characterSet, size, bold, italic); id = ::CreateFontIndirect(&lf); #else id = FontCached::FindOrCreate(faceName, characterSet, size, bold, italic); @@ -314,6 +318,10 @@ void Font::Release() { id = 0; } +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + class SurfaceImpl : public Surface { bool unicodeMode; HDC hdc; @@ -387,6 +395,10 @@ public: void SetDBCSMode(int codePage_); }; +#ifdef SCI_NAMESPACE +} //namespace Scintilla +#endif + SurfaceImpl::SurfaceImpl() : unicodeMode(false), hdc(0), hdcOwned(false), diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index e55892b62..9568aa85d 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -99,6 +99,10 @@ extern void Platform_Finalise(); const TCHAR scintillaClassName[] = TEXT("Scintilla"); const TCHAR callClassName[] = TEXT("CallTip"); +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + class ScintillaWin; // Forward declaration for COM interface subobjects /** @@ -2247,7 +2251,7 @@ bool ScintillaWin::Register(HINSTANCE hInstance_) { WNDCLASSEXW wndclass; wndclass.cbSize = sizeof(wndclass); wndclass.style = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW; - wndclass.lpfnWndProc = ::ScintillaWin::SWndProc; + wndclass.lpfnWndProc = ScintillaWin::SWndProc; wndclass.cbClsExtra = 0; wndclass.cbWndExtra = sizeof(ScintillaWin *); wndclass.hInstance = hInstance; @@ -2264,7 +2268,7 @@ bool ScintillaWin::Register(HINSTANCE hInstance_) { WNDCLASSEX wndclass; wndclass.cbSize = sizeof(wndclass); wndclass.style = CS_GLOBALCLASS | CS_HREDRAW | CS_VREDRAW; - wndclass.lpfnWndProc = ::ScintillaWin::SWndProc; + wndclass.lpfnWndProc = ScintillaWin::SWndProc; wndclass.cbClsExtra = 0; wndclass.cbWndExtra = sizeof(ScintillaWin *); wndclass.hInstance = hInstance; |