diff options
| author | Dan Gudmundsson <[email protected]> | 2014-01-27 14:23:15 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-01-27 14:23:15 +0100 |
| commit | 75bfbe5a61fa1a1dd204fdb21dc4bf7df8e8003d (patch) | |
| tree | cedea2151cdc673bddfe541cf4956c5fd6b431ab /lib/wx/api_gen/wxapi.conf | |
| parent | c922ea6f82bb3d95d05d1f212b91e13f97e972b8 (diff) | |
| parent | fd055cf43486358a413a1fa22f30f0aa711d25e1 (diff) | |
| download | otp-75bfbe5a61fa1a1dd204fdb21dc4bf7df8e8003d.tar.gz otp-75bfbe5a61fa1a1dd204fdb21dc4bf7df8e8003d.tar.bz2 otp-75bfbe5a61fa1a1dd204fdb21dc4bf7df8e8003d.zip | |
Merge branch 'dgud/wx/refactor-and-bugfixes/OTP-11586'
* dgud/wx/refactor-and-bugfixes/OTP-11586:
wx: Delay all deletes if recursed in event loop
wx: wx could hang if wxe_server died (or had died) when inside a callback
wx: Delay memory cleanup until safe
wx: Refactor C++ code
wx: Add init_dialog event
Update icons
wx: Update icons to plain old white ones
Diffstat (limited to 'lib/wx/api_gen/wxapi.conf')
| -rw-r--r-- | lib/wx/api_gen/wxapi.conf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf index ff680d0655..73c5af43d8 100644 --- a/lib/wx/api_gen/wxapi.conf +++ b/lib/wx/api_gen/wxapi.conf @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -1883,3 +1883,5 @@ [{event,[wxEVT_TASKBAR_MOVE,wxEVT_TASKBAR_LEFT_DOWN,wxEVT_TASKBAR_LEFT_UP, wxEVT_TASKBAR_RIGHT_DOWN,wxEVT_TASKBAR_RIGHT_UP, wxEVT_TASKBAR_LEFT_DCLICK,wxEVT_TASKBAR_RIGHT_DCLICK]}],[]}. + +{class, wxInitDialogEvent, wxEvent, [{event,[wxEVT_INIT_DIALOG]}], []}. |