diff options
| author | Dan Gudmundsson <[email protected]> | 2016-04-04 13:27:04 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-04-04 13:27:04 +0200 |
| commit | d5ee10dd6ad9e7d78fe1e306ad53b78c15f9b7f2 (patch) | |
| tree | 7fd48b90e916b37155a565267ed967855ff0664b /lib/wx/c_src | |
| parent | 01012debc01ba667a0dffb9ae6b10b0cbb1b567e (diff) | |
| parent | 25ea1f62b6ce9cff26d9353881b799f9dd76fe53 (diff) | |
| download | otp-d5ee10dd6ad9e7d78fe1e306ad53b78c15f9b7f2.tar.gz otp-d5ee10dd6ad9e7d78fe1e306ad53b78c15f9b7f2.tar.bz2 otp-d5ee10dd6ad9e7d78fe1e306ad53b78c15f9b7f2.zip | |
Merge branch 'dgud/wx/type-error'
* dgud/wx/type-error:
wx: Fix wxListCtrl:hitTest arguments and delivered results
wx: Fix type error in wxMouseState record
Diffstat (limited to 'lib/wx/c_src')
| -rw-r--r-- | lib/wx/c_src/gen/wxe_funcs.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp index 03b0baf875..059cee59f4 100644 --- a/lib/wx/c_src/gen/wxe_funcs.cpp +++ b/lib/wx/c_src/gen/wxe_funcs.cpp @@ -15631,14 +15631,18 @@ case wxListCtrl_GetViewRect: { // wxListCtrl::GetViewRect break; } case wxListCtrl_HitTest: { // wxListCtrl::HitTest + int flags; + long pSubItem; wxListCtrl *This = (wxListCtrl *) getPtr(bp,memenv); bp += 4; int * pointX = (int *) bp; bp += 4; int * pointY = (int *) bp; bp += 4; wxPoint point = wxPoint(*pointX,*pointY); - int * flags = (int *) bp; bp += 4; if(!This) throw wxe_badarg(0); - long Result = This->HitTest(point,*flags); + long Result = This->HitTest(point,flags,&pSubItem); rt.addInt(Result); + rt.addInt(flags); + rt.addInt(pSubItem); + rt.addTupleCount(3); break; } case wxListCtrl_InsertColumn_2: { // wxListCtrl::InsertColumn |