diff options
| author | Erlang/OTP <otp@erlang.org> | 2023-04-25 17:09:02 +0200 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2023-04-25 17:09:02 +0200 |
| commit | e7a74b367106a4276a63e0e3f84f71ef3dd59209 (patch) | |
| tree | 4d51dcac9c09c1fd8d23dd3836bd0874ad7323fc /lib/wx/c_src/gen/wxe_init.cpp | |
| parent | 7419d0c50b10060e7a898e9ebeb6759bda8e20f2 (diff) | |
| parent | 448b7ab802bea8fef87c52733c8001572a77ecd8 (diff) | |
| download | erlang-e7a74b367106a4276a63e0e3f84f71ef3dd59209.tar.gz | |
Merge branch 'dgud/wx/fix-debug/OTP-18512' into maint-25
* dgud/wx/fix-debug/OTP-18512:
wx: Use temp env for send_msg
gl: Fix glDebugMessage functionality
Fix tests
Fix wx-3.2 macros and OpenGL support
wx: Add debug printouts for OpenGL
wx: Improve debug printouts
Diffstat (limited to 'lib/wx/c_src/gen/wxe_init.cpp')
| -rw-r--r-- | lib/wx/c_src/gen/wxe_init.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/wx/c_src/gen/wxe_init.cpp b/lib/wx/c_src/gen/wxe_init.cpp index 4153f1e2b9..d29e8cb19a 100644 --- a/lib/wx/c_src/gen/wxe_init.cpp +++ b/lib/wx/c_src/gen/wxe_init.cpp @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2008-2022. All Rights Reserved. + * Copyright Ericsson AB 2008-2023. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -5895,17 +5895,17 @@ void WxeApp::init_consts(wxeMetaCommand& event) { #else { enif_make_atom(rt.env,"wxKeyCode"), "wxk_MEDIA_PLAY_PAUSE", WXE_ATOM_undefined }, #endif -#if wxCHECK_VERSION(3,1,0) +#if wxCHECK_VERSION(3,2,0) { enif_make_atom(rt.env,"wxKeyCode"), "wxk_LAUNCH_MAIL", rt.make_int(WXK_LAUNCH_MAIL) }, #else { enif_make_atom(rt.env,"wxKeyCode"), "wxk_LAUNCH_MAIL", WXE_ATOM_undefined }, #endif -#if wxCHECK_VERSION(3,1,0) +#if wxCHECK_VERSION(3,2,0) { enif_make_atom(rt.env,"wxKeyCode"), "wxk_LAUNCH_APP1", rt.make_int(WXK_LAUNCH_APP1) }, #else { enif_make_atom(rt.env,"wxKeyCode"), "wxk_LAUNCH_APP1", WXE_ATOM_undefined }, #endif -#if wxCHECK_VERSION(3,1,0) +#if wxCHECK_VERSION(3,2,0) { enif_make_atom(rt.env,"wxKeyCode"), "wxk_LAUNCH_APP2", rt.make_int(WXK_LAUNCH_APP2) }, #else { enif_make_atom(rt.env,"wxKeyCode"), "wxk_LAUNCH_APP2", WXE_ATOM_undefined }, |