diff options
| author | Dan Gudmundsson <[email protected]> | 2014-06-16 12:14:10 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-06-16 12:14:10 +0200 |
| commit | a432f076a6e4a515f1aaf8b786367d5a62ce416a (patch) | |
| tree | 50a592bbb91126a53a2f295333b2319d2cd7c4a9 /lib/wx/c_src/wxe_memory.h | |
| parent | 26e63b26e605a74ba0a0a58c1fb1cb0ba358efed (diff) | |
| parent | 190c04f50ab22e0227a0d5cfd67767db0b687c97 (diff) | |
| download | otp-a432f076a6e4a515f1aaf8b786367d5a62ce416a.tar.gz otp-a432f076a6e4a515f1aaf8b786367d5a62ce416a.tar.bz2 otp-a432f076a6e4a515f1aaf8b786367d5a62ce416a.zip | |
Merge branch 'dgud/wx/additional-functionality/OTP-11986' into maint
* dgud/wx/additional-functionality/OTP-11986:
wx: Fix destroy bug
wx: Add wxPopup(Transient)Window
wx: Fix non constant define (wxSL_LABELS)
wx: Add wxActivateEvent
wx: Add missing wxTextCtrl:changeValue
OTP-11985
Diffstat (limited to 'lib/wx/c_src/wxe_memory.h')
| -rw-r--r-- | lib/wx/c_src/wxe_memory.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/wx/c_src/wxe_memory.h b/lib/wx/c_src/wxe_memory.h index ec22183bfa..8a48c77154 100644 --- a/lib/wx/c_src/wxe_memory.h +++ b/lib/wx/c_src/wxe_memory.h @@ -47,7 +47,8 @@ class wxeRefData { int type; // 0 = wxWindow subclasses, 1 = wxObject subclasses // 2 = wxDialog subclasses, 3 = allocated wxObjects but not returned from new - // > 3 classes which lack virtual destr, or are supposed to be allocated on + // 4 = wxObjects that should always be deleted directly (wxDC derivates) + // > 4 classes which lack virtual destr, or are supposed to be allocated on // the stack bool alloc_in_erl; wxeMemEnv *memenv; |