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_init.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_init.cpp')
| -rw-r--r-- | lib/wx/c_src/gen/wxe_init.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/wx/c_src/gen/wxe_init.cpp b/lib/wx/c_src/gen/wxe_init.cpp index a75298392b..3a4bced790 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-2011. 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 @@ -36,6 +36,8 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) { rt.addTupleCount(2); rt.addAtom("wxGAUGE_EMULATE_INDETERMINATE_MODE"); rt.addInt(wxGAUGE_EMULATE_INDETERMINATE_MODE); rt.addTupleCount(2); + rt.addAtom("wxSL_LABELS"); rt.addInt(wxSL_LABELS); + rt.addTupleCount(2); rt.addAtom("wxTR_DEFAULT_STYLE"); rt.addInt(wxTR_DEFAULT_STYLE); rt.addTupleCount(2); rt.addAtom("wxBETA_NUMBER"); rt.addInt(wxBETA_NUMBER); @@ -136,7 +138,7 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) { rt.addTupleCount(2); rt.addAtom("wxWHITE_PEN"); rt.addRef(getRef((void *)wxWHITE_PEN,memenv),"wxPen"); rt.addTupleCount(2); - rt.endList(56); + rt.endList(57); rt.addTupleCount(2); rt.send(); } |