aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZufu Liu <unknown>2018-12-07 19:57:39 +1100
committerZufu Liu <unknown>2018-12-07 19:57:39 +1100
commit2c4a82892183b5cf7eaa12f1b5f9048d034a13e4 (patch)
tree3037c90c54fb2337fc4d9f789433e09c8315e4c6
parent02b035fec78afcb1bd3d76cdcde876fdf322c655 (diff)
downloadscintilla-mirror-2c4a82892183b5cf7eaa12f1b5f9048d034a13e4.tar.gz
Feature [feature-requests:#1246]. Replace MAKELONG with MAKELRESULT and
MAKEWPARAM which are more specific.
-rw-r--r--win32/ScintillaWin.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 174b8aa15..e73e93405 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1681,7 +1681,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) {
@@ -1996,14 +1996,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);