Added destructor to fix crash on Mac due to focus event causing
text control to be accessed while being deleted git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
caad76379f
commit
a9d13e1564
@ -26,6 +26,7 @@ class WXDLLIMPEXP_ADV wxDatePickerCtrlGeneric : public wxDatePickerCtrlBase
|
||||
public:
|
||||
// creating the control
|
||||
wxDatePickerCtrlGeneric() { Init(); }
|
||||
~wxDatePickerCtrlGeneric() ;
|
||||
wxDatePickerCtrlGeneric(wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxDateTime& date = wxDefaultDateTime,
|
||||
|
@ -521,6 +521,13 @@ void wxDatePickerCtrlGeneric::Init()
|
||||
m_ignoreDrop = false;
|
||||
}
|
||||
|
||||
wxDatePickerCtrlGeneric::~wxDatePickerCtrlGeneric()
|
||||
{
|
||||
m_popup = NULL;
|
||||
m_txt = NULL;
|
||||
m_cal = NULL;
|
||||
m_btn = NULL;
|
||||
}
|
||||
|
||||
bool wxDatePickerCtrlGeneric::Destroy()
|
||||
{
|
||||
@ -820,6 +827,9 @@ void wxDatePickerCtrlGeneric::OnSetFocus(wxFocusEvent& WXUNUSED(ev))
|
||||
|
||||
void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev)
|
||||
{
|
||||
if (!m_txt)
|
||||
return;
|
||||
|
||||
ev.Skip();
|
||||
|
||||
wxDateTime dt;
|
||||
|
Loading…
Reference in New Issue
Block a user