diff options
author | Dan Gudmundsson <[email protected]> | 2014-06-16 12:17:44 +0200 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2014-06-16 12:17:44 +0200 |
commit | 4ed5f977ccb48a393fa128283496ac2a24bd11af (patch) | |
tree | cd2432d5b289a84d3575202f8d34eeaeb1ffd7e6 /lib/wx/c_src/gen/wxe_derived_dest.h | |
parent | a2a82c3dcf35b9a8e977a35e01a18936be22ea00 (diff) | |
parent | a432f076a6e4a515f1aaf8b786367d5a62ce416a (diff) | |
download | otp-4ed5f977ccb48a393fa128283496ac2a24bd11af.tar.gz otp-4ed5f977ccb48a393fa128283496ac2a24bd11af.tar.bz2 otp-4ed5f977ccb48a393fa128283496ac2a24bd11af.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/wx/c_src/gen/wxe_derived_dest.h')
-rw-r--r-- | lib/wx/c_src/gen/wxe_derived_dest.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/wx/c_src/gen/wxe_derived_dest.h b/lib/wx/c_src/gen/wxe_derived_dest.h index 42925bff3a..0a3765a910 100644 --- a/lib/wx/c_src/gen/wxe_derived_dest.h +++ b/lib/wx/c_src/gen/wxe_derived_dest.h @@ -770,3 +770,19 @@ class EwxLocale : public wxLocale { EwxLocale() : wxLocale() {}; }; +#if wxUSE_POPUPWIN +class EwxPopupWindow : public wxPopupWindow { + public: ~EwxPopupWindow() {((WxeApp *)wxTheApp)->clearPtr(this);}; + EwxPopupWindow(wxWindow * parent,int flags) : wxPopupWindow(parent,flags) {}; + EwxPopupWindow() : wxPopupWindow() {}; +}; +#endif // wxUSE_POPUPWIN + +#if wxUSE_POPUPWIN +class EwxPopupTransientWindow : public wxPopupTransientWindow { + public: ~EwxPopupTransientWindow() {((WxeApp *)wxTheApp)->clearPtr(this);}; + EwxPopupTransientWindow(wxWindow * parent,int style) : wxPopupTransientWindow(parent,style) {}; + EwxPopupTransientWindow() : wxPopupTransientWindow() {}; +}; +#endif // wxUSE_POPUPWIN + |