diff options
author | Dan Gudmundsson <[email protected]> | 2014-06-16 12:14:10 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2014-06-16 12:14:10 +0200 |
commit | a432f076a6e4a515f1aaf8b786367d5a62ce416a (patch) | |
tree | 50a592bbb91126a53a2f295333b2319d2cd7c4a9 /lib/wx/c_src/gen/wxe_events.cpp | |
parent | 26e63b26e605a74ba0a0a58c1fb1cb0ba358efed (diff) | |
parent | 190c04f50ab22e0227a0d5cfd67767db0b687c97 (diff) | |
download | otp-a432f076a6e4a515f1aaf8b786367d5a62ce416a.tar.gz otp-a432f076a6e4a515f1aaf8b786367d5a62ce416a.tar.bz2 otp-a432f076a6e4a515f1aaf8b786367d5a62ce416a.zip |
Merge branch 'dgud/wx/additional-functionality/OTP-11986' into maint
* dgud/wx/additional-functionality/OTP-11986:
wx: Fix destroy bug
wx: Add wxPopup(Transient)Window
wx: Fix non constant define (wxSL_LABELS)
wx: Add wxActivateEvent
wx: Add missing wxTextCtrl:changeValue
OTP-11985
Diffstat (limited to 'lib/wx/c_src/gen/wxe_events.cpp')
-rw-r--r-- | lib/wx/c_src/gen/wxe_events.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/wx/c_src/gen/wxe_events.cpp b/lib/wx/c_src/gen/wxe_events.cpp index 0ca059ead4..255b36c2fa 100644 --- a/lib/wx/c_src/gen/wxe_events.cpp +++ b/lib/wx/c_src/gen/wxe_events.cpp @@ -298,6 +298,9 @@ void initEventTable() {wxEVT_TASKBAR_LEFT_DCLICK, 228, "taskbar_left_dclick"}, {wxEVT_TASKBAR_RIGHT_DCLICK, 228, "taskbar_right_dclick"}, {wxEVT_INIT_DIALOG, 229, "init_dialog"}, + {wxEVT_ACTIVATE, 231, "activate"}, + {wxEVT_ACTIVATE_APP, 231, "activate_app"}, + {wxEVT_HIBERNATE, 231, "hibernate"}, {-1, 0, } }; for(int i=0; event_types[i].ev_type != -1; i++) { @@ -812,6 +815,15 @@ case 229: {// wxInitDialogEvent rt.addTupleCount(2); break; } +case 231: {// wxActivateEvent + wxActivateEvent * ev = (wxActivateEvent *) event; + evClass = (char*)"wxActivateEvent"; + rt.addAtom((char*)"wxActivate"); + rt.addAtom(Etype->eName); + rt.addBool(ev->GetActive()); + rt.addTupleCount(3); + break; +} } rt.addTupleCount(5); |