aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2011-07-11 16:15:35 +1000
committernyamatongwe <devnull@localhost>2011-07-11 16:15:35 +1000
commit2920827d89e857840591af32ce2cbcd05c0aec7f (patch)
treec7b8755b5ad9a64065773a58bb057d439afebedb
parent34c751df2e9db01f8209510256831ec14dc6fd9f (diff)
downloadscintilla-mirror-2920827d89e857840591af32ce2cbcd05c0aec7f.tar.gz
Include control ID in WM_COMMAND notifications.
This allows container to be more selective with processing.
-rw-r--r--cocoa/ScintillaCocoa.mm6
1 files changed, 4 insertions, 2 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 518447851..2c827e3c7 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -1474,7 +1474,8 @@ void ScintillaCocoa::RegisterNotifyCallback(intptr_t windowid, SciNotifyFunc cal
void ScintillaCocoa::NotifyChange()
{
if (notifyProc != NULL)
- notifyProc(notifyObj, WM_COMMAND, (uintptr_t) (SCEN_CHANGE << 16), (uintptr_t) this);
+ notifyProc(notifyObj, WM_COMMAND, Platform::LongFromTwoShorts(GetCtrlID(), SCEN_CHANGE),
+ (uintptr_t) this);
}
//--------------------------------------------------------------------------------------------------
@@ -1482,7 +1483,8 @@ void ScintillaCocoa::NotifyChange()
void ScintillaCocoa::NotifyFocus(bool focus)
{
if (notifyProc != NULL)
- notifyProc(notifyObj, WM_COMMAND, (uintptr_t) ((focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS) << 16), (uintptr_t) this);
+ notifyProc(notifyObj, WM_COMMAND, Platform::LongFromTwoShorts(GetCtrlID(), (focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS)),
+ (uintptr_t) this);
}
//--------------------------------------------------------------------------------------------------