diff options
| author | Dan Gudmundsson <[email protected]> | 2015-11-20 15:49:30 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-11-24 14:34:02 +0100 |
| commit | da4a2d7ca19f967da4561f66659346540d6441c9 (patch) | |
| tree | 29d38e625dc572dcc99f9106952fc42c794a37a1 | |
| parent | c998b45d3ecf560b40fa92a49658dd476e40e2ae (diff) | |
| download | otp-da4a2d7ca19f967da4561f66659346540d6441c9.tar.gz otp-da4a2d7ca19f967da4561f66659346540d6441c9.tar.bz2 otp-da4a2d7ca19f967da4561f66659346540d6441c9.zip | |
wx: Make wxPostScriptDC optional
By default wxUSE_POSTSCRIPT is not enabled on Windows,
make it optional, postscript generation doesn't work that good
and is probably never used on windows anyway.
| -rw-r--r-- | lib/wx/api_gen/wxapi.conf | 2 | ||||
| -rw-r--r-- | lib/wx/c_src/gen/wxe_derived_dest.h | 2 | ||||
| -rw-r--r-- | lib/wx/c_src/gen/wxe_funcs.cpp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf index 462a4551a9..eabbec3297 100644 --- a/lib/wx/api_gen/wxapi.conf +++ b/lib/wx/api_gen/wxapi.conf @@ -367,7 +367,7 @@ {class,wxMirrorDC, wxDC, [], ['wxMirrorDC', '~wxMirrorDC']}. {class,wxScreenDC, wxDC, [], ['wxScreenDC', '~wxScreenDC']}. -{class,wxPostScriptDC,wxDC,[], +{class,wxPostScriptDC,wxDC,[{ifdef, wxUSE_POSTSCRIPT}], ['wxPostScriptDC','~wxPostScriptDC', {'SetResolution', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}, {'GetResolution', [{deprecated, "!wxCHECK_VERSION(2,9,0)"}]}]}. diff --git a/lib/wx/c_src/gen/wxe_derived_dest.h b/lib/wx/c_src/gen/wxe_derived_dest.h index d26273fb50..1dcf029244 100644 --- a/lib/wx/c_src/gen/wxe_derived_dest.h +++ b/lib/wx/c_src/gen/wxe_derived_dest.h @@ -86,11 +86,13 @@ class EwxScreenDC : public wxScreenDC { EwxScreenDC() : wxScreenDC() {}; }; +#if wxUSE_POSTSCRIPT class EwxPostScriptDC : public wxPostScriptDC { public: ~EwxPostScriptDC() {((WxeApp *)wxTheApp)->clearPtr(this);}; EwxPostScriptDC(const wxPrintData& printData) : wxPostScriptDC(printData) {}; EwxPostScriptDC() : wxPostScriptDC() {}; }; +#endif // wxUSE_POSTSCRIPT class EwxWindowDC : public wxWindowDC { public: ~EwxWindowDC() {((WxeApp *)wxTheApp)->clearPtr(this);}; diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp index 9c05ad2cf8..fd1cedd714 100644 --- a/lib/wx/c_src/gen/wxe_funcs.cpp +++ b/lib/wx/c_src/gen/wxe_funcs.cpp @@ -5856,6 +5856,7 @@ case wxScreenDC_new: { // wxScreenDC::wxScreenDC rt.addRef(getRef((void *)Result,memenv), "wxScreenDC"); break; } +#if wxUSE_POSTSCRIPT case wxPostScriptDC_new_0: { // wxPostScriptDC::wxPostScriptDC wxPostScriptDC * Result = new EwxPostScriptDC(); newPtr((void *) Result, 4, memenv); @@ -5883,6 +5884,7 @@ case wxPostScriptDC_GetResolution: { // wxPostScriptDC::GetResolution break; } #endif +#endif // wxUSE_POSTSCRIPT #if !wxCHECK_VERSION(2,9,0) case wxWindowDC_new_0: { // wxWindowDC::wxWindowDC wxWindowDC * Result = new EwxWindowDC(); |