diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-05-02 23:19:27 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-05-02 23:19:27 +1000 |
| commit | 42ce770c6497f865ce34a93f63cc376c3152f3c4 (patch) | |
| tree | fe434ad7ed4e7f63bb12c9fb1f4e128aacbd29ba /cocoa | |
| parent | 5a1126b68cbcd6b49534e9daa0eebe3a354e3f73 (diff) | |
| download | scintilla-mirror-42ce770c6497f865ce34a93f63cc376c3152f3c4.tar.gz | |
Use exact SciFnDirect function signature for DirectFunction as earlier version
depended on undefined behaviour.
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/ScintillaCocoa.h | 2 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h index 415094c35..7e4ed7214 100644 --- a/cocoa/ScintillaCocoa.h +++ b/cocoa/ScintillaCocoa.h @@ -177,7 +177,7 @@ public: NSPoint GetCaretPosition(); - static sptr_t DirectFunction(ScintillaCocoa *sciThis, unsigned int iMessage, uptr_t wParam, sptr_t lParam); + static sptr_t DirectFunction(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam); void TimerFired(NSTimer* timer); void IdleTimerFired(); diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 563cff839..7e86d86f1 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -787,16 +787,16 @@ void ScintillaCocoa::Redraw() * However this is a Windows metaphor and not used here, hence we just call our fake * window proc. The given parameters directly reflect the message parameters used on Windows. * - * @param sciThis The target which is to be called. + * @param ptr The target which is to be called. * @param iMessage A code that indicates which message was sent. * @param wParam One of the two free parameters for the message. Traditionally a word sized parameter * (hence the w prefix). * @param lParam The other of the two free parameters. A signed long. */ -sptr_t ScintillaCocoa::DirectFunction(ScintillaCocoa *sciThis, unsigned int iMessage, uptr_t wParam, +sptr_t ScintillaCocoa::DirectFunction(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam) { - return sciThis->WndProc(iMessage, wParam, lParam); + return reinterpret_cast<ScintillaCocoa *>(ptr)->WndProc(iMessage, wParam, lParam); } //-------------------------------------------------------------------------------------------------- |