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 /qt/ScintillaEditBase | |
| 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 'qt/ScintillaEditBase')
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.cpp | 4 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index b31aa0727..3d727900b 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -675,9 +675,9 @@ sptr_t ScintillaQt::DefWndProc(unsigned int, uptr_t, sptr_t) } sptr_t ScintillaQt::DirectFunction( - ScintillaQt *sciThis, unsigned int iMessage, uptr_t wParam, sptr_t lParam) + sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam) { - return sciThis->WndProc(iMessage, wParam, lParam); + return reinterpret_cast<ScintillaQt *>(ptr)->WndProc(iMessage, wParam, lParam); } // Additions to merge in Scientific Toolworks widget structure diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h index d3c5be594..7defd7c05 100644 --- a/qt/ScintillaEditBase/ScintillaQt.h +++ b/qt/ScintillaEditBase/ScintillaQt.h @@ -128,7 +128,7 @@ private: virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); - static sptr_t DirectFunction(ScintillaQt *sciThis, + static sptr_t DirectFunction(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam); protected: |