diff options
| author | Erlang/OTP <[email protected]> | 2010-03-30 07:50:13 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-03-30 07:50:13 +0000 |
| commit | 7ec00dcfdc34a455230054b6bdd37a6c61fd7a45 (patch) | |
| tree | afa30d779dcf435e9dc014e4bdd5046a308c823a /lib/wx/c_src/gen/wxe_init.cpp | |
| parent | 02bc42d238d302c712f12f50e767857785416397 (diff) | |
| parent | 3a4edf4d1e4a66a83ac39d066c02bfffea4dccf8 (diff) | |
| download | otp-7ec00dcfdc34a455230054b6bdd37a6c61fd7a45.tar.gz otp-7ec00dcfdc34a455230054b6bdd37a6c61fd7a45.tar.bz2 otp-7ec00dcfdc34a455230054b6bdd37a6c61fd7a45.zip | |
Merge branch 'dgud/wx-new-doxygen' into dev
* dgud/wx-new-doxygen:
Added a non existing macro on windows.
Commit of the generated code with previous commit.
Fixed code generation from newer doxygen versions.
Whitespace fixes
OTP-8547 dgud/wx-new-doxygen
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, 7 insertions, 1 deletions
diff --git a/lib/wx/c_src/gen/wxe_init.cpp b/lib/wx/c_src/gen/wxe_init.cpp index 96c775c4c0..bab3261be4 100644 --- a/lib/wx/c_src/gen/wxe_init.cpp +++ b/lib/wx/c_src/gen/wxe_init.cpp @@ -24,6 +24,8 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) { wxeReturn rt = wxeReturn(WXE_DRV_PORT, caller); rt.addAtom((char*)"wx_consts"); + rt.addAtom("wxALWAYS_NATIVE_DOUBLE_BUFFER"); rt.addInt(wxALWAYS_NATIVE_DOUBLE_BUFFER); + rt.addTupleCount(2); rt.addAtom("wxBYTE_ORDER"); rt.addInt(wxBYTE_ORDER); rt.addTupleCount(2); rt.addAtom("wxDEFAULT_CONTROL_BORDER"); rt.addInt(wxDEFAULT_CONTROL_BORDER); @@ -32,6 +34,10 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) { rt.addTupleCount(2); rt.addAtom("wxRETAINED"); rt.addInt(wxRETAINED); rt.addTupleCount(2); + rt.addAtom("wxGAUGE_EMULATE_INDETERMINATE_MODE"); rt.addInt(wxGAUGE_EMULATE_INDETERMINATE_MODE); + rt.addTupleCount(2); + rt.addAtom("wxTR_DEFAULT_STYLE"); rt.addInt(wxTR_DEFAULT_STYLE); + rt.addTupleCount(2); rt.addAtom("wxBETA_NUMBER"); rt.addInt(wxBETA_NUMBER); rt.addTupleCount(2); rt.addAtom("wxMAJOR_VERSION"); rt.addInt(wxMAJOR_VERSION); @@ -130,7 +136,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(53); + rt.endList(56); rt.addTupleCount(2); rt.send(); } |