diff options
| author | Dan Gudmundsson <[email protected]> | 2016-10-24 13:04:15 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2016-10-24 13:04:15 +0200 |
| commit | 16b6c991cc841ced6be466eca774dba1188f8640 (patch) | |
| tree | 9b2d82c4e7572e45d8962e69b5c07e8d7da82873 /lib/wx/c_src/gen/wxe_funcs.cpp | |
| parent | f66073c2960a4b072e18c4e1dfed143b94cd60c6 (diff) | |
| parent | e92d0d0c4b6991dc751dcc332e11c05d304175b6 (diff) | |
| download | otp-16b6c991cc841ced6be466eca774dba1188f8640.tar.gz otp-16b6c991cc841ced6be466eca774dba1188f8640.tar.bz2 otp-16b6c991cc841ced6be466eca774dba1188f8640.zip | |
Merge branch 'dgud/wx/scale-factor' into maint
* dgud/wx/scale-factor:
wx: Improve error handling
wx: Add wxWindow:getContentScaleFactor
Diffstat (limited to 'lib/wx/c_src/gen/wxe_funcs.cpp')
| -rw-r--r-- | lib/wx/c_src/gen/wxe_funcs.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp index 927528fb32..5425e9f3cb 100644 --- a/lib/wx/c_src/gen/wxe_funcs.cpp +++ b/lib/wx/c_src/gen/wxe_funcs.cpp @@ -1716,6 +1716,15 @@ case wxWindow_SetDoubleBuffered: { // wxWindow::SetDoubleBuffered break; } #endif +#if wxCHECK_VERSION(2,9,5) +case wxWindow_GetContentScaleFactor: { // wxWindow::GetContentScaleFactor + wxWindow *This = (wxWindow *) getPtr(bp,memenv); bp += 4; + if(!This) throw wxe_badarg(0); + double Result = This->GetContentScaleFactor(); + rt.addFloat(Result); + break; +} +#endif case wxTopLevelWindow_GetIcon: { // wxTopLevelWindow::GetIcon wxTopLevelWindow *This = (wxTopLevelWindow *) getPtr(bp,memenv); bp += 4; if(!This) throw wxe_badarg(0); |