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/api_gen/wxapi.conf | |
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/api_gen/wxapi.conf')
-rw-r--r-- | lib/wx/api_gen/wxapi.conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf index 2e961cce98..09f21af0f3 100644 --- a/lib/wx/api_gen/wxapi.conf +++ b/lib/wx/api_gen/wxapi.conf @@ -32,7 +32,10 @@ wxALWAYS_NATIVE_DOUBLE_BUFFER, wxGAUGE_EMULATE_INDETERMINATE_MODE, wxTR_DEFAULT_STYLE, - wxSL_LABELS + wxSL_LABELS, + wxCURSOR_DEFAULT, + wxCURSOR_ARROWWAIT, + wxCURSOR_MAX ]}. {gvars, |