diff options
| author | Dan Gudmundsson <[email protected]> | 2010-03-10 17:12:37 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-03-12 06:41:31 +0100 |
| commit | 3a4edf4d1e4a66a83ac39d066c02bfffea4dccf8 (patch) | |
| tree | 1e3a3d89e1418e29f94f9917d173108d5d9f9f3e | |
| parent | dec7bba3591097f668da46606fd8ceb28903b3ee (diff) | |
| download | otp-3a4edf4d1e4a66a83ac39d066c02bfffea4dccf8.tar.gz otp-3a4edf4d1e4a66a83ac39d066c02bfffea4dccf8.tar.bz2 otp-3a4edf4d1e4a66a83ac39d066c02bfffea4dccf8.zip | |
Added a non existing macro on windows.
The new code generator doesn't resolve macros and a
is missing (not used in wxWidgets) on windows.
| -rw-r--r-- | lib/wx/api_gen/wx_gen_cpp.erl | 5 | ||||
| -rw-r--r-- | lib/wx/c_src/gen/wxe_macros.h | 5 |
2 files changed, 10 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"). diff --git a/lib/wx/c_src/gen/wxe_macros.h b/lib/wx/c_src/gen/wxe_macros.h index 047f2950e2..415b7f0b29 100644 --- a/lib/wx/c_src/gen/wxe_macros.h +++ b/lib/wx/c_src/gen/wxe_macros.h @@ -62,6 +62,11 @@ #include <wx/filename.h> +#ifndef wxICON_DEFAULT_BITMAP_TYPE + #define wxICON_DEFAULT_BITMAP_TYPE wxBITMAP_TYPE_ICO_RESOURCE +#endif + + #define wxEvtHandler_Connect 100 #define wxEvtHandler_Disconnect_2 101 #define wxEvtHandler_Disconnect_1 102 |