diff options
| author | nyamatongwe <devnull@localhost> | 2003-03-20 11:22:14 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2003-03-20 11:22:14 +0000 |
| commit | d4849b34e7c561921671603232668ca0c4b41b69 (patch) | |
| tree | 269e3f31c3495acbd880f76129f6f16b0a51da96 /win32 | |
| parent | 186fb2391e583d318a137842b2ccaae51d69365e (diff) | |
| download | scintilla-mirror-d4849b34e7c561921671603232668ca0c4b41b69.tar.gz | |
Patch from Simon Steele to implement the hotspot style and associated
notifications.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/PlatWin.cxx | 3 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 14 |
2 files changed, 14 insertions, 3 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 23c7862ed..1636e6c94 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -806,6 +806,9 @@ void Window::SetCursor(Cursor curs) { case cursorVert: ::SetCursor(::LoadCursor(NULL,IDC_SIZENS)); break; + case cursorHand: + ::SetCursor(::LoadCursor(NULL,IDC_HAND)); + break; case cursorReverseArrow: { if (!hinstPlatformRes) hinstPlatformRes = ::GetModuleHandle("Scintilla"); diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 1ac55315f..c8a47c11b 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -615,6 +615,8 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam DisplayCursor(Window::cursorReverseArrow); } else if (PointInSelection(Point(pt.x, pt.y))) { DisplayCursor(Window::cursorArrow); + } else if (PointIsHotspot(Point(pt.x, pt.y))) { + DisplayCursor(Window::cursorHand); } else { DisplayCursor(Window::cursorText); } @@ -667,7 +669,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam return DLGC_HASSETSEL | DLGC_WANTALLKEYS; case WM_KILLFOCUS: - if (!IsChild(reinterpret_cast<HWND>(wMain.GetID()), + if (!IsChild(reinterpret_cast<HWND>(wMain.GetID()), reinterpret_cast<HWND>(wParam))) { SetFocusState(false); } @@ -833,6 +835,12 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam ::SetFocus(MainHWND()); break; +#ifdef SCI_LEXER + case SCI_LOADLEXERLIBRARY: + //LexerManager::GetInstance()->Load(reinterpret_cast<const char*>(lParam)); + break; +#endif + default: return ScintillaBase::WndProc(iMessage, wParam, lParam); } @@ -1993,8 +2001,8 @@ bool Scintilla_RegisterClasses(void *hInstance) { bool result = ScintillaWin::Register(reinterpret_cast<HINSTANCE>(hInstance)); #ifdef SCI_LEXER Scintilla_LinkLexers(); - LexerManager *lexMan = LexerManager::GetInstance(); - lexMan->Load(); + //LexerManager *lexMan = LexerManager::GetInstance(); + //lexMan->Load(); #endif return result; } |