diff options
author | Dan Gudmundsson <[email protected]> | 2012-12-13 08:54:29 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2013-01-09 11:41:41 +0100 |
commit | 204d0bdc0acaf8017372a3b93f54bb846b6be58e (patch) | |
tree | d7e83d8ee7a465a1fad978d9cfdecb15e56c223e /lib/wx/c_src/gen/wxe_derived_dest.h | |
parent | ad6e421879217ee76d3c7267bcd8234ec33153a1 (diff) | |
download | otp-204d0bdc0acaf8017372a3b93f54bb846b6be58e.tar.gz otp-204d0bdc0acaf8017372a3b93f54bb846b6be58e.tar.bz2 otp-204d0bdc0acaf8017372a3b93f54bb846b6be58e.zip |
wx: Fix int to enum
In 2.9 several functions takes enum's instead of int as arguments,
remove dirty -fpermissive fix and fix it correctly instead.
Diffstat (limited to 'lib/wx/c_src/gen/wxe_derived_dest.h')
-rw-r--r-- | lib/wx/c_src/gen/wxe_derived_dest.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/wx/c_src/gen/wxe_derived_dest.h b/lib/wx/c_src/gen/wxe_derived_dest.h index 948e1ffe0c..5fdce27d4b 100644 --- a/lib/wx/c_src/gen/wxe_derived_dest.h +++ b/lib/wx/c_src/gen/wxe_derived_dest.h @@ -188,7 +188,9 @@ class EwxIcon : public wxIcon { class EwxCursor : public wxCursor { public: ~EwxCursor() {((WxeApp *)wxTheApp)->clearPtr(this);}; +#if !wxCHECK_VERSION(2,9,0) EwxCursor(const char * bits,int width,int height,int hotSpotX,int hotSpotY) : wxCursor(bits,width,height,hotSpotX,hotSpotY) {}; +#endif EwxCursor(int cursorId) : wxCursor(cursorId) {}; EwxCursor(const wxImage& image) : wxCursor(image) {}; EwxCursor() : wxCursor() {}; @@ -292,7 +294,7 @@ class EwxStdDialogButtonSizer : public wxStdDialogButtonSizer { class EwxFont : public wxFont { public: ~EwxFont() {((WxeApp *)wxTheApp)->clearPtr(this);}; - EwxFont(int size,int family,int style,int weight,bool underlined,const wxString& face,wxFontEncoding encoding) : wxFont(size,family,style,weight,underlined,face,encoding) {}; + EwxFont(int size,wxFontFamily family,wxFontStyle style,int weight,bool underlined,const wxString& face,wxFontEncoding encoding) : wxFont(size,family,style,weight,underlined,face,encoding) {}; EwxFont(const wxString& fontname) : wxFont(fontname) {}; EwxFont() : wxFont() {}; }; |