support wxDP_ALLOWNONE in generic wxDatePickerCtrl (#3164)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-06-28 18:58:07 +00:00
parent 4133114e30
commit c6b44b6c88
2 changed files with 8 additions and 0 deletions

View File

@@ -100,6 +100,7 @@ All (GUI):
help window.
- Fixed wxHTML default font size for printing to be 12pt regardless of the
platform, instead of depending on GUI toolkit's screen configuration.
- Support wxDP_ALLOWNONE style in generic wxDatePickerCtrl version.
All (Unix):

View File

@@ -169,6 +169,11 @@ public:
}
}
bool IsTextEmpty() const
{
return m_combo->GetTextCtrl()->IsEmpty();
}
bool ParseDateTime(const wxString& s, wxDateTime* pDt)
{
wxASSERT(pDt);
@@ -470,6 +475,8 @@ wxDatePickerCtrlGeneric::SetDateRange(const wxDateTime& lowerdate,
wxDateTime wxDatePickerCtrlGeneric::GetValue() const
{
if ( HasFlag(wxDP_ALLOWNONE) && m_popup->IsTextEmpty() )
return wxInvalidDateTime;
return m_popup->GetDate();
}