aboutsummaryrefslogtreecommitdiffhomepage
path: root/qt/ScintillaEditBase/ScintillaQt.cpp
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2014-05-02 23:19:27 +1000
committerNeil <nyamatongwe@gmail.com>2014-05-02 23:19:27 +1000
commitde3131a78debeeb4997bba4a6dffec7384d3b4e6 (patch)
tree1b74b1fbab238227dd9951e23be93e3f3c99db9c /qt/ScintillaEditBase/ScintillaQt.cpp
parent20d6edd07a61856c02634971519c8519992d7346 (diff)
downloadscintilla-mirror-de3131a78debeeb4997bba4a6dffec7384d3b4e6.tar.gz
Use exact SciFnDirect function signature for DirectFunction as earlier version
depended on undefined behaviour.
Diffstat (limited to 'qt/ScintillaEditBase/ScintillaQt.cpp')
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.cpp4
1 files changed, 2 insertions, 2 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