aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornyamatongwe <unknown>2011-07-11 16:15:35 +1000
committernyamatongwe <unknown>2011-07-11 16:15:35 +1000
commit7697b45ca3fb21f277c747475e1c18c0ee3c23b2 (patch)
treeba3f67a52aa1fc3208164abab391367efbfce513
parent19b6c6abf5dc9386696681944b2ccef8cffe24fd (diff)
downloadscintilla-mirror-7697b45ca3fb21f277c747475e1c18c0ee3c23b2.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);
}
//--------------------------------------------------------------------------------------------------