support wxDP_ALLOWNONE in generic wxDatePickerCtrl (#3164)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -116,6 +116,11 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool IsTextEmpty() const
|
||||||
|
{
|
||||||
|
return m_combo->GetTextCtrl()->IsEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
bool ParseDateTime(const wxString& s, wxDateTime* pDt)
|
bool ParseDateTime(const wxString& s, wxDateTime* pDt)
|
||||||
{
|
{
|
||||||
wxASSERT(pDt);
|
wxASSERT(pDt);
|
||||||
@@ -435,6 +440,8 @@ wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
|
|||||||
|
|
||||||
wxDateTime wxDatePickerCtrlGeneric::GetValue() const
|
wxDateTime wxDatePickerCtrlGeneric::GetValue() const
|
||||||
{
|
{
|
||||||
|
if ( HasFlag(wxDP_ALLOWNONE) && m_popup->IsTextEmpty() )
|
||||||
|
return wxInvalidDateTime;
|
||||||
return m_popup->GetDate();
|
return m_popup->GetDate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user