diff options
| author | Zufu Liu <unknown> | 2020-02-09 09:30:21 +1100 |
|---|---|---|
| committer | Zufu Liu <unknown> | 2020-02-09 09:30:21 +1100 |
| commit | ab96fb14c0a1ba1b09e2cfcfe68bbf9902bc5d9f (patch) | |
| tree | 18f58b9910c5dfd8d05564756edffefb6efdb5d6 | |
| parent | 90a498aa44da18855534f4e8b001de07460ccb72 (diff) | |
| download | scintilla-mirror-ab96fb14c0a1ba1b09e2cfcfe68bbf9902bc5d9f.tar.gz | |
Backport: Feature [feature-requests:#1340] Use Win32 types for EM_ messages.
Backport of changeset 7977:508b5f6afbbc.
| -rw-r--r-- | win32/ScintillaWin.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 3984cc461..45eb96d06 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1624,20 +1624,20 @@ sptr_t ScintillaWin::EditMessage(unsigned int iMessage, uptr_t wParam, sptr_t lP switch (iMessage) { case EM_LINEFROMCHAR: - if (static_cast<int>(wParam) < 0) { + if (static_cast<Sci::Position>(wParam) < 0) { wParam = SelectionStart().Position(); } - return pdoc->LineFromPosition(static_cast<int>(wParam)); + return pdoc->LineFromPosition(static_cast<Sci::Position>(wParam)); case EM_EXLINEFROMCHAR: - return pdoc->LineFromPosition(static_cast<int>(lParam)); + return pdoc->LineFromPosition(lParam); case EM_GETSEL: if (wParam) { - *reinterpret_cast<int *>(wParam) = static_cast<int>(SelectionStart().Position()); + *reinterpret_cast<DWORD *>(wParam) = static_cast<DWORD>(SelectionStart().Position()); } if (lParam) { - *reinterpret_cast<int *>(lParam) = static_cast<int>(SelectionEnd().Position()); + *reinterpret_cast<DWORD *>(lParam) = static_cast<DWORD>(SelectionEnd().Position()); } return MAKELRESULT(SelectionStart().Position(), SelectionEnd().Position()); @@ -1645,9 +1645,9 @@ sptr_t ScintillaWin::EditMessage(unsigned int iMessage, uptr_t wParam, sptr_t lP if (lParam == 0) { return 0; } - Sci_CharacterRange *pCR = reinterpret_cast<Sci_CharacterRange *>(lParam); - pCR->cpMin = static_cast<Sci_PositionCR>(SelectionStart().Position()); - pCR->cpMax = static_cast<Sci_PositionCR>(SelectionEnd().Position()); + CHARRANGE *pCR = reinterpret_cast<CHARRANGE *>(lParam); + pCR->cpMin = static_cast<LONG>(SelectionStart().Position()); + pCR->cpMax = static_cast<LONG>(SelectionEnd().Position()); } break; @@ -1669,7 +1669,7 @@ sptr_t ScintillaWin::EditMessage(unsigned int iMessage, uptr_t wParam, sptr_t lP if (lParam == 0) { return 0; } - const Sci_CharacterRange *pCR = reinterpret_cast<const Sci_CharacterRange *>(lParam); + const CHARRANGE *pCR = reinterpret_cast<const CHARRANGE *>(lParam); sel.selType = Selection::selStream; if (pCR->cpMin == 0 && pCR->cpMax == -1) { SetSelection(pCR->cpMin, pdoc->Length()); |