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/wx_gen_cpp.erl | |
| 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/wx_gen_cpp.erl')
| -rw-r--r-- | lib/wx/api_gen/wx_gen_cpp.erl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl index 9e9f8799c7..846cec46c4 100644 --- a/lib/wx/api_gen/wx_gen_cpp.erl +++ b/lib/wx/api_gen/wx_gen_cpp.erl @@ -1010,6 +1010,11 @@ gen_macros() -> w("#include <wx/filename.h>~n"), w("~n~n", []), + w("#ifndef wxICON_DEFAULT_BITMAP_TYPE~n",[]), + w(" #define wxICON_DEFAULT_BITMAP_TYPE wxBITMAP_TYPE_ICO_RESOURCE~n",[]), + w("#endif~n", []), + w("~n~n", []), + [w("#define ~s_~s ~p~n", [Class,Name,Id]) || {Class,Name,_,Id} <- wx_gen_erl:get_unique_names()], w("~n~n"). |