diff options
| author | nyamatongwe <devnull@localhost> | 2001-11-28 06:10:57 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2001-11-28 06:10:57 +0000 |
| commit | d465e2aed7a7992373b91fec451edfa1de224ef6 (patch) | |
| tree | af620462b102bde5e438bdf4a7cb6a53901a290b /win32/PlatWin.cxx | |
| parent | 47f9af25a46c63f8d3dd72b8a20eca022636a8ef (diff) | |
| download | scintilla-mirror-d465e2aed7a7992373b91fec451edfa1de224ef6.tar.gz | |
Patch from Philippe to restore EM_GETSEL and EM_SETSEL on Windows, reformat
source.
Some addition of :: by me.
Diffstat (limited to 'win32/PlatWin.cxx')
| -rw-r--r-- | win32/PlatWin.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 7a1ef5f9c..a5b632379 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -147,7 +147,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 = ::CreateFontIndirect(&lf); usage = 1; @@ -217,7 +217,7 @@ void Font::Create(const char *faceName, int characterSet, int size, bool bold, b 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); @@ -740,11 +740,11 @@ void Window::SetCursor(Cursor curs) { break; case cursorReverseArrow: { if (!hinstPlatformRes) - hinstPlatformRes = GetModuleHandle("Scintilla"); + hinstPlatformRes = ::GetModuleHandle("Scintilla"); if (!hinstPlatformRes) - hinstPlatformRes = GetModuleHandle("SciLexer"); + hinstPlatformRes = ::GetModuleHandle("SciLexer"); if (!hinstPlatformRes) - hinstPlatformRes = GetModuleHandle(NULL); + hinstPlatformRes = ::GetModuleHandle(NULL); ::SetCursor(::LoadCursor(hinstPlatformRes, MAKEINTRESOURCE(IDC_MARGIN))); } break; @@ -798,7 +798,7 @@ PRectangle ListBox::GetDesiredRect() { width = 12; rcDesired.right = rcDesired.left + width * (aveCharWidth+aveCharWidth/3); if (Length() > rows) - rcDesired.right = rcDesired.right + GetSystemMetrics(SM_CXVSCROLL); + rcDesired.right = rcDesired.right + ::GetSystemMetrics(SM_CXVSCROLL); return rcDesired; } |