diff options
| author | Zufu Liu <unknown> | 2018-12-07 19:57:39 +1100 |
|---|---|---|
| committer | Zufu Liu <unknown> | 2018-12-07 19:57:39 +1100 |
| commit | 94a64113360712aeee95725ebd3a97a21b3abb61 (patch) | |
| tree | 13947c5a5f0a9876f98608394b5fca577f786662 | |
| parent | ffc99771b95a0b01371779d9d30f9d0400054691 (diff) | |
| download | scintilla-mirror-94a64113360712aeee95725ebd3a97a21b3abb61.tar.gz | |
Backport: Feature [feature-requests:#1246]. Replace MAKELONG with MAKELRESULT and
MAKEWPARAM which are more specific.
Backport of changeset 7183:3ca4517dc18f.
| -rw-r--r-- | win32/ScintillaWin.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index e53fe64eb..5b78a3ed6 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1665,7 +1665,7 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam if (lParam) { *reinterpret_cast<int *>(lParam) = static_cast<int>(SelectionEnd().Position()); } - return MAKELONG(SelectionStart().Position(), SelectionEnd().Position()); + return MAKELRESULT(SelectionStart().Position(), SelectionEnd().Position()); case EM_EXGETSEL: { if (lParam == 0) { @@ -1967,14 +1967,14 @@ bool ScintillaWin::ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) { void ScintillaWin::NotifyChange() { ::SendMessage(::GetParent(MainHWND()), WM_COMMAND, - MAKELONG(GetCtrlID(), SCEN_CHANGE), + MAKEWPARAM(GetCtrlID(), SCEN_CHANGE), reinterpret_cast<LPARAM>(MainHWND())); } void ScintillaWin::NotifyFocus(bool focus) { if (commandEvents) { ::SendMessage(::GetParent(MainHWND()), WM_COMMAND, - MAKELONG(GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS), + MAKEWPARAM(GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS), reinterpret_cast<LPARAM>(MainHWND())); } Editor::NotifyFocus(focus); |