diff options
| author | Dan Gudmundsson <[email protected]> | 2015-03-27 10:01:45 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-03-27 10:01:45 +0100 |
| commit | ec5bdad811999470d1effd2e8e53942e34738f5c (patch) | |
| tree | cb97f432215bac4a5d59146f77da7ef65528ab95 /lib/wx/c_src/gen/wxe_init.cpp | |
| parent | e10d2cf8e16c6e42947f9d6b4383bf77c0f7c564 (diff) | |
| parent | 5ce5cc6c49ac06d282519494e8047498a7d985e0 (diff) | |
| download | otp-ec5bdad811999470d1effd2e8e53942e34738f5c.tar.gz otp-ec5bdad811999470d1effd2e8e53942e34738f5c.tar.bz2 otp-ec5bdad811999470d1effd2e8e53942e34738f5c.zip | |
Merge branch 'dgud/wx/prefer-wxMSW-3/OTP-12632'
* dgud/wx/prefer-wxMSW-3/OTP-12632:
wx: Fix variable cursor constants
wx: On Mac keyboards use meta field as raw_ctrl
wx: Prefer wxWidgets-3.0. branch on windows
Diffstat (limited to 'lib/wx/c_src/gen/wxe_init.cpp')
| -rw-r--r-- | lib/wx/c_src/gen/wxe_init.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/wx/c_src/gen/wxe_init.cpp b/lib/wx/c_src/gen/wxe_init.cpp index 3a4bced790..1673f2a1b3 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-2014. All Rights Reserved. + * Copyright Ericsson AB 2008-2015. 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 @@ -56,6 +56,12 @@ void WxeApp::init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller) { rt.addTupleCount(2); rt.addAtom("wxMOD_CMD"); rt.addInt(wxMOD_CMD); rt.addTupleCount(2); + rt.addAtom("wxCURSOR_ARROWWAIT"); rt.addInt(wxCURSOR_ARROWWAIT); + rt.addTupleCount(2); + rt.addAtom("wxCURSOR_DEFAULT"); rt.addInt(wxCURSOR_DEFAULT); + rt.addTupleCount(2); + rt.addAtom("wxCURSOR_MAX"); rt.addInt(wxCURSOR_MAX); + rt.addTupleCount(2); rt.addAtom("wxBLACK"); rt.add(*(wxBLACK)); rt.addTupleCount(2); rt.addAtom("wxBLACK_BRUSH"); rt.addRef(getRef((void *)wxBLACK_BRUSH,memenv),"wxBrush"); @@ -138,7 +144,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(57); + rt.endList(60); rt.addTupleCount(2); rt.send(); } |