diff options
Diffstat (limited to 'win32/ScintillaWin.cxx')
| -rw-r--r-- | win32/ScintillaWin.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
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; } |