fixes for wxDP_ALLOWNONE handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3200f37d25
commit
2436cac777
@ -588,13 +588,11 @@ void wxDatePickerCtrlGeneric::OnKillFocus(wxFocusEvent &ev)
|
||||
dt = m_currentDate;
|
||||
}
|
||||
|
||||
if (!dt.IsValid())
|
||||
m_txt->SetValue(wxEmptyString);
|
||||
else
|
||||
m_txt->SetValue(dt.Format(m_format));
|
||||
m_txt->SetValue(dt.IsValid()? dt.Format(m_format) : wxString());
|
||||
|
||||
// notify that we had to change the date after validation
|
||||
if (m_currentDate != dt)
|
||||
if ( (dt.IsValid() && m_currentDate != dt) ||
|
||||
(!dt.IsValid() && m_currentDate.IsValid()) )
|
||||
{
|
||||
m_currentDate = dt;
|
||||
wxDateEvent event(this, dt, wxEVT_DATE_CHANGED);
|
||||
|
Loading…
Reference in New Issue
Block a user