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/api_gen/wxapi.conf | |
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/api_gen/wxapi.conf')
-rw-r--r-- | lib/wx/api_gen/wxapi.conf | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf index 4f7bbfedef..c91a9d7fff 100644 --- a/lib/wx/api_gen/wxapi.conf +++ b/lib/wx/api_gen/wxapi.conf @@ -27,7 +27,11 @@ wxFONTENCODING_UTF32,wxFONTENCODING_UTF16, wxDEFAULT_CONTROL_BORDER,wxMOD_CMD, wxMAJOR_VERSION, wxMINOR_VERSION, - wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER,wxBETA_NUMBER + wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER,wxBETA_NUMBER, + %% + wxALWAYS_NATIVE_DOUBLE_BUFFER, + wxGAUGE_EMULATE_INDETERMINATE_MODE, + wxTR_DEFAULT_STYLE ]}. {gvars, @@ -702,7 +706,7 @@ ['wxCheckBox','~wxCheckBox','Create','GetValue','Get3StateValue', 'Is3rdStateAllowedForUser','Is3State','IsChecked','SetValue', 'Set3StateValue']}. -{class, wxCheckListBox, wxListBox, [{skip,[{wxCheckListBox,8}]}], +{class, wxCheckListBox, wxListBox, [{skip,[{wxCheckListBox,8}]}], [{'wxCheckListBox',[{"pos",{def, "wxDefaultPosition"}}, {"size",{def, "wxDefaultSize"}}, {"choices",{def, ""}}]}, @@ -1686,7 +1690,7 @@ {class, wxSplitterEvent, wxNotifyEvent, - [ + [{acc, [{x, skip}, {y, skip}, {pos, skip}, {win, skip}, {pt, skip}]}, %% arrgh doxygen bugs {event, [wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, |